@davmash/bygone 0.8.13 → 0.8.14

package/out/standalone-main.js

@@ -3158,7 +3158,31 @@ var require_menuUtils = __commonJS({
         canRemovePanel: isMultiDiff && (session2?.multi?.files?.length || 0) > 1
       };
     }
-    module2.exports = { getMenuCapabilities: getMenuCapabilities2 };
+    async function collectComparisonSelection2(choosePaths, confirmSelection) {
+      const paths = [];
+      while (true) {
+        const selectedPaths = await choosePaths(paths.length);
+        if (!Array.isArray(selectedPaths) || selectedPaths.length === 0) {
+          return [];
+        }
+        for (const selectedPath of selectedPaths) {
+          if (typeof selectedPath === "string" && !paths.includes(selectedPath)) {
+            paths.push(selectedPath);
+          }
+        }
+        if (paths.length < 2) {
+          continue;
+        }
+        const decision = await confirmSelection([...paths]);
+        if (decision === "compare") {
+          return paths;
+        }
+        if (decision !== "add") {
+          return [];
+        }
+      }
+    }
+    module2.exports = { collectComparisonSelection: collectComparisonSelection2, getMenuCapabilities: getMenuCapabilities2 };
   }
 });
 
@@ -10577,7 +10601,7 @@ var require_package = __commonJS({
       displayName: "Bygone",
       desktopName: "com.davidmashburn.bygone.desktop",
       description: "See how change happened. Visual diff and file history for VS Code.",
-      version: "0.8.13",
+      version: "0.8.14",
       author: "David Mashburn",
       license: "MIT",
       private: false,
@@ -23811,7 +23835,7 @@ var { searchFileHistory: searchFileHistory2 } = (init_gitHistorySearch(), __toCo
 var { classifyAuthoredTourPaths: classifyAuthoredTourPaths2, discoverAuthoredTourDocument: discoverAuthoredTourDocument2 } = (init_tourDocument(), __toCommonJS(tourDocument_exports));
 var { materializeBranchReviewTrees: materializeBranchReviewTrees2, materializeGitTree: materializeGitTree2, resolveBranchReviewRange: resolveBranchReviewRange2, resolveReviewPathPair: resolveReviewPathPair2 } = (init_gitComparison(), __toCommonJS(gitComparison_exports));
 var { buildDirectoryNavigationState } = require_navigationUtils();
-var { getMenuCapabilities } = require_menuUtils();
+var { collectComparisonSelection, getMenuCapabilities } = require_menuUtils();
 var {
   cloneSessionSource,
   createBranchReviewSource,
@@ -23891,6 +23915,8 @@ var wordWrapEnabled = false;
 var wordWrapAvailable = false;
 var repositorySearch = null;
 var lastRepositoryReplacement = null;
+var pendingLaunchPrompt = null;
+var nextLaunchPromptId = 1;
 var appIsQuitting = false;
 var restoringWindowState = false;
 if (!singleInstanceLock) {
@@ -24321,40 +24347,52 @@ ${HELP_URL}`,
     {
       label: "File",
       submenu: [
+        {
+          label: "New Blank Comparison",
+          accelerator: "CmdOrCtrl+N",
+          click: () => runMenuAction("open a blank comparison", openBlankDiff)
+        },
+        { type: "separator" },
         {
           label: "Compare Files\u2026",
           accelerator: "CmdOrCtrl+O",
-          click: () => {
-            void openCompareFilesDialog();
-          }
+          click: () => runMenuAction("compare files", openCompareFilesDialog)
         },
         {
           label: "Compare Directories\u2026",
           accelerator: "CmdOrCtrl+Shift+O",
-          click: () => {
-            void openCompareDirectoriesDialog();
-          }
+          click: () => runMenuAction("compare directories", openCompareDirectoriesDialog)
         },
+        { type: "separator" },
         {
-          label: "Add Panel to Left\u2026",
-          enabled: canAddPanel,
-          click: () => {
-            void addPanelFromMenu("left");
-          }
+          label: "View File or Directory History\u2026",
+          accelerator: "CmdOrCtrl+Shift+H",
+          click: () => runMenuAction("open Git history", openHistoryDialog)
         },
         {
-          label: "Add Panel to Right\u2026",
-          enabled: canAddPanel,
-          click: () => {
-            void addPanelFromMenu("right");
-          }
+          label: "Open Authored Tour\u2026",
+          click: () => runMenuAction("open an authored tour", openAuthoredTourDialog)
         },
+        { type: "separator" },
         {
-          label: "Remove Active Panel",
-          enabled: canRemovePanel,
-          click: () => {
-            void removeActivePanelFromMenu();
-          }
+          label: "Comparison Panels",
+          submenu: [
+            {
+              label: "Add Panel to Left\u2026",
+              enabled: canAddPanel,
+              click: () => runMenuAction("add a panel", () => addPanelFromMenu("left"))
+            },
+            {
+              label: "Add Panel to Right\u2026",
+              enabled: canAddPanel,
+              click: () => runMenuAction("add a panel", () => addPanelFromMenu("right"))
+            },
+            {
+              label: "Remove Active Panel",
+              enabled: canRemovePanel,
+              click: () => runMenuAction("remove the active panel", removeActivePanelFromMenu)
+            }
+          ]
         },
         { type: "separator" },
         ...fileActionItems,
@@ -24416,9 +24454,7 @@ ${HELP_URL}`,
         {
           label: "Search in Files\u2026",
           accelerator: "CmdOrCtrl+Alt+F",
-          click: () => {
-            void openRepositorySearchDialog();
-          }
+          click: () => runMenuAction("search in files", openRepositorySearchDialog)
         },
         { type: "separator" },
         {
@@ -24462,35 +24498,13 @@ ${HELP_URL}`,
       label: "Git",
       submenu: [
         {
-          label: "View File or Directory History\u2026",
-          accelerator: "CmdOrCtrl+Shift+H",
-          click: () => {
-            void openHistoryDialog();
-          }
+          label: "Compare Revisions\u2026",
+          click: () => runMenuAction("compare Git revisions", openGitRefsDialog)
         },
         {
-          label: "Explore Current Branch Change",
+          label: "Review Branch Change\u2026",
           accelerator: "CmdOrCtrl+Shift+R",
-          click: () => {
-            void openBranchReviewDialog();
-          }
-        },
-        { type: "separator" },
-        {
-          label: "Older Commit",
-          accelerator: "Alt+Left",
-          enabled: isHistory,
-          click: () => {
-            void navigateHistory("back");
-          }
-        },
-        {
-          label: "Newer Commit",
-          accelerator: "Alt+Right",
-          enabled: isHistory,
-          click: () => {
-            void navigateHistory("forward");
-          }
+          click: () => runMenuAction("review a branch change", openBranchReviewDialog)
         }
       ]
     },
@@ -24499,15 +24513,11 @@ ${HELP_URL}`,
       submenu: [
         {
           label: "Present Current Branch",
-          click: () => {
-            void presentCurrentBranch();
-          }
+          click: () => runMenuAction("present the current branch", presentCurrentBranch)
         },
         {
-          label: "Open Authored Tour\u2026",
-          click: () => {
-            void openAuthoredTourDialog().catch((error) => showError(`Could not open Bygone presentation: ${getErrorMessage(error)}`));
-          }
+          label: "Present Branch or Ref\u2026",
+          click: () => runMenuAction("present a branch or ref", openPresentBranchDialog)
         },
         { type: "separator" },
         {
@@ -24540,6 +24550,23 @@ ${HELP_URL}`,
           click: () => {
             void returnToDirectoryView();
           }
+        },
+        { type: "separator" },
+        {
+          label: "Older Commit",
+          accelerator: "Alt+Left",
+          enabled: isHistory,
+          click: () => {
+            void navigateHistory("back");
+          }
+        },
+        {
+          label: "Newer Commit",
+          accelerator: "Alt+Right",
+          enabled: isHistory,
+          click: () => {
+            void navigateHistory("forward");
+          }
         }
       ]
     },
@@ -24642,9 +24669,38 @@ ${HELP_URL}`,
   ];
   Menu.setApplicationMenu(Menu.buildFromTemplate(template));
 }
+function runMenuAction(description, action) {
+  void Promise.resolve().then(action).catch((error) => showError(`Could not ${description}: ${getErrorMessage(error)}`));
+}
 async function presentCurrentBranch() {
-  const cwd = getSourceRepoRoot(session.source) || process.cwd();
-  await openTourPresentation([], cwd);
+  const repoRoot = await resolveOrChooseGitRepository("Select a Git repository to present");
+  if (repoRoot) {
+    await openTourPresentation([], repoRoot);
+  }
+}
+async function openPresentBranchDialog() {
+  const repoRoot = await resolveOrChooseGitRepository("Select a Git repository to present");
+  if (!repoRoot) {
+    return;
+  }
+  openLaunchPrompt({
+    kind: "present-branch",
+    title: "Present Branch or Ref",
+    description: `Repository: ${repoRoot}`,
+    submitLabel: "Present",
+    fields: [
+      { name: "head", label: "Head branch or ref", value: "HEAD", required: true },
+      { name: "base", label: "Base branch or ref (optional)", value: "" }
+    ]
+  }, async (values) => {
+    const head = values.head.trim() || "HEAD";
+    const base = values.base.trim();
+    const args = [head];
+    if (base) {
+      args.push(tokensFor("base")[0], base);
+    }
+    await openTourPresentation(args, repoRoot);
+  });
 }
 async function showRepositorySearchStatus() {
   const capability = detectRipgrepCapability2();
@@ -25253,6 +25309,24 @@ async function handleRendererMessage(message) {
     await refreshSession();
     return;
   }
+  if (message.type === "submitLaunchPrompt" && Number.isInteger(message.requestId) && message.requestId === pendingLaunchPrompt?.requestId && message.values && typeof message.values === "object" && !Array.isArray(message.values)) {
+    const prompt = pendingLaunchPrompt;
+    pendingLaunchPrompt = null;
+    const values = Object.fromEntries(prompt.fieldNames.map((fieldName) => [
+      fieldName,
+      typeof message.values[fieldName] === "string" ? message.values[fieldName] : ""
+    ]));
+    try {
+      await prompt.submit(values);
+    } catch (error) {
+      await showError(`Could not ${prompt.description}: ${getErrorMessage(error)}`);
+    }
+    return;
+  }
+  if (message.type === "cancelLaunchPrompt" && Number.isInteger(message.requestId) && message.requestId === pendingLaunchPrompt?.requestId) {
+    pendingLaunchPrompt = null;
+    return;
+  }
   if (message.type === "searchChangeSet" && Number.isInteger(message.requestId)) {
     searchCurrentChangeSet(message);
     return;
@@ -25406,25 +25480,116 @@ async function handleRendererMessage(message) {
   }
 }
 async function openCompareFilesDialog() {
-  if (!mainWindow) {
+  const filePaths = await collectComparisonPaths("file");
+  if (filePaths.length < 2) {
     return;
   }
-  const result = await dialog.showOpenDialog(mainWindow, {
-    title: "Select two files to compare",
-    properties: ["openFile", "multiSelections"]
+  if (filePaths.length === 2) {
+    await openDiff(filePaths[0], filePaths[1]);
+  } else {
+    await openMultiDiff(filePaths);
+  }
+}
+async function collectComparisonPaths(kind) {
+  ensureExploreWindow();
+  const isDirectory = kind === "directory";
+  const noun = isDirectory ? "directory" : "file";
+  return collectComparisonSelection(async (selectedCount) => {
+    const result = await dialog.showOpenDialog(mainWindow, {
+      title: selectedCount === 0 ? `Select ${noun}s to compare` : `Add ${noun}${selectedCount === 1 ? "" : "s"} to the comparison`,
+      properties: [isDirectory ? "openDirectory" : "openFile", "multiSelections"]
+    });
+    if (result.canceled) {
+      return null;
+    }
+    return result.filePaths.map((selectedPath) => path8.resolve(selectedPath));
+  }, async (paths) => {
+    const choice = await dialog.showMessageBox(mainWindow, {
+      type: "question",
+      buttons: [`Compare ${paths.length}`, "Add More\u2026", "Cancel"],
+      defaultId: 0,
+      cancelId: 2,
+      message: `Compare ${paths.length} selected ${noun}${paths.length === 1 ? "" : "s"}?`,
+      detail: paths.join("\n")
+    });
+    if (choice.response === 0) {
+      return "compare";
+    }
+    return choice.response === 1 ? "add" : "cancel";
+  });
+}
+function ensureExploreWindow() {
+  ensureMainWindow();
+  if (!mainWindow.isVisible()) {
+    mainWindow.show();
+  }
+  mainWindow.focus();
+}
+function openLaunchPrompt(config, submit) {
+  ensureExploreWindow();
+  const requestId = nextLaunchPromptId++;
+  pendingLaunchPrompt = {
+    requestId,
+    fieldNames: config.fields.map((field) => field.name),
+    description: config.failureDescription || config.title.toLowerCase(),
+    submit
+  };
+  postToRenderer({
+    type: "openLaunchPrompt",
+    requestId,
+    ...config
   });
-  if (result.canceled || result.filePaths.length < 2) {
-    if (!result.canceled) {
-      await showInfo("Select at least two files to compare.");
+}
+async function resolveOrChooseGitRepository(title) {
+  const sourcePath = session.source?.repoRoot || session.source?.path || session.source?.paths?.[0];
+  const sourceCandidate = sourcePath && getPathKind(sourcePath) === "file" ? path8.dirname(sourcePath) : sourcePath;
+  const candidates = [sourceCandidate, launchArguments.cwd, process.cwd()].filter((candidate, index, all) => candidate && all.indexOf(candidate) === index);
+  for (const candidate of candidates) {
+    try {
+      return fs7.realpathSync(runGit(["rev-parse", "--show-toplevel"], candidate));
+    } catch {
     }
-    return;
   }
-  if (result.filePaths.length === 2) {
-    await openDiff(result.filePaths[0], result.filePaths[1]);
-  } else {
-    await openMultiDiff(result.filePaths);
+  ensureExploreWindow();
+  const result = await dialog.showOpenDialog(mainWindow, {
+    title,
+    properties: ["openDirectory"]
+  });
+  if (result.canceled || result.filePaths.length === 0) {
+    return null;
+  }
+  try {
+    return fs7.realpathSync(runGit(["rev-parse", "--show-toplevel"], result.filePaths[0]));
+  } catch (error) {
+    await showError(`The selected directory is not inside a Git repository: ${getErrorMessage(error)}`);
+    return null;
   }
 }
+async function openGitRefsDialog() {
+  const repoRoot = await resolveOrChooseGitRepository("Select a Git repository to compare");
+  if (!repoRoot) {
+    return;
+  }
+  openLaunchPrompt({
+    kind: "git-refs",
+    title: "Compare Git Revisions",
+    description: `Repository: ${repoRoot}`,
+    submitLabel: "Compare",
+    fields: [{
+      name: "refs",
+      label: "Revisions (two or more, separated by spaces)",
+      value: "HEAD~1 HEAD",
+      required: true
+    }]
+  }, async (values) => {
+    const refs = values.refs.trim().split(/\s+/).filter(Boolean);
+    if (refs.length < 2) {
+      await showInfo("Enter at least two Git revisions to compare.");
+      return;
+    }
+    await openGitRefs(repoRoot, refs);
+  });
+}
 async function openDroppedFiles(paths) {
   const normalizedPaths = paths.filter((candidate) => typeof candidate === "string" && candidate.length > 0).map((candidate) => path8.resolve(candidate)).filter((candidate, index, all) => all.indexOf(candidate) === index);
   const tourSelection = classifyAuthoredTourPaths2(normalizedPaths);
@@ -25488,37 +25653,29 @@ async function openHistoryDialog() {
   await openHistory(targetPath, historyIncludeStagedPreference);
 }
 async function openBranchReviewDialog() {
-  let reviewRoot = launchArguments.cwd || process.cwd();
-  try {
-    runGit(["rev-parse", "--show-toplevel"], reviewRoot);
-  } catch {
-    if (!mainWindow) {
-      return;
-    }
-    const result = await dialog.showOpenDialog(mainWindow, {
-      title: "Select a Git repository to review",
-      properties: ["openDirectory"]
-    });
-    if (result.canceled || result.filePaths.length === 0) {
-      return;
-    }
-    reviewRoot = result.filePaths[0];
-  }
-  await openGitBranchReview(reviewRoot, "HEAD");
-}
-async function openCompareDirectoriesDialog() {
-  if (!mainWindow) {
+  const repoRoot = await resolveOrChooseGitRepository("Select a Git repository to review");
+  if (!repoRoot) {
     return;
   }
-  const result = await dialog.showOpenDialog(mainWindow, {
-    title: "Select directories to compare",
-    properties: ["openDirectory", "multiSelections"]
+  openLaunchPrompt({
+    kind: "review-branch",
+    title: "Review Branch Change",
+    description: `Repository: ${repoRoot}`,
+    submitLabel: "Review",
+    fields: [
+      { name: "head", label: "Head branch or ref", value: "HEAD", required: true },
+      { name: "base", label: "Base branch or ref (optional)", value: "" }
+    ]
+  }, async (values) => {
+    await openGitBranchReview(repoRoot, values.head.trim() || "HEAD", values.base.trim() || void 0);
   });
-  if (result.canceled || result.filePaths.length < 2) {
-    if (!result.canceled) await showInfo("Select at least two directories to compare.");
+}
+async function openCompareDirectoriesDialog() {
+  const directoryPaths = await collectComparisonPaths("directory");
+  if (directoryPaths.length < 2) {
     return;
   }
-  await openDirectories(result.filePaths);
+  await openDirectories(directoryPaths);
 }
 async function openDirectories(dirs, options = {}) {
   const resolvedDirs = dirs.map((dir) => path8.resolve(dir)).filter((dir, index, all) => all.indexOf(dir) === index);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davmash/bygone",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "description": "See how change happened. Visual diff and file history.",
   "author": "David Mashburn",
   "license": "MIT",