ghreview 2.0.3 → 3.0.0

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [3.0.0](https://github.com/rvagg/ghreview/compare/v2.0.4...v3.0.0) (2026-02-07)
+
+### ⚠ BREAKING CHANGES
+
+* only include tracked files in review by default
+
+### Features
+
+* only include tracked files in review by default ([8e20211](https://github.com/rvagg/ghreview/commit/8e20211e48c12ab42e7e170f48478e881930f04d))
+* preserve staging state across review cycle ([6fe2429](https://github.com/rvagg/ghreview/commit/6fe242947623fc4fef3f8e75b1bc7b6baaf60463))
+
+## [2.0.4](https://github.com/rvagg/ghreview/compare/v2.0.3...v2.0.4) (2026-02-02)
+
+### Trivial Changes
+
+* **deps-dev:** bump vitest from 4.0.17 to 4.0.18 ([#27](https://github.com/rvagg/ghreview/issues/27)) ([116ab54](https://github.com/rvagg/ghreview/commit/116ab54f511e5f2089b643df9eb8b27150c9a977))
+
 ## [2.0.3](https://github.com/rvagg/ghreview/compare/v2.0.2...v2.0.3) (2026-01-27)
 
 ### Trivial Changes

package/bin/ghreview.js

@@ -18,9 +18,16 @@ process.on('SIGTERM', () => {
 yargs(hideBin(process.argv))
   .scriptName('ghreview')
   .usage('$0 <command> [args]')
-  .command('init', 'Create a PR for review', {}, async () => {
+  .command('init', 'Create a PR for review', (yargs) => {
+    return yargs.option('all', {
+      alias: 'a',
+      type: 'boolean',
+      default: false,
+      describe: 'Include untracked files (by default, only tracked and staged files are included)'
+    })
+  }, async (argv) => {
     try {
-      await init()
+      await init({ all: argv.all })
     } catch (error) {
       console.error(chalk.red('Error:'), error.message)
       process.exit(1)

package/lib/git.js

@@ -10,17 +10,25 @@ export async function getCurrentBranch () {
   }
 }
 
-export async function hasUnstagedChanges () {
+export async function hasReviewableChanges ({ all = false } = {}) {
   const git = simpleGit()
   const status = await git.status()
-  return status.files.length > 0
+  if (all) {
+    return status.files.length > 0
+  }
+  // Exclude untracked files — user must `git add` new files explicitly
+  return status.files.some(f => !(f.index === '?' && f.working_dir === '?'))
 }
 
-export async function createReviewCommit (message, authorConfig) {
+export async function createReviewCommit (message, authorConfig, { all = false } = {}) {
   const git = simpleGit()
 
-  // Add all changes
-  await git.add('.')
+  if (all) {
+    await git.add('.')
+  } else {
+    // Only stage tracked file modifications; new files require explicit `git add`
+    await git.add(['-u'])
+  }
 
   // Set up environment for custom author if provided
   const env = {}
@@ -44,6 +52,17 @@ export async function pushBranch (remote, branch) {
   }
 }
 
+export async function saveIndex () {
+  const git = simpleGit()
+  const treeHash = await git.raw(['write-tree'])
+  return treeHash.trim()
+}
+
+export async function restoreIndex (treeHash) {
+  const git = simpleGit()
+  await git.raw(['read-tree', treeHash])
+}
+
 export async function resetLastCommit () {
   const git = simpleGit()
   await git.reset(['HEAD~1'])

package/lib/index.js

@@ -3,7 +3,9 @@ import ora from 'ora'
 import { loadConfig } from './config.js'
 import {
   getCurrentBranch,
-  hasUnstagedChanges,
+  hasReviewableChanges,
+  saveIndex,
+  restoreIndex,
   createReviewCommit,
   pushBranch,
   resetLastCommit,
@@ -16,9 +18,10 @@ import {
   formatFeedback
 } from './github.js'
 
-export async function init () {
+export async function init ({ all = false } = {}) {
   const spinner = ora('Initializing review').start()
   let commitCreated = false
+  let savedTree = null
 
   try {
     // Check if we're in a git repository
@@ -39,9 +42,11 @@ export async function init () {
     const config = await loadConfig()
     const [owner, repo] = config.reviewRepo.split('/')
 
-    // Check for unstaged changes
-    if (!await hasUnstagedChanges()) {
-      spinner.fail('No unstaged changes to review')
+    // Check for reviewable changes
+    if (!await hasReviewableChanges({ all })) {
+      spinner.fail(all
+        ? 'No changes to review'
+        : 'No tracked changes to review (use --all to include untracked files)')
       return
     }
 
@@ -63,11 +68,15 @@ export async function init () {
     const currentBranch = await getCurrentBranch()
     await pushBranch('review', `${currentBranch}:${baseBranch}`)
 
+    // Snapshot the current index so we can restore staging state after reset
+    savedTree = await saveIndex()
+
     // Create temporary commit with changes
     spinner.text = 'Creating review commit'
     await createReviewCommit(
       `Review checkpoint ${timestamp}`,
-      config.author
+      config.author,
+      { all }
     )
     commitCreated = true
 
@@ -93,10 +102,13 @@ export async function init () {
     spinner.fail('Failed to create review')
     throw error
   } finally {
-    // Always reset the commit if we created one
+    // Always reset the commit if we created one, then restore original staging
     if (commitCreated) {
       try {
         await resetLastCommit()
+        if (savedTree) {
+          await restoreIndex(savedTree)
+        }
       } catch (resetError) {
         console.error(chalk.yellow('Warning: Failed to reset temporary commit'))
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghreview",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "description": "GitHub PR-based code review workflow for AI-assisted development",
   "type": "module",
   "main": "lib/index.js",

package/test/ghreview.test.js

@@ -23,9 +23,11 @@ describe('ghreview', () => {
       })
 
       // Mock git operations
-      vi.mocked(git.hasUnstagedChanges).mockResolvedValue(true)
+      vi.mocked(git.hasReviewableChanges).mockResolvedValue(true)
       vi.mocked(git.getCurrentBranch).mockResolvedValue('main')
       vi.mocked(git.ensureReviewRemote).mockResolvedValue('review')
+      vi.mocked(git.saveIndex).mockResolvedValue('abc123')
+      vi.mocked(git.restoreIndex).mockResolvedValue()
       vi.mocked(git.createReviewCommit).mockResolvedValue()
       vi.mocked(git.pushBranch).mockResolvedValue()
       vi.mocked(git.resetLastCommit).mockResolvedValue()
@@ -41,10 +43,12 @@ describe('ghreview', () => {
       await init()
 
       // Verify calls
-      expect(git.hasUnstagedChanges).toHaveBeenCalled()
+      expect(git.hasReviewableChanges).toHaveBeenCalled()
+      expect(git.saveIndex).toHaveBeenCalled()
       expect(git.createReviewCommit).toHaveBeenCalled()
       expect(git.pushBranch).toHaveBeenCalledTimes(2) // base and review
       expect(git.resetLastCommit).toHaveBeenCalled()
+      expect(git.restoreIndex).toHaveBeenCalledWith('abc123')
       expect(github.createPullRequest).toHaveBeenCalled()
     })
 
@@ -53,7 +57,7 @@ describe('ghreview', () => {
         reviewRepo: 'owner/repo',
         githubToken: 'test-token'
       })
-      vi.mocked(git.hasUnstagedChanges).mockResolvedValue(false)
+      vi.mocked(git.hasReviewableChanges).mockResolvedValue(false)
 
       await init()