@aaronshaf/ger 2.0.10 → 3.0.1

package/README.md

@@ -93,9 +93,6 @@ ger rebase 12345
 ger submit 12345
 ger restore 12345
 
-# AI-powered code review (requires claude, llm, or opencode CLI)
-ger review 12345
-ger review 12345 --dry-run  # Preview without posting
 ```
 
 ## Commands
@@ -711,29 +708,6 @@ ger groups-members project-reviewers --xml
 - Group IDs can be names, numeric IDs, or UUIDs
 - Use groups with `ger add-reviewer --group` to add entire teams as reviewers
 
-### AI-Powered Review
-
-The `ger review` command provides automated code review using AI tools (claude, llm, or opencode CLI).
-
-```bash
-# Full AI review with inline and overall comments
-ger review 12345
-
-# Preview what would be posted without actually posting
-ger review 12345 --dry-run
-
-# Show debug output including AI responses
-ger review 12345 --debug
-```
-
-The review command performs a two-stage review process:
-1. **Inline comments**: Specific code issues with line-by-line feedback
-2. **Overall review**: High-level assessment and recommendations
-
-Requirements:
-- One of these AI tools must be installed: `claude`, `llm`, or `opencode`
-- Gerrit credentials must be configured (`ger setup`)
-
 ## Claude Code Skill
 
 This repository includes a Claude Code Agent Skill that teaches Claude how to work effectively with Gerrit using the ger CLI. The skill provides Claude with expertise in Gerrit workflows, command usage, and best practices.

package/docs/prd/architecture.md

@@ -6,16 +6,16 @@
 ┌─────────────────────────────────────────────────────────────┐
 │                         CLI Layer                           │
 │  ┌─────────┐ ┌─────────┐ ┌─────────┐ ┌─────────┐           │
-│  │  show   │ │ comment │ │  push   │ │ review  │  ...      │
+│  │  show   │ │ comment │ │  push   │ │  vote   │  ...      │
 │  └────┬────┘ └────┬────┘ └────┬────┘ └────┬────┘           │
 └───────┼───────────┼───────────┼───────────┼─────────────────┘
         │           │           │           │
 ┌───────┴───────────┴───────────┴───────────┴─────────────────┐
 │                      Service Layer                          │
-│  ┌──────────────┐ ┌──────────────┐ ┌──────────────┐        │
-│  │ GerritApi    │ │ ConfigService│ │ ReviewStrategy│        │
-│  │ Service      │ │              │ │              │        │
-│  └──────────────┘ └──────────────┘ └──────────────┘        │
+│  ┌──────────────┐ ┌──────────────┐                         │
+│  │ GerritApi    │ │ ConfigService│                         │
+│  │ Service      │ │              │                         │
+│  └──────────────┘ └──────────────┘                         │
 └───────┬───────────────────────────────────────────────────────┘
         │
 ┌───────┴─────────────────────────────────────────────────────┐
@@ -46,7 +46,6 @@ src/
 │
 ├── services/              # Business logic services
 │   ├── config.ts          # Configuration management
-│   ├── review-strategy.ts # AI tool strategies
 │   ├── git-worktree.ts    # Git worktree operations
 │   └── commit-hook.ts     # Gerrit hook installation
 │
@@ -59,12 +58,7 @@ src/
 │   ├── git-commit.ts      # Git operations
 │   ├── formatters.ts      # Output formatting
 │   ├── shell-safety.ts    # XML/CDATA handling
-│   └── ... (diff, comment, review utils)
-│
-├── prompts/               # AI review prompts
-│   ├── default-review.md
-│   ├── system-inline-review.md
-│   └── system-overall-review.md
+│   └── ... (diff, comment utils)
 │
 └── i18n/                  # Internationalization (planned)
 
@@ -207,42 +201,6 @@ User: echo '...' | ger comment 12345
        Success/Error
 ```
 
-## AI Integration Flow
-
-```
-User: ger review 12345
-         │
-         ▼
-┌─────────────────────┐
-│ Fetch change diff   │
-│ (API: GET /patch)   │
-└─────────┬───────────┘
-          │
-          ▼
-┌─────────────────────┐
-│ Detect AI tool      │
-│ (claude/llm/etc)    │
-└─────────┬───────────┘
-          │
-          ▼
-┌─────────────────────┐     ┌─────────────────────┐
-│ Stage 1: Inline     │────►│ AI: Generate inline │
-│ comments            │     │ comments JSON       │
-└─────────┬───────────┘     └─────────────────────┘
-          │
-          ▼
-┌─────────────────────┐     ┌─────────────────────┐
-│ Stage 2: Overall    │────►│ AI: Generate        │
-│ review              │     │ summary             │
-└─────────┬───────────┘     └─────────────────────┘
-          │
-          ▼
-┌─────────────────────┐
-│ API: POST /review   │
-│ (all comments)      │
-└─────────────────────┘
-```
-
 ## Configuration Architecture
 
 ```

package/docs/prd/commands.md

@@ -121,6 +121,32 @@ ger restore <change-id>
 ger restore <change-id> -m "Needed after all"
 ```
 
+### set-ready
+
+Mark a WIP change as ready for review via the Gerrit REST API. Does not require a git push.
+
+```bash
+ger set-ready <change-id>
+ger set-ready <change-id> -m "Ready for another look"
+```
+
+| Option | Description |
+|--------|-------------|
+| `-m <message>` | Optional message to include with the status change |
+
+### set-wip
+
+Mark a change as work-in-progress via the Gerrit REST API. Does not require a git push.
+
+```bash
+ger set-wip <change-id>
+ger set-wip <change-id> -m "Still in progress"
+```
+
+| Option | Description |
+|--------|-------------|
+| `-m <message>` | Optional message to include with the status change |
+
 ### workspace
 
 View local git branch tracking information.
@@ -236,26 +262,6 @@ ger vote <change-id> --label "Custom-Label" +1
 | `--label <name> <score>` | Custom label vote |
 | `-m <message>` | Optional message with vote |
 
-### review
-
-AI-powered code review (multi-stage).
-
-```bash
-ger review <change-id>
-ger review <change-id> --tool claude  # Specific AI tool
-ger review  # Auto-detect change from HEAD
-```
-
-| Option | Description |
-|--------|-------------|
-| `--tool <name>` | AI tool (claude, llm, opencode, gemini) |
-| `--inline-only` | Only post inline comments |
-| `--overall-only` | Only post overall review |
-
-**Stages:**
-1. **Inline**: Generate line-specific comments
-2. **Overall**: Generate high-level assessment
-
 ### add-reviewer
 
 Add reviewers or groups to a change.

package/index.ts

@@ -61,25 +61,6 @@ export {
   type ConfigErrorFields,
 } from './src/services/config'
 
-// ============================================================================
-// Review Strategy Service
-// ============================================================================
-
-export {
-  // Strategy types
-  type ReviewStrategy,
-  // Built-in strategies
-  claudeCliStrategy,
-  geminiCliStrategy,
-  openCodeCliStrategy,
-  // Service
-  ReviewStrategyService,
-  ReviewStrategyServiceLive,
-  type ReviewStrategyServiceImpl,
-  // Errors
-  ReviewStrategyError,
-  type ReviewStrategyErrorFields,
-} from './src/services/review-strategy'
 
 // ============================================================================
 // Git Worktree Service

package/llms.txt

@@ -114,14 +114,6 @@ ger extract-url "build-summary-report" | tail -1   # Latest Jenkins URL
 ger extract-url "jenkins" --json | jq -r '.urls[-1]'
 ```
 
-### AI Review
-
-```bash
-ger review <change-id>              # AI-powered review (requires claude/gemini/opencode CLI)
-ger review <change-id> --tool claude
-ger review <change-id> --comment --yes  # Post review comments
-```
-
 ### Groups
 
 ```bash
@@ -179,12 +171,6 @@ ger comment 12345 -m "LGTM"        # Add comment
 ger vote 12345 --code-review +2    # Approve
 ```
 
-### Post AI review
-
-```bash
-ger review 12345 --comment --yes
-```
-
 ### Check build and get failures
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "2.0.10",
+  "version": "3.0.1",
   "description": "Gerrit CLI and SDK - A modern CLI tool and TypeScript SDK for Gerrit Code Review, built with Effect-TS",
   "keywords": [
     "gerrit",
@@ -30,10 +30,6 @@
       "import": "./src/services/config.ts",
       "types": "./src/services/config.ts"
     },
-    "./services/review-strategy": {
-      "import": "./src/services/review-strategy.ts",
-      "types": "./src/services/review-strategy.ts"
-    },
     "./services/git-worktree": {
       "import": "./src/services/git-worktree.ts",
       "types": "./src/services/git-worktree.ts"

package/src/api/gerrit.ts

@@ -19,6 +19,7 @@ import {
   AccountInfo,
 } from '@/schemas/gerrit'
 import { filterMeaningfulMessages } from '@/utils/message-filters'
+import { convertToUnifiedDiff } from '@/utils/diff-formatters'
 import { ConfigService } from '@/services/config'
 import { normalizeChangeIdentifier } from '@/utils/change-id'
 
@@ -93,6 +94,8 @@ export interface GerritApiServiceImpl {
   readonly getTopic: (changeId: string) => Effect.Effect<string | null, ApiError>
   readonly setTopic: (changeId: string, topic: string) => Effect.Effect<string, ApiError>
   readonly deleteTopic: (changeId: string) => Effect.Effect<void, ApiError>
+  readonly setReady: (changeId: string, message?: string) => Effect.Effect<void, ApiError>
+  readonly setWip: (changeId: string, message?: string) => Effect.Effect<void, ApiError>
 }
 
 export const GerritApiService: Context.Tag<GerritApiServiceImpl, GerritApiServiceImpl> =
@@ -455,39 +458,6 @@ export const GerritApiServiceLive: Layer.Layer<GerritApiService, never, ConfigSe
           return yield* getPatch(changeId, revisionId)
         })
 
-      const convertToUnifiedDiff = (diff: FileDiffContent, filePath: string): string => {
-        const lines: string[] = []
-
-        if (diff.diff_header) {
-          lines.push(...diff.diff_header)
-        } else {
-          lines.push(`--- a/${filePath}`)
-          lines.push(`+++ b/${filePath}`)
-        }
-
-        for (const section of diff.content) {
-          if (section.ab) {
-            for (const line of section.ab) {
-              lines.push(` ${line}`)
-            }
-          }
-
-          if (section.a) {
-            for (const line of section.a) {
-              lines.push(`-${line}`)
-            }
-          }
-
-          if (section.b) {
-            for (const line of section.b) {
-              lines.push(`+${line}`)
-            }
-          }
-        }
-
-        return lines.join('\n')
-      }
-
       const getComments = (changeId: string, revisionId = 'current') =>
         Effect.gen(function* () {
           const { credentials, authHeader } = yield* getCredentialsAndAuth
@@ -667,6 +637,24 @@ export const GerritApiServiceLive: Layer.Layer<GerritApiService, never, ConfigSe
           yield* makeRequest(getTopicUrl(credentials.host, normalized), authHeader, 'DELETE')
         })
 
+      const setReady = (changeId: string, message?: string) =>
+        Effect.gen(function* () {
+          const { credentials, authHeader } = yield* getCredentialsAndAuth
+          const normalized = yield* normalizeAndValidate(changeId)
+          const url = `${credentials.host}/a/changes/${encodeURIComponent(normalized)}/ready`
+          const body = message ? { message } : {}
+          yield* makeRequest(url, authHeader, 'POST', body)
+        })
+
+      const setWip = (changeId: string, message?: string) =>
+        Effect.gen(function* () {
+          const { credentials, authHeader } = yield* getCredentialsAndAuth
+          const normalized = yield* normalizeAndValidate(changeId)
+          const url = `${credentials.host}/a/changes/${encodeURIComponent(normalized)}/wip`
+          const body = message ? { message } : {}
+          yield* makeRequest(url, authHeader, 'POST', body)
+        })
+
       return {
         getChange,
         listChanges,
@@ -694,6 +682,8 @@ export const GerritApiServiceLive: Layer.Layer<GerritApiService, never, ConfigSe
         getTopic,
         setTopic,
         deleteTopic,
+        setReady,
+        setWip,
       }
     }),
   )

package/src/cli/commands/set-ready.ts

@@ -0,0 +1,76 @@
+import { Effect } from 'effect'
+import { type ApiError, GerritApiService } from '@/api/gerrit'
+import { sanitizeCDATA } from '@/utils/shell-safety'
+
+interface SetReadyOptions {
+  message?: string
+  xml?: boolean
+  json?: boolean
+}
+
+export const setReadyCommand = (
+  changeId?: string,
+  options: SetReadyOptions = {},
+): Effect.Effect<void, ApiError, GerritApiService> =>
+  Effect.gen(function* () {
+    const gerritApi = yield* GerritApiService
+
+    if (!changeId) {
+      console.error('✗ Change ID is required')
+      console.error('  Usage: ger set-ready <change-id>')
+      return
+    }
+
+    // Try to fetch change details for richer output, but don't let it block the mutation
+    let changeNumber: number | undefined
+    let subject: string | undefined
+    try {
+      const change = yield* gerritApi.getChange(changeId)
+      changeNumber = change._number
+      subject = change.subject
+    } catch {
+      // Proceed without change details
+    }
+
+    yield* gerritApi.setReady(changeId, options.message)
+
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            ...(changeNumber !== undefined
+              ? { change_number: changeNumber }
+              : { change_id: changeId }),
+            ...(subject !== undefined ? { subject } : {}),
+            ...(options.message ? { message: options.message } : {}),
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
+      console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+      console.log(`<set_ready_result>`)
+      console.log(`  <status>success</status>`)
+      if (changeNumber !== undefined) {
+        console.log(`  <change_number>${changeNumber}</change_number>`)
+      } else {
+        console.log(`  <change_id>${changeId}</change_id>`)
+      }
+      if (subject !== undefined) {
+        console.log(`  <subject><![CDATA[${sanitizeCDATA(subject)}]]></subject>`)
+      }
+      if (options.message) {
+        console.log(`  <message><![CDATA[${sanitizeCDATA(options.message)}]]></message>`)
+      }
+      console.log(`</set_ready_result>`)
+    } else {
+      const label = changeNumber !== undefined ? `${changeNumber}` : changeId
+      const suffix = subject !== undefined ? `: ${subject}` : ''
+      console.log(`✓ Marked change ${label} as ready for review${suffix}`)
+      if (options.message) {
+        console.log(`  Message: ${options.message}`)
+      }
+    }
+  })

package/src/cli/commands/set-wip.ts

@@ -0,0 +1,76 @@
+import { Effect } from 'effect'
+import { type ApiError, GerritApiService } from '@/api/gerrit'
+import { sanitizeCDATA } from '@/utils/shell-safety'
+
+interface SetWipOptions {
+  message?: string
+  xml?: boolean
+  json?: boolean
+}
+
+export const setWipCommand = (
+  changeId?: string,
+  options: SetWipOptions = {},
+): Effect.Effect<void, ApiError, GerritApiService> =>
+  Effect.gen(function* () {
+    const gerritApi = yield* GerritApiService
+
+    if (!changeId) {
+      console.error('✗ Change ID is required')
+      console.error('  Usage: ger set-wip <change-id>')
+      return
+    }
+
+    // Try to fetch change details for richer output, but don't let it block the mutation
+    let changeNumber: number | undefined
+    let subject: string | undefined
+    try {
+      const change = yield* gerritApi.getChange(changeId)
+      changeNumber = change._number
+      subject = change.subject
+    } catch {
+      // Proceed without change details
+    }
+
+    yield* gerritApi.setWip(changeId, options.message)
+
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            ...(changeNumber !== undefined
+              ? { change_number: changeNumber }
+              : { change_id: changeId }),
+            ...(subject !== undefined ? { subject } : {}),
+            ...(options.message ? { message: options.message } : {}),
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
+      console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+      console.log(`<set_wip_result>`)
+      console.log(`  <status>success</status>`)
+      if (changeNumber !== undefined) {
+        console.log(`  <change_number>${changeNumber}</change_number>`)
+      } else {
+        console.log(`  <change_id>${changeId}</change_id>`)
+      }
+      if (subject !== undefined) {
+        console.log(`  <subject><![CDATA[${sanitizeCDATA(subject)}]]></subject>`)
+      }
+      if (options.message) {
+        console.log(`  <message><![CDATA[${sanitizeCDATA(options.message)}]]></message>`)
+      }
+      console.log(`</set_wip_result>`)
+    } else {
+      const label = changeNumber !== undefined ? `${changeNumber}` : changeId
+      const suffix = subject !== undefined ? `: ${subject}` : ''
+      console.log(`✓ Marked change ${label} as work-in-progress${suffix}`)
+      if (options.message) {
+        console.log(`  Message: ${options.message}`)
+      }
+    }
+  })

package/src/cli/commands/setup.ts

@@ -260,7 +260,6 @@ const setupEffect = (configService: ConfigServiceImpl) =>
     Effect.tap(() => Console.log('You can now use:')),
     Effect.tap(() => Console.log('  • "ger mine" to view your changes')),
     Effect.tap(() => Console.log('  • "ger show <change-id>" to view change details')),
-    Effect.tap(() => Console.log('  • "ger review <change-id>" to review with AI')),
     Effect.catchAll((error) =>
       pipe(
         Console.error(

package/src/cli/index.ts

@@ -75,6 +75,7 @@ COMMON LLM WORKFLOWS
   Review a change:    ger show <id> → ger diff <id> → ger comments <id>
   Post a review:      ger comment <id> -m "..." → ger vote <id> <label> <score>
   Manage changes:     ger push, ger checkout <id>, ger abandon <id>, ger submit <id>
+  WIP toggle:         ger set-wip <id>, ger set-ready <id> [-m "message"]
   Check CI:           ger build-status <id> --exit-status
 
 EXIT CODES

package/src/cli/register-commands.ts

@@ -2,11 +2,8 @@ import type { Command } from 'commander'
 import { Effect } from 'effect'
 import { GerritApiServiceLive } from '@/api/gerrit'
 import { ConfigServiceLive } from '@/services/config'
-import { ReviewStrategyServiceLive } from '@/services/review-strategy'
-import { GitWorktreeServiceLive } from '@/services/git-worktree'
 import { CommitHookServiceLive } from '@/services/commit-hook'
-import { abandonCommand } from './commands/abandon'
-import { restoreCommand } from './commands/restore'
+import { registerStateCommands } from './register-state-commands'
 import { rebaseCommand } from './commands/rebase'
 import { submitCommand } from './commands/submit'
 import { topicCommand, TOPIC_HELP_TEXT } from './commands/topic'
@@ -23,7 +20,6 @@ import { installHookCommand } from './commands/install-hook'
 import { mineCommand } from './commands/mine'
 import { openCommand } from './commands/open'
 import { pushCommand, PUSH_HELP_TEXT } from './commands/push'
-import { reviewCommand } from './commands/review'
 import { searchCommand, SEARCH_HELP_TEXT } from './commands/search'
 import { setup } from './commands/setup'
 import { showCommand, SHOW_HELP_TEXT } from './commands/show'
@@ -240,43 +236,8 @@ export function registerCommands(program: Command): void {
       )
     })
 
-  // abandon command
-  program
-    .command('abandon [change-id]')
-    .description(
-      'Abandon a change (interactive mode if no change-id provided; accepts change number or Change-ID)',
-    )
-    .option('-m, --message <message>', 'Abandon message')
-    .option('--xml', 'XML output for LLM consumption')
-    .option('--json', 'JSON output for programmatic consumption')
-    .action(async (changeId, options) => {
-      await executeEffect(
-        abandonCommand(changeId, options).pipe(
-          Effect.provide(GerritApiServiceLive),
-          Effect.provide(ConfigServiceLive),
-        ),
-        options,
-        'abandon_result',
-      )
-    })
-
-  // restore command
-  program
-    .command('restore <change-id>')
-    .description('Restore an abandoned change (accepts change number or Change-ID)')
-    .option('-m, --message <message>', 'Restoration message')
-    .option('--xml', 'XML output for LLM consumption')
-    .option('--json', 'JSON output for programmatic consumption')
-    .action(async (changeId, options) => {
-      await executeEffect(
-        restoreCommand(changeId, options).pipe(
-          Effect.provide(GerritApiServiceLive),
-          Effect.provide(ConfigServiceLive),
-        ),
-        options,
-        'restore_result',
-      )
-    })
+  // abandon / restore / set-ready / set-wip commands
+  registerStateCommands(program)
 
   // rebase command
   program
@@ -636,64 +597,4 @@ Note:
         process.exit(1)
       }
     })
-
-  // review command
-  program
-    .command('review <change-id>')
-    .description(
-      'AI-powered code review that analyzes changes and optionally posts comments (accepts change number or Change-ID)',
-    )
-    .option('--comment', 'Post the review as comments (prompts for confirmation)')
-    .option('-y, --yes', 'Skip confirmation prompts when posting comments')
-    .option('--debug', 'Show debug output including AI responses')
-    .option('--prompt <file>', 'Path to custom review prompt file (e.g., ~/prompts/review.md)')
-    .option('--tool <tool>', 'Preferred AI tool (claude, gemini, opencode)')
-    .option('--system-prompt <prompt>', 'Custom system prompt for the AI')
-    .addHelpText(
-      'after',
-      `
-This command uses AI (claude CLI, gemini CLI, or opencode CLI) to review a Gerrit change.
-It performs a two-stage review process:
-1. Generates inline comments for specific code issues
-2. Generates an overall review comment
-By default, the review is only displayed in the terminal.
-Use --comment to post the review to Gerrit (with confirmation prompts).
-Use --comment --yes to post without confirmation.
-
-Requirements:
-  - One of these AI tools must be available: claude CLI, gemini CLI, or opencode CLI
-  - Gerrit credentials must be configured (run 'ger setup' first)
-
-Examples:
-  $ ger review 12345
-  $ ger review If5a3ae8cb5a107e187447802358417f311d0c4b1
-  $ ger review 12345 --comment
-  $ ger review 12345 --comment --yes
-  $ ger review 12345 --tool gemini
-  $ ger review 12345 --debug
-
-Note: Both change number (e.g., 12345) and Change-ID (e.g., If5a3ae8...) formats are accepted
-`,
-    )
-    .action(async (changeId, options) => {
-      try {
-        const effect = reviewCommand(changeId, {
-          comment: options.comment,
-          yes: options.yes,
-          debug: options.debug,
-          prompt: options.prompt,
-          tool: options.tool,
-          systemPrompt: options.systemPrompt,
-        }).pipe(
-          Effect.provide(ReviewStrategyServiceLive),
-          Effect.provide(GerritApiServiceLive),
-          Effect.provide(ConfigServiceLive),
-          Effect.provide(GitWorktreeServiceLive),
-        )
-        await Effect.runPromise(effect)
-      } catch (error) {
-        console.error('✗ Error:', error instanceof Error ? error.message : String(error))
-        process.exit(1)
-      }
-    })
 }