@kitlangton/ghui 0.3.2 → 0.3.3

package/README.md

@@ -67,10 +67,12 @@ You can also copy `.env.example` to `.env` and edit the values locally.
 - `esc`: return from expanded details, leave diff/comment mode, or close modal
 - `r`: refresh
 - `d`: view stacked diff for all changed files
-- `c`: enter or exit diff comment mode while viewing a diff
-- `up` / `down` / `pageup` / `pagedown`: move comment target while in diff comment mode
+- `shift-r`: review or approve the selected pull request
+- `up` / `down` / `pageup` / `pagedown`: move comment target while viewing a diff
 - `enter`: open a commented diff line, or start a comment on an uncommented line
-- `a`: add a comment while in diff comment mode
+- `v`: start or clear a multi-line diff comment range
+- `n` / `p`: jump between diff comment threads
+- `f`: open the changed-files navigator while viewing a diff
 - `left` / `right`: choose the deleted or added side while in split diff comment mode
 - `[` / `]`: switch files while viewing or commenting on a diff
 - `s`: toggle draft or ready-for-review state
@@ -81,3 +83,11 @@ You can also copy `.env.example` to `.env` and edit the values locally.
 - `o`: open PR in browser
 - `y`: copy PR metadata
 - `q`: quit
+
+Review submission:
+
+- Press `shift-r` to open the review modal.
+- Use `j` / `k` or `up` / `down` to choose Comment, Approve, or Request changes.
+- Press `enter` to move to the optional summary area.
+- Press `enter` again to submit, or `shift-enter` to insert a newline.
+- Press `esc` from the summary to return to action selection; press `esc` from action selection to cancel.

package/dist/index.js

@@ -1149,7 +1149,7 @@ var Detail, detailViewKeymap;
 var init_detailView = __esm(() => {
   init_src();
   Detail = context();
-  detailViewKeymap = Detail(scrollCommands(), { id: "detail.close", title: "Close detail", keys: ["escape", "return"], run: (s) => s.closeDetail() }, { id: "detail.theme", title: "Open theme", keys: ["t"], run: (s) => s.openTheme() }, { id: "detail.diff", title: "Open diff", keys: ["d"], run: (s) => s.openDiff() }, { id: "detail.close-pr", title: "Close pull request", keys: ["x"], run: (s) => s.closePullRequest() }, { id: "detail.labels", title: "Manage labels", keys: ["l"], run: (s) => s.openLabels() }, { id: "detail.merge", title: "Merge", keys: ["m", "shift+m"], run: (s) => s.openMerge() }, { id: "detail.toggle-draft", title: "Toggle draft", keys: ["s", "shift+s"], run: (s) => s.toggleDraft() }, { id: "detail.refresh", title: "Refresh", keys: ["r"], run: (s) => s.refresh() }, { id: "detail.open-browser", title: "Open in browser", keys: ["o"], run: (s) => s.openInBrowser() }, { id: "detail.copy", title: "Copy metadata", keys: ["y"], run: (s) => s.copyMetadata() });
+  detailViewKeymap = Detail(scrollCommands(), { id: "detail.close", title: "Close detail", keys: ["escape", "return"], run: (s) => s.closeDetail() }, { id: "detail.theme", title: "Open theme", keys: ["t"], run: (s) => s.openTheme() }, { id: "detail.diff", title: "Open diff", keys: ["d"], run: (s) => s.openDiff() }, { id: "detail.review", title: "Review pull request", keys: ["shift+r"], run: (s) => s.openReview() }, { id: "detail.close-pr", title: "Close pull request", keys: ["x"], run: (s) => s.closePullRequest() }, { id: "detail.labels", title: "Manage labels", keys: ["l"], run: (s) => s.openLabels() }, { id: "detail.merge", title: "Merge", keys: ["m", "shift+m"], run: (s) => s.openMerge() }, { id: "detail.toggle-draft", title: "Toggle draft", keys: ["s", "shift+s"], run: (s) => s.toggleDraft() }, { id: "detail.refresh", title: "Refresh", keys: ["r"], run: (s) => s.refresh() }, { id: "detail.open-browser", title: "Open in browser", keys: ["o"], run: (s) => s.openInBrowser() }, { id: "detail.copy", title: "Copy metadata", keys: ["y"], run: (s) => s.copyMetadata() });
 });
 
 // src/keymap/helpers.ts
@@ -1187,7 +1187,7 @@ var init_diffView = __esm(() => {
     title: "Jump down",
     keys: ["shift+down", "shift+j", "meta+down", "meta+j"],
     run: (s) => s.moveAnchor(8)
-  }, ...countedVerticalBindings((s, delta) => s.moveAnchor(delta)), { id: "diff.up", title: "Up", keys: ["up", "k"], run: (s) => s.moveAnchor(-1) }, { id: "diff.down", title: "Down", keys: ["down", "j"], run: (s) => s.moveAnchor(1) }, { id: "diff.side-left", title: "Old side", keys: ["left", "h"], run: (s) => s.selectSide("LEFT") }, { id: "diff.side-right", title: "New side", keys: ["right", "l"], run: (s) => s.selectSide("RIGHT") }, { id: "diff.changed-files", title: "Changed files", keys: ["f"], run: (s) => s.openChangedFiles() }, { id: "diff.next-file", title: "Next file", keys: ["]"], run: (s) => s.nextFile() }, { id: "diff.previous-file", title: "Previous file", keys: ["["], run: (s) => s.previousFile() }, { id: "diff.submit-review", title: "Submit review", keys: ["shift+r"], run: (s) => s.openSubmitReview() }, { id: "diff.first", title: "First comment", keys: ["g g"], run: (s) => s.moveAnchorToBoundary("first") }, { id: "diff.last", title: "Last comment", keys: ["shift+g"], run: (s) => s.moveAnchorToBoundary("last") }, { id: "diff.align-center", title: "Align center", keys: ["z z"], run: (s) => s.alignAnchor("center") }, { id: "diff.align-top", title: "Align top", keys: ["z t"], run: (s) => s.alignAnchor("top") }, { id: "diff.align-bottom", title: "Align bottom", keys: ["z b"], run: (s) => s.alignAnchor("bottom") }, { id: "diff.open-browser", title: "Open in browser", keys: ["o"], run: (s) => s.openInBrowser() });
+  }, ...countedVerticalBindings((s, delta) => s.moveAnchor(delta)), { id: "diff.up", title: "Up", keys: ["up", "k"], run: (s) => s.moveAnchor(-1) }, { id: "diff.down", title: "Down", keys: ["down", "j"], run: (s) => s.moveAnchor(1) }, { id: "diff.side-left", title: "Old side", keys: ["left", "h"], run: (s) => s.selectSide("LEFT") }, { id: "diff.side-right", title: "New side", keys: ["right", "l"], run: (s) => s.selectSide("RIGHT") }, { id: "diff.changed-files", title: "Changed files", keys: ["f"], run: (s) => s.openChangedFiles() }, { id: "diff.next-file", title: "Next file", keys: ["]"], run: (s) => s.nextFile() }, { id: "diff.previous-file", title: "Previous file", keys: ["["], run: (s) => s.previousFile() }, { id: "diff.submit-review", title: "Review pull request", keys: ["shift+r"], run: (s) => s.openSubmitReview() }, { id: "diff.first", title: "First comment", keys: ["g g"], run: (s) => s.moveAnchorToBoundary("first") }, { id: "diff.last", title: "Last comment", keys: ["shift+g"], run: (s) => s.moveAnchorToBoundary("last") }, { id: "diff.align-center", title: "Align center", keys: ["z z"], run: (s) => s.alignAnchor("center") }, { id: "diff.align-top", title: "Align top", keys: ["z t"], run: (s) => s.alignAnchor("top") }, { id: "diff.align-bottom", title: "Align bottom", keys: ["z b"], run: (s) => s.alignAnchor("bottom") }, { id: "diff.open-browser", title: "Open in browser", keys: ["o"], run: (s) => s.openInBrowser() });
 });
 
 // src/keymap/filterMode.ts
@@ -1211,7 +1211,7 @@ var List, listNavKeymap;
 var init_listNav = __esm(() => {
   init_src();
   List = context();
-  listNavKeymap = List({ id: "list.filter", title: "Filter", keys: ["/"], run: (s) => s.runCommandById("filter.open") }, { id: "list.refresh", title: "Refresh", keys: ["r"], run: (s) => s.runCommandById("pull.refresh") }, { id: "list.theme", title: "Theme", keys: ["t"], run: (s) => s.runCommandById("theme.open") }, { id: "list.diff", title: "Open diff", keys: ["d"], run: (s) => s.runCommandById("diff.open") }, { id: "list.labels", title: "Labels", keys: ["l"], run: (s) => s.runCommandById("pull.labels") }, { id: "list.merge", title: "Merge", keys: ["m", "shift+m"], run: (s) => s.runCommandById("pull.merge") }, { id: "list.close-pr", title: "Close PR", keys: ["x"], run: (s) => s.runCommandById("pull.close") }, { id: "list.open-browser", title: "Open in browser", keys: ["o"], run: (s) => s.runCommandById("pull.open-browser") }, { id: "list.toggle-draft", title: "Toggle draft", keys: ["s", "shift+s"], run: (s) => s.runCommandById("pull.toggle-draft") }, { id: "list.copy", title: "Copy metadata", keys: ["y"], run: (s) => s.runCommandById("pull.copy-metadata") }, { id: "list.detail.open", title: "Open details", keys: ["return"], run: (s) => s.runCommandById("detail.open") }, { id: "list.next-tab", title: "Next view", keys: ["tab"], run: (s) => s.switchQueueMode(1) }, { id: "list.prev-tab", title: "Previous view", keys: ["shift+tab"], run: (s) => s.switchQueueMode(-1) }, {
+  listNavKeymap = List({ id: "list.filter", title: "Filter", keys: ["/"], run: (s) => s.runCommandById("filter.open") }, { id: "list.refresh", title: "Refresh", keys: ["r"], run: (s) => s.runCommandById("pull.refresh") }, { id: "list.theme", title: "Theme", keys: ["t"], run: (s) => s.runCommandById("theme.open") }, { id: "list.diff", title: "Open diff", keys: ["d"], run: (s) => s.runCommandById("diff.open") }, { id: "list.review", title: "Review pull request", keys: ["shift+r"], run: (s) => s.runCommandById("pull.submit-review") }, { id: "list.labels", title: "Labels", keys: ["l"], run: (s) => s.runCommandById("pull.labels") }, { id: "list.merge", title: "Merge", keys: ["m", "shift+m"], run: (s) => s.runCommandById("pull.merge") }, { id: "list.close-pr", title: "Close PR", keys: ["x"], run: (s) => s.runCommandById("pull.close") }, { id: "list.open-browser", title: "Open in browser", keys: ["o"], run: (s) => s.runCommandById("pull.open-browser") }, { id: "list.toggle-draft", title: "Toggle draft", keys: ["s", "shift+s"], run: (s) => s.runCommandById("pull.toggle-draft") }, { id: "list.copy", title: "Copy metadata", keys: ["y"], run: (s) => s.runCommandById("pull.copy-metadata") }, { id: "list.detail.open", title: "Open details", keys: ["return"], run: (s) => s.runCommandById("detail.open") }, { id: "list.next-tab", title: "Next view", keys: ["tab"], run: (s) => s.switchQueueMode(1) }, { id: "list.prev-tab", title: "Previous view", keys: ["shift+tab"], run: (s) => s.switchQueueMode(-1) }, {
     id: "list.clear-filter",
     title: "Clear filter",
     keys: ["escape"],
@@ -1291,7 +1291,7 @@ var SubmitReview, submitReviewModalKeymap;
 var init_submitReviewModal = __esm(() => {
   init_src();
   SubmitReview = context();
-  submitReviewModalKeymap = SubmitReview({ id: "submit-review.escape", title: "Cancel", keys: ["escape"], run: (s) => s.closeModal() }, { id: "submit-review.submit", title: "Submit", keys: ["ctrl+s", "return"], run: (s) => s.submit() }, { id: "submit-review.newline", title: "Insert newline", keys: ["shift+return"], run: (s) => s.insertNewline() }, { id: "submit-review.next-action", title: "Next action", keys: ["tab"], run: (s) => s.moveActionSelection(1) }, { id: "submit-review.previous-action", title: "Previous action", keys: ["shift+tab"], run: (s) => s.moveActionSelection(-1) }, { id: "submit-review.move-left", title: "Cursor left", keys: ["left", "ctrl+b"], run: (s) => s.moveLeft() }, { id: "submit-review.move-right", title: "Cursor right", keys: ["right", "ctrl+f"], run: (s) => s.moveRight() }, { id: "submit-review.move-up", title: "Cursor up", keys: ["up"], run: (s) => s.moveUp() }, { id: "submit-review.move-down", title: "Cursor down", keys: ["down"], run: (s) => s.moveDown() }, { id: "submit-review.line-start", title: "Line start", keys: ["home", "ctrl+a"], run: (s) => s.moveLineStart() }, { id: "submit-review.line-end", title: "Line end", keys: ["end", "ctrl+e"], run: (s) => s.moveLineEnd() }, { id: "submit-review.word-back", title: "Word backward", keys: ["meta+b", "meta+left"], run: (s) => s.moveWordBackward() }, { id: "submit-review.word-forward", title: "Word forward", keys: ["meta+f", "meta+right"], run: (s) => s.moveWordForward() }, { id: "submit-review.backspace", title: "Backspace", keys: ["backspace"], run: (s) => s.backspace() }, { id: "submit-review.delete", title: "Delete", keys: ["delete", "ctrl+d"], run: (s) => s.deleteForward() }, { id: "submit-review.delete-word-back", title: "Delete word backward", keys: ["ctrl+w", "meta+backspace"], run: (s) => s.deleteWordBackward() }, { id: "submit-review.delete-word-forward", title: "Delete word forward", keys: ["meta+delete"], run: (s) => s.deleteWordForward() }, { id: "submit-review.delete-to-line-start", title: "Delete to line start", keys: ["ctrl+u"], run: (s) => s.deleteToLineStart() }, { id: "submit-review.delete-to-line-end", title: "Delete to line end", keys: ["ctrl+k"], run: (s) => s.deleteToLineEnd() });
+  submitReviewModalKeymap = SubmitReview({ id: "submit-review.escape", title: "Back / cancel", keys: ["escape"], run: (s) => s.handleEscape() }, { id: "submit-review.focus-summary", title: "Edit summary", keys: ["return"], when: (s) => !s.summaryFocused, run: (s) => s.focusSummary() }, { id: "submit-review.submit", title: "Submit", keys: ["return"], when: (s) => s.summaryFocused, run: (s) => s.submit() }, { id: "submit-review.newline", title: "Insert newline", keys: ["shift+return"], when: (s) => s.summaryFocused, run: (s) => s.insertNewline() }, { id: "submit-review.next-action", title: "Next action", keys: ["down", "j"], when: (s) => !s.summaryFocused, run: (s) => s.moveActionSelection(1) }, { id: "submit-review.previous-action", title: "Previous action", keys: ["up", "k"], when: (s) => !s.summaryFocused, run: (s) => s.moveActionSelection(-1) }, { id: "submit-review.move-left", title: "Cursor left", keys: ["left", "ctrl+b"], when: (s) => s.summaryFocused, run: (s) => s.moveLeft() }, { id: "submit-review.move-right", title: "Cursor right", keys: ["right", "ctrl+f"], when: (s) => s.summaryFocused, run: (s) => s.moveRight() }, { id: "submit-review.move-up", title: "Cursor up", keys: ["up"], when: (s) => s.summaryFocused, run: (s) => s.moveUp() }, { id: "submit-review.move-down", title: "Cursor down", keys: ["down"], when: (s) => s.summaryFocused, run: (s) => s.moveDown() }, { id: "submit-review.line-start", title: "Line start", keys: ["home", "ctrl+a"], when: (s) => s.summaryFocused, run: (s) => s.moveLineStart() }, { id: "submit-review.line-end", title: "Line end", keys: ["end", "ctrl+e"], when: (s) => s.summaryFocused, run: (s) => s.moveLineEnd() }, { id: "submit-review.word-back", title: "Word backward", keys: ["meta+b", "meta+left"], when: (s) => s.summaryFocused, run: (s) => s.moveWordBackward() }, { id: "submit-review.word-forward", title: "Word forward", keys: ["meta+f", "meta+right"], when: (s) => s.summaryFocused, run: (s) => s.moveWordForward() }, { id: "submit-review.backspace", title: "Backspace", keys: ["backspace"], when: (s) => s.summaryFocused, run: (s) => s.backspace() }, { id: "submit-review.delete", title: "Delete", keys: ["delete", "ctrl+d"], when: (s) => s.summaryFocused, run: (s) => s.deleteForward() }, { id: "submit-review.delete-word-back", title: "Delete word backward", keys: ["ctrl+w", "meta+backspace"], when: (s) => s.summaryFocused, run: (s) => s.deleteWordBackward() }, { id: "submit-review.delete-word-forward", title: "Delete word forward", keys: ["meta+delete"], when: (s) => s.summaryFocused, run: (s) => s.deleteWordForward() }, { id: "submit-review.delete-to-line-start", title: "Delete to line start", keys: ["ctrl+u"], when: (s) => s.summaryFocused, run: (s) => s.deleteToLineStart() }, { id: "submit-review.delete-to-line-end", title: "Delete to line end", keys: ["ctrl+k"], when: (s) => s.summaryFocused, run: (s) => s.deleteToLineEnd() });
 });
 
 // src/keymap/themeModal.ts
@@ -1400,13 +1400,7 @@ var SCOPE_ORDER, sortCommandsByScope = (commands) => [...commands].sort((left, r
       return true;
   }
   return query.length === 0;
-}, commandSearchText = (command2) => normalize([
-  command2.title,
-  command2.subtitle,
-  command2.scope,
-  command2.shortcut,
-  ...command2.keywords ?? []
-].filter(Boolean).join(" ")), commandScore = (command2, query) => {
+}, commandSearchText = (command2) => normalize([command2.title, command2.subtitle, command2.scope, command2.shortcut, ...command2.keywords ?? []].filter(Boolean).join(" ")), commandScore = (command2, query) => {
   const normalizedQuery = normalize(query);
   if (normalizedQuery.length === 0)
     return 0;
@@ -1470,10 +1464,7 @@ var init_domain = __esm(() => {
 // src/pullRequestViews.ts
 var initialPullRequestView = () => ({ _tag: "Queue", mode: "authored", repository: null }), viewMode = (view) => view._tag === "Repository" ? "repository" : view.mode, viewRepository = (view) => view.repository, viewCacheKey = (view) => view._tag === "Repository" ? `repository:${view.repository}` : view.mode, viewEquals = (left, right) => left._tag === right._tag && viewMode(left) === viewMode(right) && left.repository === right.repository, activePullRequestViews = (view) => {
   const repository = viewRepository(view);
-  return [
-    ...repository ? [{ _tag: "Repository", repository }] : [],
-    ...pullRequestQueueModes.map((mode) => ({ _tag: "Queue", mode, repository }))
-  ];
+  return [...repository ? [{ _tag: "Repository", repository }] : [], ...pullRequestQueueModes.map((mode) => ({ _tag: "Queue", mode, repository }))];
 }, nextView = (view, views, delta) => {
   const index = Math.max(0, views.findIndex((candidate) => viewEquals(candidate, view)));
   return views[(index + delta + views.length) % views.length];
@@ -1528,7 +1519,6 @@ var buildAppCommands = ({
   const selectedDiffLineReason = diffFullView && diffReady ? selectedDiffCommentAnchorLabel ? null : "No diff line selected." : diffOpenReadyReason;
   const diffThreadReason = diffFullView && diffReady ? hasDiffCommentThreads ? null : "No diff comments loaded." : diffOpenReadyReason;
   const changedFilesReason = diffFullView && diffReady ? readyDiffFileCount > 0 ? null : "No changed files loaded." : diffOpenReadyReason;
-  const submitReviewReason = diffFullView && diffReady ? noOpenPullRequestReason : diffOpenReadyReason;
   const loadMoreDisabledReason = isLoadingMorePullRequests ? "Already loading more pull requests." : hasMorePullRequests ? null : "No more pull requests loaded by this view.";
   const forSelected = (command2) => {
     const { requireOpen, ...rest } = command2;
@@ -1757,15 +1747,14 @@ var buildAppCommands = ({
       keywords: ["review", "reply"],
       run: actions.openDiffCommentModal
     }),
-    defineCommand({
-      id: "diff.submit-review",
-      title: "Submit pull request review",
-      scope: "Diff",
-      subtitle: selectedPullRequestLabel,
-      shortcut: "R",
-      disabledReason: submitReviewReason,
-      keywords: ["review", "approve", "request changes"],
-      run: actions.openSubmitReviewModal
+    forSelected({
+      id: "pull.submit-review",
+      title: "Review pull request",
+      scope: "Pull request",
+      shortcut: "shift-r",
+      requireOpen: true,
+      keywords: ["review", "approve", "request changes", "comment"],
+      run: () => actions.openSubmitReviewModal("APPROVE")
     }),
     forSelected({
       id: "pull.toggle-draft",
@@ -2087,11 +2076,7 @@ var init_Clipboard = __esm(() => {
     detail: Schema3.String
   }) {
   };
-  clipboardCommands = process.platform === "darwin" ? [["pbcopy"]] : process.platform === "linux" ? [
-    ...process.env.WAYLAND_DISPLAY ? [["wl-copy"]] : [],
-    ["xclip", "-selection", "clipboard"],
-    ["xsel", "--clipboard", "--input"]
-  ] : [];
+  clipboardCommands = process.platform === "darwin" ? [["pbcopy"]] : process.platform === "linux" ? [...process.env.WAYLAND_DISPLAY ? [["wl-copy"]] : [], ["xclip", "-selection", "clipboard"], ["xsel", "--clipboard", "--input"]] : [];
   installHint = process.platform === "linux" ? " Install wl-clipboard, xclip, or xsel." : "";
   unavailableDetail = `Clipboard is not available.${installHint}`;
   Clipboard = class Clipboard extends Context3.Service()("ghui/Clipboard") {
@@ -2397,14 +2382,8 @@ var init_GitHubService = __esm(() => {
     status: OptionalNullableString,
     patch: OptionalNullableString
   });
-  CommentsResponseSchema = Schema4.Union([
-    Schema4.Array(PullRequestCommentSchema),
-    Schema4.Array(Schema4.Array(PullRequestCommentSchema))
-  ]);
-  PullRequestFilesResponseSchema = Schema4.Union([
-    Schema4.Array(PullRequestFileSchema),
-    Schema4.Array(Schema4.Array(PullRequestFileSchema))
-  ]);
+  CommentsResponseSchema = Schema4.Union([Schema4.Array(PullRequestCommentSchema), Schema4.Array(Schema4.Array(PullRequestCommentSchema))]);
+  PullRequestFilesResponseSchema = Schema4.Union([Schema4.Array(PullRequestFileSchema), Schema4.Array(Schema4.Array(PullRequestFileSchema))]);
   RepoLabelsResponseSchema = Schema4.Array(Schema4.Struct({
     name: Schema4.String,
     color: Schema4.String
@@ -2615,26 +2594,11 @@ query RepositoryPullRequests($owner: String!, $name: String!, $first: Int!, $aft
         return parsePullRequest(pullRequest);
       });
       const getAuthenticatedUser = () => ghJson("getAuthenticatedUser", ViewerSchema, ["api", "user"]).pipe(Effect6.map((viewer) => viewer.login));
-      const getPullRequestDiff = (repository, number) => ghJson("getPullRequestDiff", PullRequestFilesResponseSchema, [
-        "api",
-        "--paginate",
-        "--slurp",
-        `repos/${repository}/pulls/${number}/files`
-      ]).pipe(Effect6.map((response) => pullRequestFilesToPatch(parsePullRequestFiles(response))));
-      const listPullRequestComments = (repository, number) => ghJson("listPullRequestComments", CommentsResponseSchema, [
-        "api",
-        "--paginate",
-        "--slurp",
-        `repos/${repository}/pulls/${number}/comments`
-      ]).pipe(Effect6.map(parsePullRequestComments));
+      const getPullRequestDiff = (repository, number) => ghJson("getPullRequestDiff", PullRequestFilesResponseSchema, ["api", "--paginate", "--slurp", `repos/${repository}/pulls/${number}/files`]).pipe(Effect6.map((response) => pullRequestFilesToPatch(parsePullRequestFiles(response))));
+      const listPullRequestComments = (repository, number) => ghJson("listPullRequestComments", CommentsResponseSchema, ["api", "--paginate", "--slurp", `repos/${repository}/pulls/${number}/comments`]).pipe(Effect6.map(parsePullRequestComments));
       const listPullRequestConversation = Effect6.fn("GitHubService.listPullRequestConversation")(function* (repository, number) {
         const [issueComments, reviewComments] = yield* Effect6.all([
-          ghJson("listPullRequestIssueComments", CommentsResponseSchema, [
-            "api",
-            "--paginate",
-            "--slurp",
-            `repos/${repository}/issues/${number}/comments`
-          ]).pipe(Effect6.map(parseIssueComments)),
+          ghJson("listPullRequestIssueComments", CommentsResponseSchema, ["api", "--paginate", "--slurp", `repos/${repository}/issues/${number}/comments`]).pipe(Effect6.map(parseIssueComments)),
           listPullRequestComments(repository, number).pipe(Effect6.map((comments) => comments.map(reviewCommentConversationItem)))
         ], { concurrency: "unbounded" });
         return sortConversationItems([...issueComments, ...reviewComments]);
@@ -2685,27 +2649,9 @@ query RepositoryPullRequests($owner: String!, $name: String!, $first: Int!, $aft
         ]);
         return parsePullRequestComment(response) ?? fallbackCreatedComment(input);
       });
-      const submitPullRequestReview = (input) => ghVoid("submitPullRequestReview", [
-        "pr",
-        "review",
-        String(input.number),
-        "--repo",
-        input.repository,
-        REVIEW_EVENT_CLI_FLAG[input.event],
-        "--body",
-        input.body
-      ]);
+      const submitPullRequestReview = (input) => ghVoid("submitPullRequestReview", ["pr", "review", String(input.number), "--repo", input.repository, REVIEW_EVENT_CLI_FLAG[input.event], "--body", input.body]);
       const toggleDraftStatus = (repository, number, isDraft) => ghVoid("toggleDraftStatus", ["pr", "ready", String(number), "--repo", repository, ...isDraft ? [] : ["--undo"]]);
-      const listRepoLabels = (repository) => ghJson("listRepoLabels", RepoLabelsResponseSchema, [
-        "label",
-        "list",
-        "--repo",
-        repository,
-        "--json",
-        "name,color",
-        "--limit",
-        "100"
-      ]).pipe(Effect6.map((labels) => labels.map((label) => ({ name: label.name, color: `#${label.color}` }))));
+      const listRepoLabels = (repository) => ghJson("listRepoLabels", RepoLabelsResponseSchema, ["label", "list", "--repo", repository, "--json", "name,color", "--limit", "100"]).pipe(Effect6.map((labels) => labels.map((label) => ({ name: label.name, color: `#${label.color}` }))));
       const addPullRequestLabel = (repository, number, label) => ghVoid("addPullRequestLabel", ["pr", "edit", String(number), "--repo", repository, "--add-label", label]);
       const removePullRequestLabel = (repository, number, label) => ghVoid("removePullRequestLabel", ["pr", "edit", String(number), "--repo", repository, "--remove-label", label]);
       return GitHubService.of({
@@ -3025,10 +2971,7 @@ var DiffView, DiffWrapMode, DiffWhitespaceMode, DiffCommentKind, PullRequestDiff
   }
   return { additions, deletions };
 }, diffFileStatsText = (stats) => {
-  return [
-    stats.additions > 0 ? `+${stats.additions}` : null,
-    stats.deletions > 0 ? `-${stats.deletions}` : null
-  ].filter((part) => part !== null).join(" ");
+  return [stats.additions > 0 ? `+${stats.additions}` : null, stats.deletions > 0 ? `-${stats.deletions}` : null].filter((part) => part !== null).join(" ");
 }, getDiffCommentAnchors = (file, view = "unified", wrapMode = "none", width = 120) => {
   const anchors = [];
   const lines = file.patch.split(`
@@ -3386,7 +3329,13 @@ var fitCell = (text, width, align = "left") => {
     fg,
     children
   }, undefined, false, undefined, this)
-}, undefined, false, undefined, this), MatchedCell = ({ text, width, query, align = "left", matchIndexes }) => {
+}, undefined, false, undefined, this), MatchedCell = ({
+  text,
+  width,
+  query,
+  align = "left",
+  matchIndexes
+}) => {
   const fitted = fitCell(text, width, align);
   if (matchIndexes && matchIndexes.length > 0) {
     const highlighted = new Set(matchIndexes.filter((index2) => index2 >= 0 && index2 < fitted.length));
@@ -3817,16 +3766,9 @@ var commentCountText = (count) => count === 1 ? "1 comment" : `${count} comments
   for (const group of groups)
     appendMetaGroup(segments, group);
   return segments;
-}, commentBodyRows = ({
-  keyPrefix,
-  body,
-  width
-}) => wrapCommentText(body, Math.max(1, width - 2)).map((line, index) => ({
+}, commentBodyRows = ({ keyPrefix, body, width }) => wrapCommentText(body, Math.max(1, width - 2)).map((line, index) => ({
   key: `${keyPrefix}:body:${index}`,
-  segments: [
-    { text: "\u2502 ", fg: colors.muted },
-    ...inlineCommentSegments(line)
-  ]
+  segments: [{ text: "\u2502 ", fg: colors.muted }, ...inlineCommentSegments(line)]
 })), commentDisplayRows = ({
   item,
   width,
@@ -4139,20 +4081,18 @@ var DETAIL_BODY_LINES = 6, DETAIL_PLACEHOLDER_ROWS = 4, DETAIL_BODY_SCROLL_LIMIT
   if (item._tag !== "review-comment")
     return [];
   const pathWidth = Math.max(12, width - item.author.length - 20);
-  return [[
-    { text: truncateConversationPath(item.path, pathWidth), fg: colors.inlineCode }
-  ]];
+  return [[{ text: truncateConversationPath(item.path, pathWidth), fg: colors.inlineCode }]];
 }, conversationPreview = ({
   items,
   status,
   width,
   limit
 }) => {
-  if (status === "idle" || status === "ready" && items.length === 0 || limit <= 0)
+  if (status !== "ready" || items.length === 0 || limit <= 0)
     return [];
   const rows = [];
   const title = "Conversation";
-  const countText = status === "loading" ? "loading" : commentCountText(items.length);
+  const countText = commentCountText(items.length);
   const gap = Math.max(2, width - title.length - countText.length);
   rows.push({
     segments: [
@@ -4161,10 +4101,6 @@ var DETAIL_BODY_LINES = 6, DETAIL_PLACEHOLDER_ROWS = 4, DETAIL_BODY_SCROLL_LIMIT
       { text: countText, fg: colors.muted }
     ]
   });
-  if (items.length === 0) {
-    rows.push({ segments: [{ text: "\u2502 ", fg: colors.muted }, { text: "Loading comments...", fg: colors.muted }] });
-    return rows.slice(0, limit);
-  }
   for (const item of items) {
     if (rows.length >= limit)
       break;
@@ -4187,11 +4123,7 @@ var DETAIL_BODY_LINES = 6, DETAIL_PLACEHOLDER_ROWS = 4, DETAIL_BODY_SCROLL_LIMIT
   });
   if (conversationRows.length === 0)
     return summaryRows;
-  return [
-    ...summaryRows,
-    previewDivider(),
-    ...conversationRows
-  ].slice(0, limit);
+  return [...summaryRows, previewDivider(), ...conversationRows].slice(0, limit);
 }, deduplicateChecks = (checks) => {
   const seen = new Map;
   for (const check of checks) {
@@ -4683,40 +4615,28 @@ var RetryProgress, initialRetryProgress, filterEditingHints, diffViewHints = (ct
   { key: "\u2191\u2193", label: ctx.diffRangeActive ? "range" : "line" },
   { key: "enter", label: ctx.diffRangeActive ? "comment" : "open" },
   { key: "v", label: ctx.diffRangeActive ? "clear" : "range" },
-  { key: "n/p", label: "threads" },
   { key: "[]", label: "files" },
-  { key: "V", label: "view" },
-  { key: "w", label: "wrap" },
-  { key: "r", label: "reload" },
-  { key: "o", label: "open" }
+  { key: "r", label: "reload" }
 ], detailFullViewHints = (ctx) => [
   { key: "esc", label: "back" },
   { key: "\u2191\u2193", label: "scroll" },
   { key: "r", label: ctx.hasError ? "retry" : "refresh" },
-  { key: "t", label: "theme" },
-  { key: "s", label: "state", when: ctx.hasSelection },
-  { key: "d", label: "diff", when: ctx.hasSelection },
-  { key: "l", label: "labels", when: ctx.hasSelection },
-  { key: "m", label: "merge", when: ctx.hasSelection },
-  { key: "x", label: "close", when: ctx.hasSelection && ctx.canCloseSelection },
-  { key: "o", label: "open" },
-  { key: "y", label: "copy" },
-  { key: "q", label: "quit" }
+  { key: "d", label: "diff", when: ctx.hasSelection }
 ], defaultHints = (ctx) => {
   const retrying = ctx.retryProgress._tag === "Retrying";
   return [
     { key: "/", label: "filter" },
-    { key: "t", label: "theme" },
     { key: "esc", label: "clear", when: ctx.showFilterClear },
-    { key: "retry", label: retrying ? `${ctx.retryProgress.attempt}/${ctx.retryProgress.max}` : "", when: retrying, keyFg: colors.status.pending },
+    {
+      key: "retry",
+      label: retrying ? `${ctx.retryProgress.attempt}/${ctx.retryProgress.max}` : "",
+      when: retrying,
+      keyFg: colors.status.pending
+    },
     { key: ctx.loadingIndicator, label: "loading", when: !retrying && ctx.isLoading, keyFg: colors.status.pending },
     { key: "r", label: "retry", when: ctx.hasError },
+    { key: "enter", label: "details", when: ctx.hasSelection },
     { key: "d", label: "diff", when: ctx.hasSelection },
-    { key: "l", label: "labels", when: ctx.hasSelection },
-    { key: "m", label: "merge", when: ctx.hasSelection },
-    { key: "x", label: "close", when: ctx.hasSelection && ctx.canCloseSelection },
-    { key: "o", label: "open", when: ctx.hasSelection },
-    { key: "y", label: "copy", when: ctx.hasSelection },
     { key: "ctrl-p", label: "commands" }
   ];
 }, footerHints = (ctx) => {
@@ -5018,7 +4938,11 @@ var scopeLabels, buildCommandPaletteRows = (commands) => {
     countText,
     onBodyMouseScroll: handleMouseScroll,
     footer: /* @__PURE__ */ jsxDEV7(HintRow, {
-      items: [{ key: "\u2191\u2193", label: "select" }, { key: "enter", label: "run" }, { key: "esc", label: "close" }]
+      items: [
+        { key: "\u2191\u2193", label: "select" },
+        { key: "enter", label: "run" },
+        { key: "esc", label: "close" }
+      ]
     }, undefined, false, undefined, this),
     children: content
   }, undefined, false, undefined, this);
@@ -5039,6 +4963,7 @@ var init_CommandPalette = __esm(() => {
 });
 
 // src/ui/modals.tsx
+import { TextAttributes as TextAttributes6 } from "@opentui/core";
 import { Data as Data3 } from "effect";
 import { jsxDEV as jsxDEV8, Fragment as Fragment6 } from "@opentui/react/jsx-dev-runtime";
 var filterLabels = (labels, query) => {
@@ -5194,7 +5119,12 @@ var filterLabels = (labels, query) => {
     }, undefined, true, undefined, this),
     bodyPadding: 1,
     footer: /* @__PURE__ */ jsxDEV8(HintRow, {
-      items: [{ key: "enter", label: "open" }, { key: "ctrl-u", label: "clear" }, { key: "ctrl-w", label: "word" }, { key: "esc", label: "cancel" }]
+      items: [
+        { key: "enter", label: "open" },
+        { key: "ctrl-u", label: "clear" },
+        { key: "ctrl-w", label: "word" },
+        { key: "esc", label: "cancel" }
+      ]
     }, undefined, false, undefined, this),
     children: state.error ? /* @__PURE__ */ jsxDEV8(PlainLine, {
       text: fitCell(state.error, contentWidth),
@@ -5250,7 +5180,7 @@ var filterLabels = (labels, query) => {
         }, undefined, false, undefined, this),
         /* @__PURE__ */ jsxDEV8("span", {
           fg: colors.muted,
-          children: " move  "
+          children: " move "
         }, undefined, false, undefined, this),
         /* @__PURE__ */ jsxDEV8("span", {
           fg: colors.count,
@@ -5263,7 +5193,7 @@ var filterLabels = (labels, query) => {
         filtered.length > maxVisible ? /* @__PURE__ */ jsxDEV8("span", {
           fg: colors.muted,
           children: [
-            "  ",
+            " ",
             selectedIndex + 1,
             "/",
             filtered.length
@@ -5322,7 +5252,7 @@ var filterLabels = (labels, query) => {
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsxDEV8("span", {
               bg: labelColor(label),
-              children: "  "
+              children: " "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsxDEV8("span", {
               children: [
@@ -5363,7 +5293,11 @@ var filterLabels = (labels, query) => {
     placeholder: "Filter",
     countText,
     footer: /* @__PURE__ */ jsxDEV8(HintRow, {
-      items: [{ key: "\u2191\u2193", label: "move" }, { key: "enter", label: "jump" }, { key: "esc", label: "close" }]
+      items: [
+        { key: "\u2191\u2193", label: "move" },
+        { key: "enter", label: "jump" },
+        { key: "esc", label: "close" }
+      ]
     }, undefined, false, undefined, this),
     children: visibleFiles.length === 0 ? /* @__PURE__ */ jsxDEV8(Fragment6, {
       children: [
@@ -5436,7 +5370,11 @@ var filterLabels = (labels, query) => {
       fg: colors.muted
     }, undefined, false, undefined, this),
     footer: /* @__PURE__ */ jsxDEV8(HintRow, {
-      items: [{ key: "\u2191\u2193", label: "move" }, { key: "enter", label: "confirm" }, { key: "esc", label: "close" }]
+      items: [
+        { key: "\u2191\u2193", label: "move" },
+        { key: "enter", label: "confirm" },
+        { key: "esc", label: "close" }
+      ]
     }, undefined, false, undefined, this),
     children: state.loading ? /* @__PURE__ */ jsxDEV8(Fragment6, {
       children: [
@@ -5521,7 +5459,10 @@ var filterLabels = (labels, query) => {
     }, undefined, false, undefined, this),
     bodyPadding: 1,
     footer: /* @__PURE__ */ jsxDEV8(HintRow, {
-      items: [{ key: "enter", label: "close" }, { key: "esc", label: "cancel" }]
+      items: [
+        { key: "enter", label: "close" },
+        { key: "esc", label: "cancel" }
+      ]
     }, undefined, false, undefined, this),
     children: state.error ? /* @__PURE__ */ jsxDEV8(PlainLine, {
       text: fitCell(state.error, contentWidth),
@@ -5612,7 +5553,11 @@ var filterLabels = (labels, query) => {
     }, undefined, false, undefined, this),
     bodyPadding: 1,
     footer: /* @__PURE__ */ jsxDEV8(HintRow, {
-      items: [{ key: "enter", label: "save" }, { key: "shift-enter", label: "newline" }, { key: "esc", label: "cancel" }]
+      items: [
+        { key: "enter", label: "save" },
+        { key: "shift-enter", label: "newline" },
+        { key: "esc", label: "cancel" }
+      ]
     }, undefined, false, undefined, this),
     children: [
       state.error ? /* @__PURE__ */ jsxDEV8(PlainLine, {
@@ -5627,27 +5572,40 @@ var filterLabels = (labels, query) => {
   modalWidth,
   modalHeight,
   offsetLeft,
-  offsetTop,
-  loadingIndicator
+  offsetTop
 }) => {
-  const { contentWidth, bodyHeight } = standardModalDims(modalWidth, modalHeight);
+  const { innerWidth, contentWidth } = standardModalDims(modalWidth, modalHeight);
   const selectedIndex = Math.max(0, Math.min(state.selectedIndex, submitReviewOptions.length - 1));
-  const editorHeight = Math.max(1, bodyHeight - submitReviewOptions.length - (state.error ? 1 : 0));
+  const headerRows = 1;
+  const actionHeight = submitReviewOptions.length;
+  const errorHeight = state.error ? 1 : 0;
+  const footerRows = 1;
+  const dividerRows = 3;
+  const frameBorderRows = 2;
+  const editorHeight = Math.max(1, modalHeight - frameBorderRows - headerRows - actionHeight - errorHeight - footerRows - dividerRows);
+  const actionDividerRow = headerRows;
+  const editorDividerRow = headerRows + 1 + actionHeight;
+  const footerDividerRow = editorDividerRow + 1 + errorHeight + editorHeight;
   const lineRanges = commentEditorLines(state.body);
   const cursor = clampCursor(state.body, state.cursor);
   const cursorLineIndex = cursorLineIndexForLines(lineRanges, cursor);
   const visibleStart = Math.min(Math.max(0, lineRanges.length - editorHeight), Math.max(0, cursorLineIndex - editorHeight + 1));
   const visibleLines = lineRanges.slice(visibleStart, visibleStart + editorHeight);
-  const title = state.number ? `Submit review  #${state.number}` : "Submit review";
-  const rightText = state.running ? `${loadingIndicator} submitting` : submitReviewOptions[selectedIndex]?.title ?? "review";
-  const subtitleText = state.repository ? shortRepoName(state.repository) : "Choose a review action and optional summary";
+  const title = "Submit review";
+  const editorFocused = state.focus === "body";
   const renderEditorLine = (line, index) => {
     const lineIndex = visibleStart + index;
     const isCursorLine = lineIndex === cursorLineIndex;
     const cursorColumn = Math.max(0, Math.min(cursor - line.start, line.text.length));
-    const viewStart = isCursorLine ? Math.max(0, cursorColumn - contentWidth + 1) : 0;
+    const viewStart = editorFocused && isCursorLine ? Math.max(0, cursorColumn - contentWidth + 1) : 0;
     const visibleText = line.text.slice(viewStart, viewStart + contentWidth);
-    if (!isCursorLine) {
+    if (!editorFocused || !isCursorLine) {
+      if (state.body.length === 0 && lineIndex === 0) {
+        return /* @__PURE__ */ jsxDEV8(PlainLine, {
+          text: fitCell("Optional review summary...", contentWidth),
+          fg: colors.muted
+        }, lineIndex, false, undefined, this);
+      }
       return /* @__PURE__ */ jsxDEV8(PlainLine, {
         text: fitCell(visibleText, contentWidth),
         fg: state.body.length > 0 ? colors.text : colors.muted
@@ -5676,52 +5634,89 @@ var filterLabels = (labels, query) => {
       ]
     }, lineIndex, true, undefined, this);
   };
-  return /* @__PURE__ */ jsxDEV8(StandardModal, {
+  return /* @__PURE__ */ jsxDEV8(ModalFrame, {
     left: offsetLeft,
     top: offsetTop,
     width: modalWidth,
     height: modalHeight,
-    title,
-    headerRight: { text: rightText, pending: state.running },
-    subtitle: /* @__PURE__ */ jsxDEV8(PlainLine, {
-      text: fitCell(subtitleText, contentWidth),
-      fg: colors.muted
-    }, undefined, false, undefined, this),
-    bodyPadding: 1,
-    footer: /* @__PURE__ */ jsxDEV8(HintRow, {
-      items: [{ key: "tab", label: "action" }, { key: "enter", label: "submit" }, { key: "shift-enter", label: "newline" }, { key: "esc", label: "cancel" }]
-    }, undefined, false, undefined, this),
+    junctionRows: [actionDividerRow, editorDividerRow, footerDividerRow],
     children: [
-      submitReviewOptions.map((option, index) => {
-        const isSelected = index === selectedIndex;
-        const titleWidth = Math.min(18, Math.max(8, contentWidth - 8));
-        const descriptionWidth = Math.max(1, contentWidth - titleWidth - 4);
-        return /* @__PURE__ */ jsxDEV8(TextLine, {
-          bg: isSelected ? colors.selectedBg : undefined,
-          fg: isSelected ? colors.selectedText : colors.text,
-          children: [
-            /* @__PURE__ */ jsxDEV8("span", {
-              fg: submitReviewEventColor(option.event),
-              children: isSelected ? "\u203A" : " "
-            }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV8("span", {
-              children: [
-                " ",
-                fitCell(option.title, titleWidth)
-              ]
-            }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsxDEV8("span", {
-              fg: isSelected ? colors.selectedText : colors.muted,
-              children: fitCell(option.description, descriptionWidth)
-            }, undefined, false, undefined, this)
-          ]
-        }, option.event, true, undefined, this);
-      }),
-      state.error ? /* @__PURE__ */ jsxDEV8(PlainLine, {
-        text: fitCell(state.error, contentWidth),
-        fg: colors.error
+      /* @__PURE__ */ jsxDEV8(PaddedRow, {
+        children: /* @__PURE__ */ jsxDEV8(TextLine, {
+          children: /* @__PURE__ */ jsxDEV8("span", {
+            fg: colors.accent,
+            attributes: TextAttributes6.BOLD,
+            children: title
+          }, undefined, false, undefined, this)
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV8(Divider, {
+        width: innerWidth
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV8("box", {
+        height: actionHeight,
+        flexDirection: "column",
+        paddingLeft: 1,
+        paddingRight: 1,
+        children: submitReviewOptions.map((option, index) => {
+          const isSelected = index === selectedIndex;
+          const isFocusedSelection = isSelected && state.focus === "action";
+          const titleWidth = Math.min(18, Math.max(8, contentWidth - 8));
+          const descriptionWidth = Math.max(1, contentWidth - titleWidth - 4);
+          return /* @__PURE__ */ jsxDEV8(TextLine, {
+            bg: isFocusedSelection ? colors.selectedBg : undefined,
+            fg: isFocusedSelection ? colors.selectedText : colors.text,
+            children: [
+              /* @__PURE__ */ jsxDEV8("span", {
+                fg: submitReviewEventColor(option.event),
+                children: isFocusedSelection ? "\u203A" : isSelected ? "\u2713" : " "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV8("span", {
+                children: [
+                  " ",
+                  fitCell(option.title, titleWidth)
+                ]
+              }, undefined, true, undefined, this),
+              /* @__PURE__ */ jsxDEV8("span", {
+                fg: isFocusedSelection ? colors.selectedText : colors.muted,
+                children: fitCell(option.description, descriptionWidth)
+              }, undefined, false, undefined, this)
+            ]
+          }, option.event, true, undefined, this);
+        })
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV8(Divider, {
+        width: innerWidth
+      }, undefined, false, undefined, this),
+      state.error ? /* @__PURE__ */ jsxDEV8(PaddedRow, {
+        children: /* @__PURE__ */ jsxDEV8(PlainLine, {
+          text: fitCell(state.error, contentWidth),
+          fg: colors.error
+        }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      visibleLines.map(renderEditorLine)
+      /* @__PURE__ */ jsxDEV8("box", {
+        height: editorHeight,
+        flexDirection: "column",
+        paddingLeft: 1,
+        paddingRight: 1,
+        children: visibleLines.map(renderEditorLine)
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV8(Divider, {
+        width: innerWidth
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV8(PaddedRow, {
+        children: /* @__PURE__ */ jsxDEV8(HintRow, {
+          items: editorFocused ? [
+            { key: "shift-enter", label: "newline" },
+            { key: "enter", label: "submit" },
+            { key: "esc", label: "actions" }
+          ] : [
+            { key: "\u2191\u2193", label: "action" },
+            { key: "enter", label: "summary" },
+            { key: "esc", label: "cancel" }
+          ]
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }, commentThreadRows = (comments, width) => comments.flatMap((comment) => commentDisplayRows({ item: comment, width })), CommentThreadModal = ({
@@ -5753,7 +5748,11 @@ var filterLabels = (labels, query) => {
     }, undefined, false, undefined, this),
     bodyPadding: 1,
     footer: /* @__PURE__ */ jsxDEV8(HintRow, {
-      items: [{ key: "\u2191\u2193", label: "scroll" }, { key: "enter", label: "comment" }, { key: "esc", label: "close" }]
+      items: [
+        { key: "\u2191\u2193", label: "scroll" },
+        { key: "enter", label: "comment" },
+        { key: "esc", label: "close" }
+      ]
     }, undefined, false, undefined, this),
     children: visibleRows.length === 0 ? /* @__PURE__ */ jsxDEV8(PlainLine, {
       text: fitCell("No comments on this line.", contentWidth),
@@ -5806,7 +5805,12 @@ var filterLabels = (labels, query) => {
       fg: colors.muted
     }, undefined, false, undefined, this),
     footer: /* @__PURE__ */ jsxDEV8(HintRow, {
-      items: [{ key: "\u2191\u2193", label: "preview" }, { key: "/", label: "filter" }, { key: "enter", label: "select" }, { key: "esc", label: "cancel" }]
+      items: [
+        { key: "\u2191\u2193", label: "preview" },
+        { key: "/", label: "filter" },
+        { key: "enter", label: "select" },
+        { key: "esc", label: "cancel" }
+      ]
     }, undefined, false, undefined, this),
     children: visibleThemes.length === 0 ? /* @__PURE__ */ jsxDEV8(Fragment6, {
       children: [
@@ -5930,6 +5934,7 @@ var init_modals = __esm(() => {
   initialSubmitReviewModalState = {
     repository: null,
     number: null,
+    focus: "action",
     selectedIndex: 0,
     body: "",
     cursor: 0,
@@ -6032,7 +6037,7 @@ var DiffPaneHeader = ({ pullRequest, paneWidth }) => {
       }, undefined, false, undefined, this),
       statsText ? /* @__PURE__ */ jsxDEV9("span", {
         fg: colors.muted,
-        children: "  "
+        children: " "
       }, undefined, false, undefined, this) : null,
       /* @__PURE__ */ jsxDEV9(FileStats, {
         stats
@@ -6115,7 +6120,10 @@ var DiffPaneHeader = ({ pullRequest, paneWidth }) => {
   }
   if (readyFiles.length === 0 || stackedFiles.length === 0) {
     return /* @__PURE__ */ jsxDEV9(LoadingPane, {
-      content: { title: whitespaceMode === "ignore" ? "No non-whitespace diff" : "No diff", hint: whitespaceMode === "ignore" ? "Use the command palette to show whitespace changes" : "This PR has no patch contents" },
+      content: {
+        title: whitespaceMode === "ignore" ? "No non-whitespace diff" : "No diff",
+        hint: whitespaceMode === "ignore" ? "Use the command palette to show whitespace changes" : "This PR has no patch contents"
+      },
       width: paneWidth,
       height
     }, undefined, false, undefined, this);
@@ -6127,7 +6135,10 @@ var DiffPaneHeader = ({ pullRequest, paneWidth }) => {
     markerLabel: diffCommentLineLabel(selectedCommentAnchor),
     groups: [
       [{ text: commentCountText(selectedCommentThread.length), fg: colors.muted }],
-      [{ text: "enter", fg: colors.text }, { text: " thread", fg: colors.muted }]
+      [
+        { text: "enter", fg: colors.text },
+        { text: " thread", fg: colors.muted }
+      ]
     ]
   }) : [];
   const stickyScrollTop = Math.max(0, Math.floor(scrollTop));
@@ -6296,7 +6307,7 @@ var init_PullRequestDiffPane = __esm(() => {
 });
 
 // src/ui/PullRequestList.tsx
-import { TextAttributes as TextAttributes6 } from "@opentui/core";
+import { TextAttributes as TextAttributes7 } from "@opentui/core";
 import { jsxDEV as jsxDEV10 } from "@opentui/react/jsx-dev-runtime";
 var GROUP_ICON = "\u25C6", getRowLayout = (contentWidth, numberWidth, ageWidth) => {
   const reviewWidth = 1;
@@ -6325,7 +6336,7 @@ var GROUP_ICON = "\u25C6", getRowLayout = (contentWidth, numberWidth, ageWidth)
     }, undefined, true, undefined, this),
     /* @__PURE__ */ jsxDEV10("span", {
       fg: color,
-      attributes: TextAttributes6.BOLD,
+      attributes: TextAttributes7.BOLD,
       children: /* @__PURE__ */ jsxDEV10(MatchedCell, {
         text: label,
         width: label.length,
@@ -6548,7 +6559,10 @@ var REVIEW_CYCLE, MERGEABLE_CYCLE, synthCheckSummary = (passed, total) => {
   if (index % 5 === 0)
     return [{ name: "bug", color: "#d73a4a" }];
   if (index % 7 === 0)
-    return [{ name: "enhancement", color: "#a2eeef" }, { name: "tests", color: "#0e8a16" }];
+    return [
+      { name: "enhancement", color: "#a2eeef" },
+      { name: "tests", color: "#0e8a16" }
+    ];
   return [];
 }, buildPullRequest = (index, options) => {
   const repoIndex = index % options.repoCount;
@@ -6729,22 +6743,14 @@ var parseOptionalPositiveInt = (value, fallback) => {
   const normalized = query.trim().toLowerCase();
   if (normalized.length === 0)
     return 0;
-  const fields = [
-    pullRequest.title.toLowerCase(),
-    pullRequest.repository.toLowerCase(),
-    String(pullRequest.number)
-  ];
+  const fields = [pullRequest.title.toLowerCase(), pullRequest.repository.toLowerCase(), String(pullRequest.number)];
   const scores = fields.flatMap((field, index) => {
     const matchIndex = field.indexOf(normalized);
     return matchIndex >= 0 ? [index * 1000 + matchIndex] : [];
   });
   return scores.length > 0 ? Math.min(...scores) : null;
 }, pullRequestMetadataText = (pullRequest) => {
-  const lines = [
-    pullRequest.title,
-    `${pullRequest.repository} #${pullRequest.number}`,
-    pullRequest.url
-  ];
+  const lines = [pullRequest.title, `${pullRequest.repository} #${pullRequest.number}`, pullRequest.url];
   const review = reviewLabel(pullRequest);
   if (review)
     lines.push(`review: ${review}`);
@@ -6800,13 +6806,7 @@ var parseOptionalPositiveInt = (value, fallback) => {
   for (const target of diffSideTargets(diff, entry.anchor, entry.view)) {
     target.setLineColor(entry.anchor.localRenderLine, color);
   }
-}, getDetailPlaceholderContent = ({
-  status,
-  retryProgress,
-  loadingIndicator,
-  visibleCount,
-  filterText
-}) => {
+}, getDetailPlaceholderContent = ({ status, retryProgress, loadingIndicator, visibleCount, filterText }) => {
   if (status === "loading") {
     return {
       title: `${loadingIndicator} Loading pull requests`,
@@ -7457,7 +7457,16 @@ var parseOptionalPositiveInt = (value, fallback) => {
       suppressNextDiffCommentScrollRef.current = false;
     }
     diffCommentLineColorsRef.current = { contextKey: diffLineColorContextKey, entries: nextEntries };
-  }, [selectedDiffCommentAnchor?.renderLine, selectedDiffCommentAnchor?.localRenderLine, selectedDiffCommentAnchor?.side, selectedDiffCommentAnchor?.fileIndex, selectedDiffCommentRangeAnchors, diffLineColorContextKey, effectiveDiffRenderView, diffCommentThreadAnchors]);
+  }, [
+    selectedDiffCommentAnchor?.renderLine,
+    selectedDiffCommentAnchor?.localRenderLine,
+    selectedDiffCommentAnchor?.side,
+    selectedDiffCommentAnchor?.fileIndex,
+    selectedDiffCommentRangeAnchors,
+    diffLineColorContextKey,
+    effectiveDiffRenderView,
+    diffCommentThreadAnchors
+  ]);
   useEffect3(() => {
     if (!diffFullView)
       return;
@@ -7490,7 +7499,15 @@ var parseOptionalPositiveInt = (value, fallback) => {
     if (pullRequestStatus !== "ready" || !selectedPullRequest)
       return;
     hydratePullRequestDetails(selectedPullRequest, true);
-  }, [pullRequestStatus, selectedPullRequest?.url, selectedPullRequest?.headRefOid, selectedPullRequest?.state, selectedPullRequest?.detailLoaded, selectedPullRequest?.repository, selectedPullRequest?.number]);
+  }, [
+    pullRequestStatus,
+    selectedPullRequest?.url,
+    selectedPullRequest?.headRefOid,
+    selectedPullRequest?.state,
+    selectedPullRequest?.detailLoaded,
+    selectedPullRequest?.repository,
+    selectedPullRequest?.number
+  ]);
   useEffect3(() => {
     if (pullRequestStatus !== "ready" || !selectedPullRequest)
       return;
@@ -7813,13 +7830,15 @@ var parseOptionalPositiveInt = (value, fallback) => {
       return { ...current, body: next.body, cursor: next.cursor, error: null };
     });
   };
-  const openSubmitReviewModal = () => {
+  const openSubmitReviewModal = (initialEvent = "APPROVE") => {
     if (!selectedPullRequest || selectedPullRequest.state !== "open")
       return;
+    const selectedIndex2 = Math.max(0, submitReviewOptions.findIndex((option) => option.event === initialEvent));
     setSubmitReviewModal({
       repository: selectedPullRequest.repository,
       number: selectedPullRequest.number,
-      selectedIndex: 0,
+      focus: "action",
+      selectedIndex: selectedIndex2,
       body: "",
       cursor: 0,
       running: false,
@@ -8203,8 +8222,11 @@ var parseOptionalPositiveInt = (value, fallback) => {
       return true;
     }
     if (submitReviewModalActive) {
-      editSubmitReview((state) => insertText(state, text.replace(/\r\n?/g, `
-`)));
+      setSubmitReviewModal((current) => {
+        const next = insertText({ body: current.body, cursor: current.cursor }, text.replace(/\r\n?/g, `
+`));
+        return { ...current, focus: "body", body: next.body, cursor: next.cursor, error: null };
+      });
       return true;
     }
     if (labelModalActive) {
@@ -8231,7 +8253,18 @@ var parseOptionalPositiveInt = (value, fallback) => {
     return () => {
       keyInput.off("paste", handlePaste);
     };
-  }, [renderer, commandPaletteActive, openRepositoryModalActive, themeModalActive, themeModal.filterMode, commentModalActive, submitReviewModalActive, labelModalActive, changedFilesModalActive, filterMode]);
+  }, [
+    renderer,
+    commandPaletteActive,
+    openRepositoryModalActive,
+    themeModalActive,
+    themeModal.filterMode,
+    commentModalActive,
+    submitReviewModalActive,
+    labelModalActive,
+    changedFilesModalActive,
+    filterMode
+  ]);
   const appCommands = buildAppCommands({
     pullRequestStatus,
     filterQuery,
@@ -8335,19 +8368,18 @@ var parseOptionalPositiveInt = (value, fallback) => {
     const repository = parseRepositoryInput(commandPalette.query);
     if (!repository || repository === selectedRepository)
       return [];
-    return [defineCommand({
-      id: `view.repository.dynamic:${repository}`,
-      title: `Open ${repository}`,
-      scope: "View",
-      subtitle: "Switch to this repository",
-      run: () => switchViewTo({ _tag: "Repository", repository })
-    })];
+    return [
+      defineCommand({
+        id: `view.repository.dynamic:${repository}`,
+        title: `Open ${repository}`,
+        scope: "View",
+        subtitle: "Switch to this repository",
+        run: () => switchViewTo({ _tag: "Repository", repository })
+      })
+    ];
   })();
   const staticPaletteCommands = commandPaletteActive ? filterCommands(appCommands.filter((command2) => command2.id !== "command.open" && commandEnabled(command2)), commandPalette.query) : [];
-  const commandPaletteCommands = commandPaletteActive ? [
-    ...dynamicPaletteCommands,
-    ...commandPalette.query.trim().length > 0 ? staticPaletteCommands : sortCommandsByScope(staticPaletteCommands)
-  ] : [];
+  const commandPaletteCommands = commandPaletteActive ? [...dynamicPaletteCommands, ...commandPalette.query.trim().length > 0 ? staticPaletteCommands : sortCommandsByScope(staticPaletteCommands)] : [];
   const selectedCommandIndex = clampCommandIndex(commandPalette.selectedIndex, commandPaletteCommands);
   const selectedCommand = commandPaletteCommands[selectedCommandIndex] ?? null;
   const moveMergeSelection = (delta) => setMergeModal((current) => {
@@ -8485,8 +8517,15 @@ var parseOptionalPositiveInt = (value, fallback) => {
       moveSelection: moveChangedFileSelection
     },
     submitReviewModal: {
-      closeModal: closeActiveModal,
+      summaryFocused: submitReviewModal.focus === "body",
+      handleEscape: () => {
+        if (submitReviewModal.focus === "body")
+          setSubmitReviewModal((current) => ({ ...current, focus: "action" }));
+        else
+          closeActiveModal();
+      },
       submit: confirmSubmitReview,
+      focusSummary: () => setSubmitReviewModal((current) => ({ ...current, focus: "body", error: null })),
       insertNewline: () => editSubmitReview((state) => insertText(state, `
 `)),
       moveActionSelection: moveSubmitReviewActionSelection,
@@ -8581,7 +8620,7 @@ var parseOptionalPositiveInt = (value, fallback) => {
       alignAnchor: alignSelectedDiffCommentAnchor,
       selectSide: selectDiffCommentSide,
       openChangedFiles: () => runCommandById("diff.changed-files"),
-      openSubmitReview: () => runCommandById("diff.submit-review"),
+      openSubmitReview: () => runCommandById("pull.submit-review"),
       nextFile: () => runCommandById("diff.next-file"),
       previousFile: () => runCommandById("diff.previous-file"),
       openInBrowser: () => runCommandById("pull.open-browser")
@@ -8597,6 +8636,7 @@ var parseOptionalPositiveInt = (value, fallback) => {
       openLabels: () => runCommandById("pull.labels"),
       openMerge: () => runCommandById("pull.merge"),
       toggleDraft: () => runCommandById("pull.toggle-draft"),
+      openReview: () => runCommandById("pull.submit-review"),
       refresh: () => runCommandById("pull.refresh"),
       openInBrowser: () => runCommandById("pull.open-browser"),
       copyMetadata: () => runCommandById("pull.copy-metadata")
@@ -8663,6 +8703,8 @@ var parseOptionalPositiveInt = (value, fallback) => {
       return;
     }
     if (submitReviewModalActive) {
+      if (submitReviewModal.focus !== "body")
+        return;
       const text = printableKeyText(key);
       if (text)
         editSubmitReview((state) => insertText(state, text));
@@ -9066,7 +9108,6 @@ var parseOptionalPositiveInt = (value, fallback) => {
           diffFullView,
           diffRangeActive: diffCommentRangeActive,
           hasSelection: selectedPullRequest !== null,
-          canCloseSelection: selectedPullRequest?.state === "open",
           hasError: pullRequestStatus === "error",
           isLoading: pullRequestStatus === "loading" || isRefreshingPullRequests || isHydratingPullRequestDetails || closeModal.running || mergeModal.running || submitReviewModal.running,
           loadingIndicator,
@@ -9121,8 +9162,7 @@ var parseOptionalPositiveInt = (value, fallback) => {
         modalWidth: submitReviewModalWidth,
         modalHeight: submitReviewModalHeight,
         offsetLeft: submitReviewModalLeft,
-        offsetTop: submitReviewModalTop,
-        loadingIndicator
+        offsetTop: submitReviewModalTop
       }, undefined, false, undefined, this) : null,
       mergeModalActive ? /* @__PURE__ */ jsxDEV11(MergeModal, {
         state: mergeModal,
@@ -9191,12 +9231,12 @@ var init_App = __esm(async () => {
   init_spinner();
   mockPrCount = parseOptionalPositiveInt(process.env.GHUI_MOCK_PR_COUNT, null);
   pullRequestPageSize = Math.min(100, parseOptionalPositiveInt(process.env.GHUI_PR_PAGE_SIZE, config.prPageSize) ?? config.prPageSize);
-  githubServiceLayer = mockPrCount !== null ? (await Promise.resolve().then(() => (init_MockGitHubService(), exports_MockGitHubService))).MockGitHubService.layer({ prCount: mockPrCount, repoCount: parseOptionalPositiveInt(process.env.GHUI_MOCK_REPO_COUNT, 4) ?? 4 }) : GitHubService.layerNoDeps;
+  githubServiceLayer = mockPrCount !== null ? (await Promise.resolve().then(() => (init_MockGitHubService(), exports_MockGitHubService))).MockGitHubService.layer({
+    prCount: mockPrCount,
+    repoCount: parseOptionalPositiveInt(process.env.GHUI_MOCK_REPO_COUNT, 4) ?? 4
+  }) : GitHubService.layerNoDeps;
   githubRuntime = Atom.runtime(Layer7.mergeAll(githubServiceLayer, Clipboard.layerNoDeps, BrowserOpener.layerNoDeps).pipe(Layer7.provide(CommandRunner.layer), Layer7.provideMerge(Observability.layer)));
-  [initialThemeId, initialDiffWhitespaceMode] = await Promise.all([
-    Effect9.runPromise(loadStoredThemeId),
-    Effect9.runPromise(loadStoredDiffWhitespaceMode)
-  ]);
+  [initialThemeId, initialDiffWhitespaceMode] = await Promise.all([Effect9.runPromise(loadStoredThemeId), Effect9.runPromise(loadStoredDiffWhitespaceMode)]);
   retryProgressAtom = Atom.make(initialRetryProgress).pipe(Atom.keepAlive);
   activeViewAtom = Atom.make(initialPullRequestView()).pipe(Atom.keepAlive);
   queueLoadCacheAtom = Atom.make({}).pipe(Atom.keepAlive);
@@ -9291,10 +9331,7 @@ var init_App = __esm(async () => {
       seenUrls.add(pullRequest.url);
       return recentlyCompleted[pullRequest.url] ?? overrides[pullRequest.url] ?? pullRequest;
     });
-    return [
-      ...open,
-      ...Object.values(recentlyCompleted).filter((pullRequest) => !seenUrls.has(pullRequest.url))
-    ];
+    return [...open, ...Object.values(recentlyCompleted).filter((pullRequest) => !seenUrls.has(pullRequest.url))];
   });
   effectiveFilterQueryAtom = Atom.make((get2) => (get2(filterModeAtom) ? get2(filterDraftAtom) : get2(filterQueryAtom)).trim().toLowerCase());
   filteredPullRequestsAtom = Atom.make((get2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kitlangton/ghui",
-	"version": "0.3.2",
+	"version": "0.3.3",
 	"description": "Terminal UI for GitHub pull requests",
 	"type": "module",
 	"license": "MIT",