feat: add cherry-pick workflow to finish command

[fammasmaz-agent]

[fammasmaz-agent]

Starting my review of the cherry-pick workflow addition. This looks like a substantial feature with changes across the CLI, finish command, and git utilities. Diving in now.

[fammasmaz-agent]

Overall Assessment

This PR adds a well-structured cherry-pick workflow to the finish command, providing an alternative to the PR-based workflow. The implementation correctly handles conflict detection, cleanup on failure, and integrates smoothly with the existing session management system.

The core logic is sound—commits are retrieved in the correct order for cherry-picking (oldest to newest via --reverse), dirty worktree checks are in place, and the original branch is restored on failure. The dry-run mode is also properly implemented.

Architectural Feedback

The approach of adding cherry-pick as an alternative path within finish() rather than a separate command makes sense, as it shares the same session context and cleanup flow. The new git utility functions (getCommitsAhead, cherryPick, cherryPickAbort) are clean and follow the existing patterns in git.ts.

One consideration: the relationship between --cherry-pick, --pr, and --merge flags could benefit from clearer documentation about which combinations are valid and what takes precedence.

Key Suggestions

1. Unused parameter: sessionBranch in performCherryPickToBase() is never used—consider removing or marking with underscore
2. Flag precedence: Document or validate mutual exclusivity between --cherry-pick and --pr
3. CLI convention: The -cp short flag is unconventional (two characters)—consider alternatives

Nitpicks and Minor Points

• The version bump from 1.0.3 to 2.0.0 is appropriate for this feature addition
• The quote style changes (single → double) add noise to the diff but are a valid style choice
• Consider adding the new --cherry-pick option to the README or help documentation

Questions for the Author

• Is there a specific reason sessionBranch is passed to performCherryPickToBase even though it's unused? Planning for future functionality?
• Should there be validation preventing --cherry-pick and --merge from being used together, or is that combination intentionally supported?

This review was generated by an AI assistant.

[fammasmaz-agent]

The sessionBranch parameter is declared but never used within this function. Consider either removing it or prefixing with underscore to indicate intentional non-use.

Suggested change

	function performCherryPickToBase(
	mainRepoRoot: string,
	sessionBranch: string,
	baseBranch: string,
	commits: Array<{ sha: string; message: string }>,
	dryRun: boolean,
	): { success: boolean; error?: string } {
	function performCherryPickToBase(
	mainRepoRoot: string,
	_sessionBranch: string,
	baseBranch: string,
	commits: Array<{ sha: string; message: string }>,
	dryRun: boolean,
	): { success: boolean; error?: string } {

[fammasmaz-agent]

When both --cherry-pick and --pr flags are provided, --cherry-pick silently takes precedence due to this condition being checked first. Consider either:

1. Adding explicit mutual exclusivity validation with a clear error message, or
2. Documenting this precedence behavior in the CLI help text

[fammasmaz-agent]

Minor: The short flag -cp is a two-character alias, which is unconventional for CLI tools (most use single-character short flags). Consider using just --cherry-pick without a short alias, or a single-character alternative like -C if it's available and makes sense semantically.

[FammasMaz]

@Fmazbot-agent There's a lot of reformatting of code here that is not relevant to the need of the pr. Please undo that.

Overall Assessment

This PR adds a well-structured cherry-pick workflow to the finish command, providing an alternative to the PR-based workflow. The implementation correctly handles conflict detection, cleanup on failure, and integrates smoothly with the existing session management system.

The core logic is sound—commits are retrieved in the correct order for cherry-picking (oldest to newest via --reverse), dirty worktree checks are in place, and the original branch is restored on failure. The dry-run mode is also properly implemented.

Architectural Feedback

The approach of adding cherry-pick as an alternative path within finish() rather than a separate command makes sense, as it shares the same session context and cleanup flow. The new git utility functions (getCommitsAhead, cherryPick, cherryPickAbort) are clean and follow the existing patterns in git.ts.

One consideration: the relationship between --cherry-pick, --pr, and --merge flags could benefit from clearer documentation about which combinations are valid and what takes precedence.

Key Suggestions

1. Unused parameter: sessionBranch in performCherryPickToBase() is never used—consider removing or marking with underscore
2. Flag precedence: Document or validate mutual exclusivity between --cherry-pick and --pr
3. CLI convention: The -cp short flag is unconventional (two characters)—consider alternatives

Nitpicks and Minor Points

• The version bump from 1.0.3 to 2.0.0 is appropriate for this feature addition
• The quote style changes (single → double) add noise to the diff but are a valid style choice
• Consider adding the new --cherry-pick option to the README or help documentation

Questions for the Author

• Is there a specific reason sessionBranch is passed to performCherryPickToBase even though it's unused? Planning for future functionality?
• Should there be validation preventing --cherry-pick and --merge from being used together, or is that combination intentionally supported?

This review was generated by an AI assistant.

[FammasMaz]

@Fmazbot-agent There's a lot of reformatting of code here that is not relevant to the need of the pr. Please undo that.

[fammasmaz-agent]

@FammasMaz, understood. I'll analyze the diff to identify the formatting-only changes (like quote style changes) that aren't related to the cherry-pick feature, and revert them while keeping the functional changes intact.

Starting the analysis now.

[fammasmaz-agent]

@FammasMaz, I've successfully removed the reformatting changes while preserving the cherry-pick feature.

Summary

The PR originally contained two types of changes:

1. Functional changes: The cherry-pick workflow feature
2. Reformatting changes: Quote style changes (single → double quotes), multi-line formatting, arrow function style changes

I've now reverted all the reformatting changes while keeping the functional cherry-pick feature intact.

Changes Made

Reverted (reformatting):

• Quote style changes (restored single quotes throughout)
• Multi-line formatting of function signatures
• Arrow function formatting changes ((line) => back to line =>)
• Object/array expansion formatting

Preserved (functional cherry-pick feature):

• src/lib/git.ts: Added getCommitsAhead(), cherryPick(), cherryPickAbort() functions
• src/commands/finish.ts: Added cherryPick option to FinishOptions, added performCherryPickToBase() function, added cherry-pick workflow logic
• src/index.ts: Added --cherry-pick CLI option to the finish command

Commit

The changes were committed in: c79e75f

Diff Stats

 src/commands/finish.ts | 412 insertions(+), 659 deletions(-)
 src/index.ts           | (net reduction due to formatting revert)
 src/lib/git.ts         | (net reduction due to formatting revert)

The net reduction in lines is due to reverting the multi-line formatting that was adding extra lines.

This update was generated by an AI assistant.

[FammasMaz]

@fmazbot-agent You need to update docs as well accordingly

[fammasmaz-agent]

@FammasMaz, I'm on it! I'll update the documentation to include the new --cherry-pick option for the finish command.

Since this PR is already merged, I'll create a new branch from master and open a separate PR with the documentation updates.

Starting now.

[fammasmaz-agent]

@FammasMaz, I've updated the documentation for the cherry-pick workflow.

Summary

Created a new PR with documentation updates for the --cherry-pick option added in this PR.

Changes Made

• Section 3 (Finish): Updated the header to "Finish (PR-first or Cherry-pick)" and added a new "Cherry-pick workflow" subsection explaining:

  • How to use cry finish --cherry-pick
  • What it does (get commits, switch to base branch, cherry-pick, push)
  • When to use it (bypass PR workflow for direct changes)

• CLI Flags Section: Added --cherry-pick to the documented flags for cry finish

Pull Request Created

#6

Ready for your review!

This update was generated by an AI assistant.