@aaronshaf/ger 3.0.1 → 4.0.0

package/src/cli/commands/files.ts

@@ -0,0 +1,86 @@
+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'
+
+const MAGIC_FILES = new Set(['/COMMIT_MSG', '/MERGE_LIST', '/PATCHSET_LEVEL'])
+
+interface FilesOptions {
+  xml?: boolean
+  json?: boolean
+}
+
+export const filesCommand = (
+  changeId?: string,
+  options: FilesOptions = {},
+): Effect.Effect<void, never, GerritApiService> =>
+  Effect.gen(function* () {
+    const gerritApi = yield* GerritApiService
+    const resolvedChangeId = changeId || (yield* getChangeIdFromHead())
+
+    const filesRecord = yield* gerritApi.getFiles(resolvedChangeId)
+    const files = Object.entries(filesRecord)
+      .filter(([path]) => !MAGIC_FILES.has(path))
+      .map(([path, info]) => ({
+        path,
+        status: info.status ?? 'M',
+        lines_inserted: info.lines_inserted ?? 0,
+        lines_deleted: info.lines_deleted ?? 0,
+      }))
+
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            change_id: resolvedChangeId,
+            files,
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
+      console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+      console.log(`<files_result>`)
+      console.log(`  <status>success</status>`)
+      console.log(`  <change_id><![CDATA[${sanitizeCDATA(resolvedChangeId)}]]></change_id>`)
+      console.log(`  <files>`)
+      for (const file of files) {
+        console.log(`    <file>`)
+        console.log(`      <path><![CDATA[${sanitizeCDATA(file.path)}]]></path>`)
+        console.log(`      <status>${escapeXML(file.status)}</status>`)
+        console.log(`      <lines_inserted>${file.lines_inserted}</lines_inserted>`)
+        console.log(`      <lines_deleted>${file.lines_deleted}</lines_deleted>`)
+        console.log(`    </file>`)
+      }
+      console.log(`  </files>`)
+      console.log(`</files_result>`)
+    } else {
+      for (const file of files) {
+        console.log(`${file.status} ${file.path}`)
+      }
+    }
+  }).pipe(
+    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.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(`<files_result>`)
+          console.log(`  <status>error</status>`)
+          console.log(`  <error><![CDATA[${sanitizeCDATA(errorMessage)}]]></error>`)
+          console.log(`</files_result>`)
+        } else {
+          console.error(`✗ Error: ${errorMessage}`)
+        }
+        process.exit(1)
+      }),
+    ),
+  )

package/src/cli/commands/list.ts

@@ -0,0 +1,239 @@
+import { Effect } from 'effect'
+import chalk from 'chalk'
+import { type ApiError, GerritApiService } from '@/api/gerrit'
+import type { ChangeInfo } from '@/schemas/gerrit'
+import { ConfigService, type ConfigError, type ConfigServiceImpl } from '@/services/config'
+
+export interface ListOptions {
+  status?: string
+  limit?: number
+  detailed?: boolean
+  reviewer?: boolean
+  allVerified?: boolean
+  filter?: string
+  json?: boolean
+  xml?: boolean
+}
+
+type LabelInfo = NonNullable<ChangeInfo['labels']>[string]
+
+// ── Label score helpers ────────────────────────────────────────────────────
+
+const getLabelScore = (label: LabelInfo): number | null => {
+  if (label.approved) return 2
+  if (label.rejected) return -2
+  if (label.recommended) return 1
+  if (label.disliked) return -1
+  if (label.value !== undefined && label.value !== 0) return label.value
+  return null
+}
+
+const fmtCR = (label: LabelInfo | undefined): string => {
+  if (!label) return chalk.gray('—')
+  const s = getLabelScore(label)
+  if (s === null || s === 0) return chalk.gray('0')
+  if (s >= 2) return chalk.bold.green('+2')
+  if (s === 1) return chalk.cyan('+1')
+  if (s === -1) return chalk.yellow('-1')
+  return chalk.bold.red('-2')
+}
+
+const fmtVerified = (label: LabelInfo | undefined): string => {
+  if (!label) return chalk.gray('—')
+  const s = getLabelScore(label)
+  if (s === null || s === 0) return chalk.gray('—')
+  if (s > 0) return chalk.green('V+')
+  return chalk.red('V-')
+}
+
+const fmtLabel = (label: LabelInfo | undefined): string => {
+  if (!label) return chalk.gray('—')
+  const s = getLabelScore(label)
+  if (s === null || s === 0) return chalk.gray('—')
+  if (s > 0) return chalk.green(`+${s}`)
+  return chalk.red(String(s))
+}
+
+// ── Time-ago ───────────────────────────────────────────────────────────────
+
+const timeAgo = (dateStr: string): string => {
+  const ms = Date.now() - new Date(dateStr.replace(' ', 'T').split('.')[0] + 'Z').getTime()
+  const mins = Math.floor(ms / 60000)
+  if (mins < 60) return `${mins}m ago`
+  const hrs = Math.floor(mins / 60)
+  if (hrs < 24) return `${hrs}h ago`
+  const days = Math.floor(hrs / 24)
+  if (days < 14) return `${days}d ago`
+  const weeks = Math.floor(days / 7)
+  if (weeks < 8) return `${weeks}w ago`
+  return dateStr.slice(0, 10)
+}
+
+// ── Table rendering ────────────────────────────────────────────────────────
+
+const COL_CHANGE = 8
+const COL_SUBJECT_MINE = 58
+const COL_SUBJECT_TEAM = 45
+const COL_OWNER = 20
+const COL_SCORE = 4
+const COL_UPDATED = 10
+
+const pad = (s: string, width: number): string => {
+  const visible = s.replace(/\x1b\[[0-9;]*m/g, '')
+  const extra = s.length - visible.length
+  return s.padEnd(width + extra)
+}
+
+const truncate = (s: string, max: number): string =>
+  s.length > max ? `${s.slice(0, max - 1)}…` : s
+
+const getOwnerLabel = (change: ChangeInfo): string =>
+  change.owner?.name ?? change.owner?.email ?? String(change.owner?._account_id ?? '—')
+
+const renderTableHeader = (showOwner: boolean): void => {
+  const h = chalk.bold
+  const colSubject = showOwner ? COL_SUBJECT_TEAM : COL_SUBJECT_MINE
+  const ownerCol = showOwner ? `  ${h(pad('Owner', COL_OWNER))}` : ''
+  console.log(
+    `  ${h(pad('Change', COL_CHANGE))}  ${h(pad('Subject', colSubject))}${ownerCol}  ` +
+      `${h(pad('CR', COL_SCORE))}  ${h(pad('QR', COL_SCORE))}  ` +
+      `${h(pad('LR', COL_SCORE))}  ${h(pad('Verified', 8))}  ${h('Updated')}`,
+  )
+  const d = '─'
+  const ownerDiv = showOwner ? `  ${d.repeat(COL_OWNER)}` : ''
+  console.log(
+    `  ${d.repeat(COL_CHANGE)}  ${d.repeat(colSubject)}${ownerDiv}  ` +
+      `${d.repeat(COL_SCORE)}  ${d.repeat(COL_SCORE)}  ` +
+      `${d.repeat(COL_SCORE)}  ${d.repeat(8)}  ${d.repeat(COL_UPDATED)}`,
+  )
+}
+
+const renderTableRow = (change: ChangeInfo, showOwner: boolean): void => {
+  const colSubject = showOwner ? COL_SUBJECT_TEAM : COL_SUBJECT_MINE
+  const num = chalk.cyan(pad(String(change._number), COL_CHANGE))
+  const subject = pad(truncate(change.subject, colSubject), colSubject)
+  const ownerCol = showOwner
+    ? `  ${pad(truncate(getOwnerLabel(change), COL_OWNER), COL_OWNER)}`
+    : ''
+  const cr = pad(fmtCR(change.labels?.['Code-Review']), COL_SCORE)
+  const qr = pad(fmtLabel(change.labels?.['QA-Review']), COL_SCORE)
+  const lr = pad(fmtLabel(change.labels?.['Lint-Review']), COL_SCORE)
+  const verified = pad(fmtVerified(change.labels?.['Verified']), 8)
+  const updated = timeAgo(change.updated ?? change.created ?? '')
+  console.log(`  ${num}  ${subject}${ownerCol}  ${cr}  ${qr}  ${lr}  ${verified}  ${updated}`)
+}
+
+const renderDetailed = (change: ChangeInfo): void => {
+  console.log(`${chalk.bold.cyan('Change:')}   ${chalk.bold(String(change._number))}`)
+  console.log(`${chalk.bold.cyan('Subject:')}  ${change.subject}`)
+  console.log(`${chalk.bold.cyan('Status:')}   ${change.status}`)
+  console.log(`${chalk.bold.cyan('Project:')}  ${change.project}`)
+  console.log(`${chalk.bold.cyan('Branch:')}   ${change.branch}`)
+  if (change.owner?.name) console.log(`${chalk.bold.cyan('Owner:')}    ${change.owner.name}`)
+  if (change.updated) console.log(`${chalk.bold.cyan('Updated:')}  ${timeAgo(change.updated)}`)
+
+  const labels = change.labels
+  if (labels && Object.keys(labels).length > 0) {
+    const scores = Object.entries(labels)
+      .map(([name, info]) => {
+        const s = getLabelScore(info)
+        if (s === null) return null
+        const formatted = s > 0 ? chalk.green(`+${s}`) : chalk.red(String(s))
+        return `${name}:${formatted}`
+      })
+      .filter((x): x is string => x !== null)
+    if (scores.length > 0) {
+      console.log(`${chalk.bold.cyan('Reviews:')}  ${scores.join('  ')}`)
+    }
+  }
+}
+
+// ── Command ────────────────────────────────────────────────────────────────
+
+export const listCommand = (
+  options: ListOptions,
+): Effect.Effect<void, ApiError | ConfigError, ConfigServiceImpl | GerritApiService> =>
+  Effect.gen(function* () {
+    const configService = yield* ConfigService
+    const credentials = yield* configService.getCredentials
+    const gerritApi = yield* GerritApiService
+
+    const status = options.status ?? 'open'
+    const limit = options.limit ?? 25
+    const user = credentials.username
+
+    const baseQuery = options.reviewer
+      ? `(reviewer:${user} OR cc:${user}) status:${status}`
+      : `owner:${user} status:${status}`
+    const query = options.filter ? `${baseQuery} ${options.filter}` : baseQuery
+
+    const changes = yield* gerritApi.listChanges(query)
+    const limited = changes.slice(0, limit)
+
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            count: limited.length,
+            changes: limited.map((c) => ({
+              number: c._number,
+              subject: c.subject,
+              project: c.project,
+              branch: c.branch,
+              status: c.status,
+              change_id: c.change_id,
+              ...(c.updated ? { updated: c.updated } : {}),
+              ...(c.owner?.name ? { owner: c.owner.name } : {}),
+              ...(c.labels ? { labels: c.labels } : {}),
+            })),
+          },
+          null,
+          2,
+        ),
+      )
+      return
+    }
+
+    if (options.xml) {
+      console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+      console.log(`<changes count="${limited.length}">`)
+      for (const c of limited) {
+        console.log(`  <change>`)
+        console.log(`    <number>${c._number}</number>`)
+        console.log(`    <subject><![CDATA[${c.subject}]]></subject>`)
+        console.log(`    <project>${c.project}</project>`)
+        console.log(`    <branch>${c.branch}</branch>`)
+        console.log(`    <status>${c.status}</status>`)
+        console.log(`    <change_id>${c.change_id}</change_id>`)
+        if (c.updated) console.log(`    <updated>${c.updated}</updated>`)
+        if (c.owner?.name) console.log(`    <owner>${c.owner.name}</owner>`)
+        console.log(`  </change>`)
+      }
+      console.log(`</changes>`)
+      return
+    }
+
+    if (limited.length === 0) {
+      console.log(
+        chalk.dim(options.reviewer ? 'No changes need your review.' : 'No changes found.'),
+      )
+      return
+    }
+
+    if (options.detailed) {
+      for (const [i, change] of limited.entries()) {
+        if (i > 0) console.log('')
+        renderDetailed(change)
+      }
+      return
+    }
+
+    const showOwner = options.reviewer === true
+    console.log('')
+    renderTableHeader(showOwner)
+    for (const change of limited) {
+      renderTableRow(change, showOwner)
+    }
+    console.log('')
+  })

package/src/cli/commands/rebase.ts

@@ -5,6 +5,7 @@ import { escapeXML, sanitizeCDATA } from '@/utils/shell-safety'
 
 interface RebaseOptions {
   base?: string
+  allowConflicts?: boolean
   xml?: boolean
   json?: boolean
 }
@@ -29,7 +30,10 @@ export const rebaseCommand = (
     const resolvedChangeId = changeId || (yield* getChangeIdFromHead())
 
     // Perform the rebase - this returns the rebased change info
-    const change = yield* gerritApi.rebaseChange(resolvedChangeId, { base: options.base })
+    const change = yield* gerritApi.rebaseChange(resolvedChangeId, {
+      base: options.base,
+      allowConflicts: options.allowConflicts,
+    })
 
     if (options.json) {
       console.log(

package/src/cli/commands/retrigger.ts

@@ -0,0 +1,91 @@
+import { Effect } from 'effect'
+import chalk from 'chalk'
+import { input } from '@inquirer/prompts'
+import { type ApiError, GerritApiService, type GerritApiServiceImpl } from '@/api/gerrit'
+import { type ConfigError, ConfigService, type ConfigServiceImpl } from '@/services/config'
+import { getChangeIdFromHead, type GitError, type NoChangeIdError } from '@/utils/git-commit'
+
+export const RETRIGGER_HELP_TEXT = `
+Examples:
+  # Retrigger CI for the change in HEAD commit (auto-detected)
+  $ ger retrigger
+
+  # Retrigger CI for a specific change
+  $ ger retrigger 12345
+
+Notes:
+  - The retrigger comment is saved in config (set during "ger setup" or prompted on first use)
+  - Auto-detection reads the Change-Id footer from HEAD commit`
+
+export interface RetriggerOptions {
+  xml?: boolean
+  json?: boolean
+}
+
+export const retriggerCommand = (
+  changeId: string | undefined,
+  options: RetriggerOptions,
+): Effect.Effect<
+  void,
+  ApiError | ConfigError | GitError | NoChangeIdError | Error,
+  GerritApiServiceImpl | ConfigServiceImpl
+> =>
+  Effect.gen(function* () {
+    // Resolve change ID — explicit arg or auto-detect from HEAD
+    const resolvedChangeId = changeId !== undefined ? changeId : yield* getChangeIdFromHead()
+
+    // Get retrigger comment from config
+    const configService = yield* ConfigService
+    let retriggerComment = yield* configService.getRetriggerComment
+
+    // If not configured, prompt and save
+    if (!retriggerComment) {
+      if (!options.xml && !options.json) {
+        console.log(chalk.yellow('No retrigger comment configured.'))
+        console.log(
+          chalk.dim('This comment will be posted to trigger CI. It will be saved to config.'),
+        )
+      }
+
+      const prompted = yield* Effect.tryPromise({
+        try: () =>
+          input({
+            message: 'CI retrigger comment',
+          }),
+        catch: (e) =>
+          new Error(e instanceof Error ? e.message : 'Failed to read retrigger comment'),
+      })
+
+      if (!prompted.trim()) {
+        return yield* Effect.fail(new Error('Retrigger comment cannot be empty'))
+      }
+
+      retriggerComment = prompted.trim()
+      yield* configService.saveRetriggerComment(retriggerComment)
+
+      if (!options.xml && !options.json) {
+        console.log(chalk.dim('  Retrigger comment saved to config'))
+      }
+    }
+
+    // Post the comment
+    const gerritApi = yield* GerritApiService
+
+    if (!options.xml && !options.json) {
+      console.log(chalk.bold(`Retriggering CI for change ${chalk.cyan(resolvedChangeId)}...`))
+    }
+
+    yield* gerritApi.postReview(resolvedChangeId, { message: retriggerComment })
+
+    if (options.json) {
+      console.log(JSON.stringify({ status: 'success', change_id: resolvedChangeId }, null, 2))
+    } else if (options.xml) {
+      console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+      console.log(`<retrigger>`)
+      console.log(`  <status>success</status>`)
+      console.log(`  <change_id><![CDATA[${resolvedChangeId}]]></change_id>`)
+      console.log(`</retrigger>`)
+    } else {
+      console.log(chalk.green('  ✓ CI retrigger comment posted'))
+    }
+  })

package/src/cli/commands/reviewers.ts

@@ -0,0 +1,95 @@
+import { Effect } from 'effect'
+import { type ApiError, GerritApiService } from '@/api/gerrit'
+import { GitError, NoChangeIdError, getChangeIdFromHead } from '@/utils/git-commit'
+import { sanitizeCDATA } from '@/utils/shell-safety'
+import type { ReviewerListItem } from '@/schemas/reviewer'
+
+interface ReviewersOptions {
+  xml?: boolean
+  json?: boolean
+}
+
+function formatReviewer(r: ReviewerListItem): string {
+  const name =
+    r.name ?? r.username ?? (r._account_id !== undefined ? `#${r._account_id}` : undefined)
+  if (name !== undefined) return r.email ? `${name} <${r.email}>` : name
+  return r.email ?? 'unknown'
+}
+
+export const reviewersCommand = (
+  changeId?: string,
+  options: ReviewersOptions = {},
+): Effect.Effect<void, never, GerritApiService> =>
+  Effect.gen(function* () {
+    const gerritApi = yield* GerritApiService
+    const resolvedChangeId = changeId || (yield* getChangeIdFromHead())
+
+    const reviewers = yield* gerritApi.getReviewers(resolvedChangeId)
+
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            change_id: resolvedChangeId,
+            reviewers: reviewers.map((r) => ({
+              ...(r._account_id !== undefined ? { account_id: r._account_id } : {}),
+              name: r.name,
+              email: r.email,
+              username: r.username,
+            })),
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
+      console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+      console.log(`<reviewers_result>`)
+      console.log(`  <status>success</status>`)
+      console.log(`  <change_id><![CDATA[${sanitizeCDATA(resolvedChangeId)}]]></change_id>`)
+      console.log(`  <reviewers>`)
+      for (const r of reviewers) {
+        console.log(`    <reviewer>`)
+        if (r._account_id !== undefined)
+          console.log(`      <account_id>${r._account_id}</account_id>`)
+        if (r.name) console.log(`      <name><![CDATA[${sanitizeCDATA(r.name)}]]></name>`)
+        if (r.email) console.log(`      <email><![CDATA[${sanitizeCDATA(r.email)}]]></email>`)
+        if (r.username)
+          console.log(`      <username><![CDATA[${sanitizeCDATA(r.username)}]]></username>`)
+        console.log(`    </reviewer>`)
+      }
+      console.log(`  </reviewers>`)
+      console.log(`</reviewers_result>`)
+    } else {
+      if (reviewers.length === 0) {
+        console.log('No reviewers')
+      } else {
+        for (const r of reviewers) {
+          console.log(formatReviewer(r))
+        }
+      }
+    }
+  }).pipe(
+    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.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(`<reviewers_result>`)
+          console.log(`  <status>error</status>`)
+          console.log(`  <error><![CDATA[${sanitizeCDATA(errorMessage)}]]></error>`)
+          console.log(`</reviewers_result>`)
+        } else {
+          console.error(`✗ Error: ${errorMessage}`)
+        }
+        process.exit(1)
+      }),
+    ),
+  )

package/src/cli/commands/setup.ts

@@ -193,11 +193,8 @@ const setupEffect = (configService: ConfigServiceImpl) =>
                   console.log(chalk.dim(`Detected AI tools: ${availableTools.join(', ')}`))
                 }
 
-                // Get default suggestion
-                const defaultCommand =
-                  existingConfig?.aiTool ||
-                  (availableTools.includes('claude') ? 'claude' : availableTools[0]) ||
-                  ''
+                // Get default suggestion — no default to claude
+                const defaultCommand = existingConfig?.aiTool || (availableTools[0] ?? '')
 
                 // AI tool command with smart default
                 const aiToolCommand = await input({
@@ -205,7 +202,20 @@ const setupEffect = (configService: ConfigServiceImpl) =>
                     availableTools.length > 0
                       ? 'AI tool command (detected from system)'
                       : 'AI tool command (e.g., claude, llm, opencode, gemini)',
-                  default: defaultCommand || 'claude',
+                  default: defaultCommand || undefined,
+                })
+
+                console.log('')
+                console.log(chalk.yellow('Optional: CI Retrigger'))
+                console.log(
+                  chalk.dim(
+                    'Comment to post when triggering a CI build (e.g. a magic trigger string your CI watches for)',
+                  ),
+                )
+
+                const retriggerComment = await input({
+                  message: 'CI retrigger comment (leave blank to skip)',
+                  default: existingConfig?.retriggerComment ?? undefined,
                 })
 
                 // Build flat config
@@ -217,6 +227,9 @@ const setupEffect = (configService: ConfigServiceImpl) =>
                     aiTool: aiToolCommand,
                   }),
                   aiAutoDetect: !aiToolCommand,
+                  ...(retriggerComment.trim() && {
+                    retriggerComment: retriggerComment.trim(),
+                  }),
                 }
 
                 // Validate config using Schema instead of type assertion