Skip to content

add --unstaged option to view only unstaged files/hunks #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
githendrik wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −7
Open

add --unstaged option to view only unstaged files/hunks #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions apps/hook/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
* - Triggered by /review slash command
* - Runs git diff, opens review UI
* - Outputs feedback to stdout (captured by slash command)
* - Flags:
* - `--unstaged`: Show only unstaged changes (default: all uncommitted changes)
* - `--local`: Use local worktree for PR/MR reviews (default for PR URLs)
* - `--no-local`: Skip local worktree for PR/MR reviews
*
* 3. Annotate (`plannotator annotate <file.md>`):
* - Triggered by /plannotator-annotate slash command
Expand Down Expand Up @@ -194,6 +198,8 @@ if (args[0] === "sessions") {
if (localIdx !== -1) args.splice(localIdx, 1);
const noLocalIdx = args.indexOf("--no-local");
if (noLocalIdx !== -1) args.splice(noLocalIdx, 1);
const unstagedIdx = args.indexOf("--unstaged");
if (unstagedIdx !== -1) args.splice(unstagedIdx, 1);

const urlArg = args[1];
const isPRMode = urlArg?.startsWith("http://") || urlArg?.startsWith("https://");
Expand All @@ -202,9 +208,9 @@ if (args[0] === "sessions") {
let rawPatch: string;
let gitRef: string;
let diffError: string | undefined;
let initialDiffType: DiffType | undefined;
let gitContext: Awaited<ReturnType<typeof getVcsContext>> | undefined;
let prMetadata: Awaited<ReturnType<typeof fetchPR>>["metadata"] | undefined;
let initialDiffType: DiffType | undefined;
let agentCwd: string | undefined;
let worktreeCleanup: (() => void | Promise<void>) | undefined;

Expand Down Expand Up @@ -379,7 +385,7 @@ if (args[0] === "sessions") {
} else {
// --- Local Review Mode ---
gitContext = await getVcsContext();
initialDiffType = gitContext.vcsType === "p4" ? "p4-default" : "uncommitted";
initialDiffType = unstagedIdx !== -1 ? "unstaged" : "uncommitted";
const diffResult = await runVcsDiff(initialDiffType, gitContext.defaultBranch);
rawPatch = diffResult.patch;
gitRef = diffResult.label;
Expand Down
15 changes: 12 additions & 3 deletions apps/opencode-plugin/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@ export async function handleReviewCommand(
const { client, reviewHtmlContent, getSharingEnabled, getShareBaseUrl, directory } = deps;

// @ts-ignore - Event properties contain arguments
const urlArg: string = event.properties?.arguments || "";
const argsString: string = event.properties?.arguments || "";
const args = argsString.split(" ").filter(Boolean);

// Parse flags
const unstagedIdx = args.indexOf("--unstaged");
const showUnstaged = unstagedIdx !== -1;

// Find URL arg (first non-flag argument)
const urlArg = args.find(arg => !arg.startsWith("--"));
const isPRMode = urlArg?.startsWith("http://") || urlArg?.startsWith("https://");

let rawPatch: string;
Expand Down Expand Up @@ -78,7 +86,8 @@ export async function handleReviewCommand(
client.app.log({ level: "info", message: "Opening code review UI..." });

gitContext = await getGitContext(directory);
const diffResult = await runGitDiffWithContext("uncommitted", gitContext);
const diffType: import("@plannotator/shared/review-core").DiffType = showUnstaged ? "unstaged" : "uncommitted";
const diffResult = await runGitDiffWithContext(diffType, gitContext);
rawPatch = diffResult.patch;
gitRef = diffResult.label;
diffError = diffResult.error;
Expand All @@ -89,7 +98,7 @@ export async function handleReviewCommand(
gitRef,
error: diffError,
origin: "opencode",
diffType: isPRMode ? undefined : "uncommitted",
diffType: isPRMode ? undefined : (showUnstaged ? "unstaged" : "uncommitted"),
gitContext,
prMetadata,
sharingEnabled: await getSharingEnabled(),
Expand Down
16 changes: 14 additions & 2 deletions apps/pi-extension/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,16 @@ export default function plannotator(pi: ExtensionAPI): void {
pi.registerCommand("plannotator-review", {
description: "Open interactive code review for current changes or a PR URL",
handler: async (args, ctx) => {
const argsString = args || "";
const argsArray = argsString.split(" ").filter(Boolean);

// Parse flags
const unstagedIdx = argsArray.indexOf("--unstaged");
const showUnstaged = unstagedIdx !== -1;

// Find URL arg (first non-flag argument)
const prUrl = argsArray.find(arg => !arg.startsWith("--"));

if (!hasReviewBrowserHtml()) {
ctx.ui.notify(
"Code review UI not available. Run 'bun run build' in the pi-extension directory.",
Expand All @@ -344,9 +354,11 @@ export default function plannotator(pi: ExtensionAPI): void {
}

try {
const prUrl = args?.trim() || undefined;
const isPRReview = prUrl?.startsWith("http://") || prUrl?.startsWith("https://");
const result = await openCodeReview(ctx, { prUrl });
const result = await openCodeReview(ctx, {
prUrl,
diffType: showUnstaged ? "unstaged" : undefined,
});
if (result.feedback) {
if (result.approved) {
pi.sendUserMessage(
Expand Down