feat(review): add jj review workflows

graemefolk · graemefolk · commit 0a84ea59ea34 · 2026-05-06T13:57:15.000-06:00
diff --git a/packages/review-editor/App.tsx b/packages/review-editor/App.tsx
@@ -760,7 +760,7 @@ const ReviewApp: React.FC = () => {
           // Prefer the server's active base (survives page refresh / reconnect)
           // over the detected default, so the picker rehydrates to what the
           // server is actually using.
-          const initial = data.base || data.gitContext.defaultBranch || null;
+          const initial = data.base || data.gitContext.defaultBranch || data.gitContext.compareTarget?.fallback || null;
           setSelectedBase(initial);
           setCommittedBase(initial);
         }
@@ -782,7 +782,7 @@ const ReviewApp: React.FC = () => {
         if (data.error) setDiffError(data.error);
         if (data.isWSL) setIsWSL(true);
         // Mark diff type setup as pending on first run (local mode only)
-        if (data.diffType && !data.prMetadata && data.gitContext?.vcsType !== 'p4' && needsDiffTypeSetup()) {
+        if (data.diffType && !data.prMetadata && data.gitContext?.vcsType !== 'p4' && data.gitContext?.vcsType !== 'jj' && needsDiffTypeSetup()) {
           setDiffTypeSetupPending(true);
         }
       })
@@ -1163,6 +1163,7 @@ const ReviewApp: React.FC = () => {
               ...prev,
               defaultBranch: data.gitContext!.defaultBranch,
               diffOptions: data.gitContext!.diffOptions,
+              compareTarget: data.gitContext!.compareTarget,
             };
           });
         }
@@ -1190,7 +1191,7 @@ const ReviewApp: React.FC = () => {
       if (branch === selectedBase) return;
       const previous = selectedBase;
       setSelectedBase(branch);
-      if (activeDiffBase === 'branch' || activeDiffBase === 'merge-base') {
+      if (activeDiffBase === 'branch' || activeDiffBase === 'merge-base' || activeDiffBase === 'jj-line') {
         const ok = await fetchDiffSwitch(diffType, branch);
         if (!ok) setSelectedBase(previous);
       }
@@ -1304,7 +1305,7 @@ const ReviewApp: React.FC = () => {
     // the new patch to arrive before refetching — otherwise the viewer can
     // briefly pair an old patch with the new base's content.
     reviewBase:
-      (activeDiffBase === 'branch' || activeDiffBase === 'merge-base')
+        (activeDiffBase === 'branch' || activeDiffBase === 'merge-base' || activeDiffBase === 'jj-line')
         ? committedBase ?? undefined
         : undefined,
     activeDiffBase,
@@ -2078,8 +2079,9 @@ const ReviewApp: React.FC = () => {
                 currentBranch={gitContext?.currentBranch}
                 availableBranches={prMetadata ? undefined : gitContext?.availableBranches}
                 selectedBase={prMetadata ? undefined : selectedBase ?? undefined}
-                detectedBase={prMetadata ? undefined : gitContext?.defaultBranch}
+                detectedBase={prMetadata ? undefined : gitContext?.defaultBranch || gitContext?.compareTarget?.fallback}
                 onSelectBase={prMetadata ? undefined : handleBaseSelect}
+                compareTarget={gitContext?.compareTarget}
                 stagedFiles={stagedFiles}
                 onCopyRawDiff={handleCopyDiff}
                 canCopyRawDiff={!!diffData?.rawPatch}
@@ -2156,6 +2158,10 @@ const ReviewApp: React.FC = () => {
                           {activeDiffBase === 'staged' && "No staged changes. Stage some files with git add."}
                           {activeDiffBase === 'unstaged' && "No unstaged changes. All changes are staged."}
                           {activeDiffBase === 'last-commit' && `No changes in the last commit${activeWorktreePath ? ' in this worktree' : ''}.`}
+                          {activeDiffBase === 'jj-current' && "No changes in the current jj change."}
+                          {activeDiffBase === 'jj-last' && "No changes in the last jj change."}
+                          {activeDiffBase === 'jj-line' && `No changes in your line of work vs ${selectedBase || gitContext?.defaultBranch || '@-'}.`}
+                          {activeDiffBase === 'jj-all' && "No files at the current jj change."}
                           {activeDiffBase === 'branch' && `No changes vs ${selectedBase || gitContext?.defaultBranch || 'main'}${activeWorktreePath ? ' in this worktree' : ''}.`}
                           {activeDiffBase === 'merge-base' && `No changes vs ${selectedBase || gitContext?.defaultBranch || 'main'}${activeWorktreePath ? ' in this worktree' : ''}.`}
                           {activeDiffBase === 'all' && `No tracked files${activeWorktreePath ? ' in this worktree' : ' in this repository'}.`}
diff --git a/packages/review-editor/components/BaseBranchPicker.tsx b/packages/review-editor/components/BaseBranchPicker.tsx
@@ -1,13 +1,14 @@
 import React, { useMemo, useRef, useState } from 'react';
 import * as Popover from '@radix-ui/react-popover';
-import type { AvailableBranches } from '@plannotator/shared/types';
+import type { AvailableBranches, CompareTargetPickerCopy } from '@plannotator/shared/types';
 
 interface BaseBranchPickerProps {
   availableBranches: AvailableBranches;
   selectedBase: string;
   detectedBase: string;
   onSelectBase: (branch: string) => void;
   disabled?: boolean;
+  copy: CompareTargetPickerCopy;
 }
 
 export const BaseBranchPicker: React.FC<BaseBranchPickerProps> = ({
@@ -16,6 +17,7 @@ export const BaseBranchPicker: React.FC<BaseBranchPickerProps> = ({
   detectedBase,
   onSelectBase,
   disabled,
+  copy,
 }) => {
   const [open, setOpen] = useState(false);
   const [query, setQuery] = useState('');
@@ -57,15 +59,15 @@ export const BaseBranchPicker: React.FC<BaseBranchPickerProps> = ({
         <button
           type="button"
           disabled={disabled}
-          title={`Review base: ${selectedBase}`}
+          title={`${copy.triggerTitlePrefix}: ${selectedBase}`}
           className={`w-full flex items-center gap-1.5 px-2.5 py-1.5 rounded text-xs font-medium transition-colors focus:outline-none focus:ring-1 focus:ring-primary/50 disabled:opacity-50 disabled:cursor-not-allowed ${
             isCustom
               ? 'bg-primary/10 border border-primary/30 text-foreground'
               : 'bg-muted border border-transparent text-foreground'
           }`}
         >
           <span className="text-[10px] uppercase tracking-wide opacity-60 flex-shrink-0">
-            base
+            {copy.triggerLabel}
           </span>
           <span className="truncate flex-1 text-left">{selectedBase}</span>
           <svg
@@ -96,19 +98,19 @@ export const BaseBranchPicker: React.FC<BaseBranchPickerProps> = ({
               type="text"
               value={query}
               onChange={(e) => setQuery(e.target.value)}
-              placeholder="Search branches…"
+              placeholder={copy.searchPlaceholder}
               className="w-full px-2 py-1.5 bg-muted rounded text-xs text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-primary/50"
             />
           </div>
           <div className="max-h-72 overflow-y-auto py-1">
             {filtered.local.length === 0 && filtered.remote.length === 0 && (
               <div className="px-3 py-2 text-xs text-muted-foreground">
-                No branches match.
+                {copy.emptyText}
               </div>
             )}
             {filtered.local.length > 0 && (
               <BranchGroup
-                title="Local"
+                title={copy.localGroupLabel}
                 branches={filtered.local}
                 selectedBase={selectedBase}
                 detectedBase={detectedBase}
@@ -117,7 +119,7 @@ export const BaseBranchPicker: React.FC<BaseBranchPickerProps> = ({
             )}
             {filtered.remote.length > 0 && (
               <BranchGroup
-                title="Remote"
+                title={copy.remoteGroupLabel}
                 branches={filtered.remote}
                 selectedBase={selectedBase}
                 detectedBase={detectedBase}
diff --git a/packages/review-editor/components/DiffTypePicker.tsx b/packages/review-editor/components/DiffTypePicker.tsx
@@ -20,6 +20,10 @@ const OPTION_HINTS: Record<string, string> = {
   staged: "Only what you've run `git add` on.",
   unstaged: "What `git diff` shows with no arguments.",
   'last-commit': "Just your most recent commit.",
+  'jj-current': "Changes in the current jj change.",
+  'jj-last': "Changes in the previous jj change.",
+  'jj-line': "Changes in your line of work from the selected bookmark or revision.",
+  'jj-all': "Every tracked file in the current jj workspace, shown as additions.",
   branch: "Straight compare against the base branch (picked below). Can show commits that aren't yours if the base has new commits.",
   'merge-base': "Only what you've added on top of the base branch (picked below). Same as GitHub's PR view.",
   all: "Every tracked file at HEAD, shown as additions. Unlike Committed, which shows what changed vs a base branch, this shows the entire codebase.",
diff --git a/packages/review-editor/components/FileTree.tsx b/packages/review-editor/components/FileTree.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback, useState, useMemo } from 'react';
 import { CodeAnnotation } from '@plannotator/ui/types';
-import type { AvailableBranches, DiffOption, WorktreeInfo } from '@plannotator/shared/types';
+import type { AvailableBranches, CompareTargetConfig, DiffOption, WorktreeInfo } from '@plannotator/shared/types';
 import { buildFileTree, getAncestorPaths, getAllFolderPaths, getVisualFileOrder } from '../utils/buildFileTree';
 import { FileTreeNodeItem } from './FileTreeNode';
 import { BaseBranchPicker } from './BaseBranchPicker';
@@ -30,11 +30,12 @@ interface FileTreeProps {
   activeWorktreePath?: string | null;
   onSelectWorktree?: (path: string | null) => void;
   currentBranch?: string;
-  /** Base-branch picker — only meaningful when activeDiffType is "branch" or "merge-base". */
+  /** Compare target picker — base branch for Git, bookmark/revision for jj. */
   availableBranches?: AvailableBranches;
   selectedBase?: string;
   detectedBase?: string;
   onSelectBase?: (branch: string) => void;
+  compareTarget?: CompareTargetConfig;
   stagedFiles?: Set<string>;
   onCopyRawDiff?: () => void;
   canCopyRawDiff?: boolean;
@@ -83,6 +84,7 @@ export const FileTree: React.FC<FileTreeProps> = ({
   selectedBase,
   detectedBase,
   onSelectBase,
+  compareTarget,
   stagedFiles,
   onCopyRawDiff,
   canCopyRawDiff = false,
@@ -366,15 +368,16 @@ export const FileTree: React.FC<FileTreeProps> = ({
         </div>
       )}
 
-      {/* Base-branch picker — only relevant for branch / merge-base diff types */}
+      {/* Compare target picker — only relevant for base-dependent diff types */}
       {onSelectBase &&
         selectedBase &&
         detectedBase &&
         availableBranches &&
-        (activeDiffType === 'branch' || activeDiffType === 'merge-base') && (
+        activeDiffType &&
+        compareTarget?.diffTypes.includes(activeDiffType) && (
           <div className="px-2 py-1.5 border-b border-border/30 flex items-center gap-2">
             <span className="text-[10px] uppercase tracking-wide text-muted-foreground flex-shrink-0">
-              compare against
+              {compareTarget.picker.rowLabel}
             </span>
             <div className="flex-1 min-w-0">
               <BaseBranchPicker
@@ -383,6 +386,7 @@ export const FileTree: React.FC<FileTreeProps> = ({
                 detectedBase={detectedBase}
                 onSelectBase={onSelectBase}
                 disabled={isLoadingDiff}
+                copy={compareTarget.picker}
               />
             </div>
           </div>
diff --git a/packages/review-editor/utils/exportFeedback.test.ts b/packages/review-editor/utils/exportFeedback.test.ts
@@ -69,6 +69,14 @@ describe("exportReviewFeedback", () => {
     expect(result).toContain("**Diff:** Committed changes vs `release/v2`");
   });
 
+  it("local mode with jj line of work: labels compare target in the header", () => {
+    const result = exportReviewFeedback([ann()], undefined, {
+      mode: "jj-line",
+      base: "main",
+    });
+    expect(result).toContain("**Diff:** Line of work vs `main`");
+  });
+
   it("local mode with worktree path: appends worktree info", () => {
     const result = exportReviewFeedback([ann()], undefined, {
       mode: "uncommitted",
diff --git a/packages/review-editor/utils/exportFeedback.ts b/packages/review-editor/utils/exportFeedback.ts
@@ -36,6 +36,10 @@ function describeDiff(ctx: FeedbackDiffContext): string {
     case "staged":       label = "Staged changes"; break;
     case "unstaged":     label = "Unstaged changes"; break;
     case "last-commit":  label = "Last commit"; break;
+    case "jj-current":   label = "Current change"; break;
+    case "jj-last":      label = "Last change"; break;
+    case "jj-line":      label = base ? `Line of work vs \`${base}\`` : "Line of work"; break;
+    case "jj-all":       label = "All files"; break;
     case "branch":       label = base ? `Branch diff vs \`${base}\`` : "Branch diff"; break;
     case "merge-base":   label = base ? `Committed changes vs \`${base}\`` : "Committed changes"; break;
     case "all":          label = "All files"; break;
diff --git a/packages/server/review.ts b/packages/server/review.ts
@@ -11,8 +11,8 @@
 
 import { isRemoteSession, getServerHostname, getServerPort } from "./remote";
 import type { Origin } from "@plannotator/shared/agents";
-import { type DiffType, type GitContext, runVcsDiff, getVcsFileContentsForDiff, canStageFiles, stageFile, unstageFile, resolveVcsCwd, validateFilePath, getVcsContext, gitRuntime } from "./vcs";
-import { parseWorktreeDiffType, detectRemoteDefaultBranch, resolveBaseBranch } from "@plannotator/shared/review-core";
+import { type DiffType, type GitContext, runVcsDiff, getVcsFileContentsForDiff, canStageFiles, stageFile, unstageFile, resolveVcsCwd, validateFilePath, getVcsContext, detectRemoteDefaultCompareTarget, gitRuntime } from "./vcs";
+import { parseWorktreeDiffType, resolveBaseBranch } from "@plannotator/shared/review-core";
 import {
   getPRDiffScopeOptions,
   getPRStackInfo,
@@ -164,15 +164,20 @@ export async function startReviewServer(
   // read this (not gitContext.defaultBranch) so they analyze the same diff
   // the reviewer is currently looking at. Honors an explicit initialBase from
   // the caller — e.g. programmatic Pi callers can request a non-detected base.
-  let currentBase = options.initialBase || gitContext?.defaultBranch || "main";
+  const detectedCompareTarget = (): string => gitContext?.defaultBranch || gitContext?.compareTarget?.fallback || "main";
+  let currentBase = options.initialBase || detectedCompareTarget();
   let baseEverSwitched = false;
 
+  const resolveReviewBase = (requestedBase?: string): string => {
+    return resolveBaseBranch(requestedBase, detectedCompareTarget());
+  };
+
   // Fire-and-forget: query the remote for its actual default branch. If it
   // arrives before the user interacts, quietly upgrade currentBase from the
   // local fallback (e.g. "main") to the upstream ref (e.g. "origin/main").
   // Non-blocking — the server is already listening by the time this resolves.
   if (gitContext && !options.initialBase && !isPRMode) {
-    detectRemoteDefaultBranch(gitRuntime, gitContext.cwd).then((remote) => {
+    detectRemoteDefaultCompareTarget(gitContext.cwd).then((remote) => {
       if (remote && !baseEverSwitched) currentBase = remote;
     });
   }
@@ -415,6 +420,9 @@ export async function startReviewServer(
   let repoInfo = isPRMode && prMetadata
     ? { display: getDisplayRepo(prMetadata), branch: `${getMRLabel(prMetadata)} ${getMRNumberLabel(prMetadata)}` }
     : await getRepoInfo();
+  if (gitContext?.repository?.displayFallback) {
+    repoInfo = { display: repoInfo?.display || gitContext.repository.displayFallback };
+  }
 
   // Fetch current platform user (for own-PR/MR detection)
   let prRef = isPRMode && prMetadata ? prRefFromMetadata(prMetadata) : null;
@@ -560,12 +568,11 @@ export async function startReviewServer(
                 currentHideWhitespace = body.hideWhitespace;
               }
 
-              const detectedBase = gitContext?.defaultBranch || "main";
               // Guard against non-string payloads — resolveBaseBranch calls
               // string methods and would throw a TypeError otherwise. Mirrors
               // Pi's guard so both runtimes validate identically.
               const requestedBase = typeof body.base === "string" ? body.base : undefined;
-              const base = resolveBaseBranch(requestedBase, detectedBase);
+              const base = resolveReviewBase(requestedBase);
               const defaultCwd = gitContext?.cwd;
 
               // Run the new diff
@@ -863,11 +870,8 @@ export async function startReviewServer(
 
             // Local review: read file contents from local git
             if (hasLocalAccess) {
-              const detectedBase = gitContext?.defaultBranch || "main";
-              const base = resolveBaseBranch(
-                url.searchParams.get("base") ?? undefined,
-                detectedBase,
-              );
+              const requestedBase = url.searchParams.get("base") ?? undefined;
+              const base = resolveReviewBase(requestedBase);
               const defaultCwd = gitContext?.cwd;
               const result = await getVcsFileContentsForDiff(
                 currentDiffType,
@@ -896,7 +900,8 @@ export async function startReviewServer(
 
           // API: Stage / unstage a file (disabled when VCS doesn't support it)
           if (url.pathname === "/api/git-add" && req.method === "POST") {
-            if (isPRMode || !canStageFiles(currentDiffType)) {
+            const stageCwd = resolveVcsCwd(currentDiffType, gitContext?.cwd);
+            if (isPRMode || !(await canStageFiles(currentDiffType, stageCwd))) {
               return Response.json(
                 { error: "Staging not available" },
                 { status: 400 },
@@ -908,12 +913,10 @@ export async function startReviewServer(
                 return Response.json({ error: "Missing filePath" }, { status: 400 });
               }
 
-              const cwd = resolveVcsCwd(currentDiffType, gitContext?.cwd);
-
               if (body.undo) {
-                await unstageFile(currentDiffType, body.filePath, cwd);
+                await unstageFile(currentDiffType, body.filePath, stageCwd);
               } else {
-                await stageFile(currentDiffType, body.filePath, cwd);
+                await stageFile(currentDiffType, body.filePath, stageCwd);
               }
 
               return Response.json({ ok: true });
