@kitlangton/ghui 0.1.9 → 0.1.11

package/package.json

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

package/src/App.tsx

@@ -13,7 +13,7 @@ import { Observability } from "./observability.js"
 import { GitHubService } from "./services/GitHubService.js"
 import { colors } from "./ui/colors.js"
 import { pullRequestDiffKey, splitPatchFiles, type PullRequestDiffState } from "./ui/diff.js"
-import { DetailBody, DetailHeader, DetailPlaceholder, DetailsPane, getDetailJunctionRows, LoadingPane, type DetailPlaceholderContent } from "./ui/DetailsPane.js"
+import { DetailBody, DetailHeader, DetailPlaceholder, DetailsPane, getDetailBodyHeight, getDetailHeaderHeight, getDetailJunctionRows, getDetailsPaneHeight, LoadingPane, type DetailPlaceholderContent } from "./ui/DetailsPane.js"
 import { FooterHints, type RetryProgress } from "./ui/FooterHints.js"
 import { Divider, fitCell, PlainLine, SeparatorColumn } from "./ui/primitives.js"
 import { initialLabelModalState, initialMergeModalState, LabelModal, MergeModal } from "./ui/modals.js"
@@ -39,6 +39,9 @@ interface DetailPlaceholderInput {
 }
 
 const PR_FETCH_RETRIES = 6
+const FOCUS_RETURN_REFRESH_MIN_MS = 60_000
+const FOCUSED_IDLE_REFRESH_MS = 5 * 60_000
+const AUTO_REFRESH_JITTER_MS = 10_000
 const LOADING_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"] as const
 
 const retryProgressAtom = Atom.make<RetryProgress | null>(null).pipe(Atom.keepAlive)
@@ -218,6 +221,7 @@ export const App = () => {
 	const [pullRequestOverrides, setPullRequestOverrides] = useAtom(pullRequestOverridesAtom)
 	const retryProgress = useAtomValue(retryProgressAtom)
 	const [loadingFrame, setLoadingFrame] = useState(0)
+	const [terminalFocused, setTerminalFocused] = useState(true)
 	const usernameResult = useAtomValue(usernameAtom)
 	const loadRepoLabels = useAtomSet(listRepoLabelsAtom, { mode: "promise" })
 	const loadPullRequestDetails = useAtomSet(listOpenPullRequestDetailsAtom, { mode: "promise" })
@@ -242,6 +246,12 @@ export const App = () => {
 	const pendingGTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 	const diffPrefetchTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 	const detailHydrationRef = useRef<number | null>(null)
+	const lastPullRequestRefreshAtRef = useRef(0)
+	const terminalFocusedRef = useRef(true)
+	const terminalWasBlurredRef = useRef(false)
+	const pullRequestStatusRef = useRef<LoadStatus>("loading")
+	const refreshPullRequestsRef = useRef<(message?: string) => void>(() => {})
+	const maybeRefreshPullRequestsRef = useRef<(minimumAgeMs: number) => void>(() => {})
 	const detailScrollRef = useRef<ScrollBoxRenderable | null>(null)
 	const diffScrollRef = useRef<ScrollBoxRenderable | null>(null)
 	const headerFooterWidth = Math.max(24, contentWidth - 2)
@@ -281,6 +291,7 @@ export const App = () => {
 	const isInitialLoading = pullRequestStatus === "loading" && pullRequests.length === 0
 	const pullRequestError = AsyncResult.isFailure(pullRequestResult) ? errorMessage(Cause.squash(pullRequestResult.cause)) : null
 	const username = AsyncResult.isSuccess(usernameResult) ? usernameResult.value : null
+	pullRequestStatusRef.current = pullRequestStatus
 
 	const effectiveFilterQuery = (filterMode ? filterDraft : filterQuery).trim().toLowerCase()
 	const visibleFilterText = filterMode ? filterDraft : filterQuery
@@ -332,6 +343,53 @@ export const App = () => {
 		refreshPullRequestsAtom()
 		if (message) flashNotice(message)
 	}
+	refreshPullRequestsRef.current = refreshPullRequests
+	maybeRefreshPullRequestsRef.current = (minimumAgeMs) => {
+		if (!terminalFocusedRef.current || pullRequestStatusRef.current === "loading") return
+		const lastRefreshAt = lastPullRequestRefreshAtRef.current
+		if (lastRefreshAt > 0 && Date.now() - lastRefreshAt < minimumAgeMs) return
+		refreshPullRequestsRef.current()
+	}
+
+	useEffect(() => {
+		const fetchedAt = pullRequestLoad?.fetchedAt?.getTime()
+		if (fetchedAt !== undefined) {
+			lastPullRequestRefreshAtRef.current = fetchedAt
+		}
+	}, [pullRequestLoad?.fetchedAt])
+
+	useEffect(() => {
+		const handleFocus = () => {
+			terminalFocusedRef.current = true
+			setTerminalFocused(true)
+			if (terminalWasBlurredRef.current) {
+				maybeRefreshPullRequestsRef.current(FOCUS_RETURN_REFRESH_MIN_MS)
+			}
+		}
+		const handleBlur = () => {
+			terminalWasBlurredRef.current = true
+			terminalFocusedRef.current = false
+			setTerminalFocused(false)
+		}
+
+		renderer.on("focus", handleFocus)
+		renderer.on("blur", handleBlur)
+		return () => {
+			renderer.off("focus", handleFocus)
+			renderer.off("blur", handleBlur)
+		}
+	}, [renderer])
+
+	useEffect(() => {
+		if (!terminalFocused) return
+		const lastRefreshAt = lastPullRequestRefreshAtRef.current || Date.now()
+		const ageMs = Date.now() - lastRefreshAt
+		const delayMs = Math.max(0, FOCUSED_IDLE_REFRESH_MS - ageMs) + Math.floor(Math.random() * AUTO_REFRESH_JITTER_MS)
+		const timeout = globalThis.setTimeout(() => {
+			maybeRefreshPullRequestsRef.current(FOCUSED_IDLE_REFRESH_MS)
+		}, delayMs)
+		return () => globalThis.clearTimeout(timeout)
+	}, [terminalFocused, pullRequestLoad?.fetchedAt])
 
 	useEffect(() => {
 		setSelectedIndex((current) => {
@@ -966,7 +1024,7 @@ export const App = () => {
 			setDetailScrollOffset(0)
 			return
 		}
-		if (key.name === "p" && selectedPullRequest) {
+		if ((key.name === "d" || key.name === "p") && selectedPullRequest) {
 			openDiffView()
 			return
 		}
@@ -983,7 +1041,7 @@ export const App = () => {
 			flashNotice(`Opened #${selectedPullRequest.number} in browser`)
 			return
 		}
-		if ((key.name === "d" || key.name === "D") && selectedPullRequest) {
+		if ((key.name === "s" || key.name === "S") && selectedPullRequest) {
 			const previousPullRequest = selectedPullRequest
 			const nextReviewStatus = selectedPullRequest.reviewStatus === "draft" ? "review" : "draft"
 			updatePullRequest(selectedPullRequest.url, (pullRequest) => ({
@@ -1013,6 +1071,22 @@ export const App = () => {
 
 	const fullscreenContentWidth = Math.max(24, contentWidth - 2)
 	const fullscreenBodyLines = Math.max(8, (height ?? 24) - 8)
+	const wideFullscreenDetailScrollable = getDetailsPaneHeight({
+		pullRequest: selectedPullRequest,
+		contentWidth: fullscreenContentWidth,
+		bodyLines: fullscreenBodyLines,
+		paneWidth: contentWidth,
+		showChecks: true,
+	}) > wideBodyHeight
+	const narrowFullscreenDetailScrollable = getDetailsPaneHeight({
+		pullRequest: selectedPullRequest,
+		contentWidth: fullscreenContentWidth,
+		bodyLines: fullscreenBodyLines,
+		paneWidth: contentWidth,
+	}) > wideBodyHeight
+	const wideDetailHeaderHeight = getDetailHeaderHeight(selectedPullRequest, rightPaneWidth, true)
+	const wideDetailBodyViewportHeight = Math.max(1, wideBodyHeight - wideDetailHeaderHeight)
+	const wideDetailBodyScrollable = getDetailBodyHeight(selectedPullRequest, rightContentWidth, wideDetailLines) > wideDetailBodyViewportHeight
 
 	const prListProps = {
 		groups: visibleGroups,
@@ -1061,7 +1135,7 @@ export const App = () => {
 				/>
 			) : isWideLayout && detailFullView ? (
 				<box flexGrow={1} flexDirection="column">
-					<scrollbox ref={detailScrollRef} focused flexGrow={1}>
+					<scrollbox ref={detailScrollRef} focused flexGrow={1} verticalScrollbarOptions={{ visible: wideFullscreenDetailScrollable }}>
 						<DetailsPane
 							pullRequest={selectedPullRequest}
 							contentWidth={fullscreenContentWidth}
@@ -1085,7 +1159,7 @@ export const App = () => {
 						{selectedPullRequest ? (
 							<>
 								<DetailHeader pullRequest={selectedPullRequest} contentWidth={rightContentWidth} paneWidth={rightPaneWidth} showChecks />
-								<scrollbox flexGrow={1}>
+								<scrollbox flexGrow={1} verticalScrollbarOptions={{ visible: wideDetailBodyScrollable }}>
 									<DetailBody pullRequest={selectedPullRequest} contentWidth={rightContentWidth} bodyLines={wideDetailLines} loadingIndicator={loadingIndicator} />
 								</scrollbox>
 							</>
@@ -1096,7 +1170,7 @@ export const App = () => {
 				</box>
 			) : detailFullView ? (
 				<box flexGrow={1} flexDirection="column">
-					<scrollbox ref={detailScrollRef} focused flexGrow={1}>
+					<scrollbox ref={detailScrollRef} focused flexGrow={1} verticalScrollbarOptions={{ visible: narrowFullscreenDetailScrollable }}>
 						<DetailsPane
 							pullRequest={selectedPullRequest}
 							contentWidth={fullscreenContentWidth}

package/src/index.tsx

@@ -7,13 +7,21 @@ import { App } from "./App.js"
 
 process.env.OTUI_USE_ALTERNATE_SCREEN = "true"
 
+const FOCUS_REPORTING_ENABLE = "\x1b[?1004h"
+const FOCUS_REPORTING_DISABLE = "\x1b[?1004l"
+
 const renderer = await createCliRenderer({
 	exitOnCtrlC: false,
 	screenMode: "alternate-screen",
 	externalOutputMode: "passthrough",
-	onDestroy: () => process.exit(0),
+	onDestroy: () => {
+		process.stdout.write(FOCUS_REPORTING_DISABLE)
+		process.exit(0)
+	},
 })
 
+process.stdout.write(FOCUS_REPORTING_ENABLE)
+
 createRoot(renderer).render(
 	<RegistryProvider>
 		<App />

package/src/ui/DetailsPane.tsx

@@ -266,6 +266,36 @@ export const getDetailJunctionRows = (pullRequest: PullRequestItem | null, paneW
 	return showChecks && checks.length > 0 ? [detailDividerRow, checksDividerRow] : [detailDividerRow]
 }
 
+export const getDetailHeaderHeight = (pullRequest: PullRequestItem | null, paneWidth: number, showChecks = false) => {
+	if (!pullRequest) return DETAIL_PLACEHOLDER_ROWS + 1
+	const titleLines = wrapText(pullRequest.title, Math.max(1, paneWidth - 2)).length
+	const checks = deduplicateChecks(pullRequest.checks)
+	const checksHeight = showChecks && checks.length > 0 ? checksRowCount(checks) + 2 : 0
+	return titleLines + 3 + checksHeight
+}
+
+export const getDetailBodyHeight = (pullRequest: PullRequestItem | null, contentWidth: number, bodyLines = DETAIL_BODY_LINES) => {
+	if (!pullRequest) return bodyLines
+	if (!pullRequest.detailLoaded) return bodyLines
+	return bodyPreview(pullRequest.body, contentWidth, bodyLines).length
+}
+
+export const getDetailsPaneHeight = ({
+	pullRequest,
+	contentWidth,
+	bodyLines = DETAIL_BODY_LINES,
+	paneWidth = contentWidth + 2,
+	showChecks = false,
+}: {
+	pullRequest: PullRequestItem | null
+	contentWidth: number
+	bodyLines?: number
+	paneWidth?: number
+	showChecks?: boolean
+}) => pullRequest
+	? getDetailHeaderHeight(pullRequest, paneWidth, showChecks) + getDetailBodyHeight(pullRequest, contentWidth, bodyLines)
+	: bodyLines + DETAIL_PLACEHOLDER_ROWS + 1
+
 export const DetailHeader = ({
 	pullRequest,
 	contentWidth,
@@ -465,16 +495,7 @@ export const DetailsPane = ({
 	placeholderContent: DetailPlaceholderContent
 	loadingIndicator: string
 }) => {
-	const titleLines = pullRequest ? wrapText(pullRequest.title, Math.max(1, paneWidth - 2)).length : 1
-	const uniqueChecks = pullRequest ? deduplicateChecks(pullRequest.checks) : []
-	const checkRows = checksRowCount(uniqueChecks)
-	const checksHeight = showChecks && uniqueChecks.length > 0 ? 1 + checkRows + 1 : 0
-	const previewLines = useMemo(
-		() => (pullRequest ? bodyPreview(pullRequest.body, contentWidth, bodyLines) : []),
-		[pullRequest?.body, contentWidth, bodyLines],
-	)
-	const bodyHeight = pullRequest && !pullRequest.detailLoaded ? bodyLines : previewLines.length
-	const contentHeight = pullRequest ? titleLines + 2 + 1 + checksHeight + bodyHeight : bodyLines + DETAIL_PLACEHOLDER_ROWS + 1
+	const contentHeight = getDetailsPaneHeight({ pullRequest, contentWidth, bodyLines, paneWidth, showChecks })
 
 	return (
 		<box flexDirection="column" height={contentHeight}>

package/src/ui/FooterHints.tsx

@@ -104,33 +104,16 @@ export const FooterHints = ({
 				</>
 			) : null}
 			<span fg={colors.count}>r</span>
-			<span fg={colors.muted}>{hasError ? " retry  " : " ref  "}</span>
-			{hasSelection ? (
-				<>
-					<span fg={colors.count}>↑↓</span>
-					<span fg={colors.muted}> move  </span>
-				</>
-			) : null}
-			{hasSelection && detailFullView ? (
-				<>
-					<span fg={colors.count}>esc</span>
-					<span fg={colors.muted}> back  </span>
-				</>
-			) : hasSelection ? (
-				<>
-					<span fg={colors.count}>enter</span>
-					<span fg={colors.muted}> expand  </span>
-				</>
-			) : null}
+			<span fg={colors.muted}>{hasError ? " retry  " : " refresh  "}</span>
 			{hasSelection ? (
 				<>
+					<span fg={colors.count}>s</span>
+					<span fg={colors.muted}> state  </span>
 					<span fg={colors.count}>d</span>
-					<span fg={colors.muted}> draft  </span>
-					<span fg={colors.count}>p</span>
 					<span fg={colors.muted}> diff  </span>
 					<span fg={colors.count}>l</span>
 					<span fg={colors.muted}> labels  </span>
-					<span fg={colors.count}>M</span>
+					<span fg={colors.count}>m</span>
 					<span fg={colors.muted}> merge  </span>
 					<span fg={colors.count}>o</span>
 					<span fg={colors.muted}> open  </span>

package/src/ui/diff.ts

@@ -89,6 +89,41 @@ const patchFileName = (patch: string) => {
 	return nextLine ? unquoteDiffPath(nextLine.slice(4).trim()) : "diff"
 }
 
+const hunkHeaderPattern = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/
+
+const formatHunkRange = (start: string, count: number) => `${start},${count}`
+
+const normalizeHunkLineCounts = (patch: string) => {
+	const lines = patch.split("\n")
+	const normalized = [...lines]
+
+	for (let index = 0; index < lines.length; index++) {
+		const match = lines[index]!.match(hunkHeaderPattern)
+		if (!match) continue
+
+		let oldCount = 0
+		let newCount = 0
+		for (let lineIndex = index + 1; lineIndex < lines.length; lineIndex++) {
+			const line = lines[lineIndex]!
+			if (line.startsWith("@@ ") || line.startsWith("diff --git ")) break
+
+			const prefix = line[0]
+			if (prefix === " ") {
+				oldCount += 1
+				newCount += 1
+			} else if (prefix === "-") {
+				oldCount += 1
+			} else if (prefix === "+") {
+				newCount += 1
+			}
+		}
+
+		normalized[index] = `@@ -${formatHunkRange(match[1]!, oldCount)} +${formatHunkRange(match[3]!, newCount)} @@${match[5]!}`
+	}
+
+	return normalized.join("\n")
+}
+
 export const splitPatchFiles = (patch: string): readonly DiffFilePatch[] => {
 	const trimmed = patch.trimEnd()
 	if (trimmed.length === 0) return []
@@ -101,7 +136,7 @@ export const splitPatchFiles = (patch: string): readonly DiffFilePatch[] => {
 	return matches.map((match, index) => {
 		const start = match.index ?? 0
 		const end = index + 1 < matches.length ? matches[index + 1]!.index ?? trimmed.length : trimmed.length
-		const filePatch = trimmed.slice(start, end).trimEnd()
+		const filePatch = normalizeHunkLineCounts(trimmed.slice(start, end).trimEnd())
 		const name = patchFileName(filePatch)
 		return { name, filetype: filetypeForPath(name), patch: filePatch }
 	})