@kitlangton/ghui 0.1.21 → 0.2.0

package/src/keymap/labelModal.ts

@@ -0,0 +1,16 @@
+import { context } from "@ghui/keymap"
+
+export interface LabelModalCtx {
+	readonly closeModal: () => void
+	readonly toggleSelected: () => void
+	readonly moveSelection: (delta: -1 | 1) => void
+}
+
+const Label = context<LabelModalCtx>()
+
+export const labelModalKeymap = Label(
+	{ id: "label-modal.close", title: "Close", keys: ["escape"], run: (s) => s.closeModal() },
+	{ id: "label-modal.toggle", title: "Toggle label", keys: ["return"], run: (s) => s.toggleSelected() },
+	{ id: "label-modal.up", title: "Up", keys: ["k", "up"], run: (s) => s.moveSelection(-1) },
+	{ id: "label-modal.down", title: "Down", keys: ["j", "down"], run: (s) => s.moveSelection(1) },
+)

package/src/keymap/listNav.ts

@@ -0,0 +1,119 @@
+import { context } from "@ghui/keymap"
+import { countedVerticalBindings } from "./helpers.ts"
+
+export interface ListNavCtx {
+	readonly halfPage: number
+	readonly visibleCount: number
+	readonly hasFilter: boolean
+	readonly canScrollDetailPreview: boolean
+	readonly runCommandById: (id: string) => void
+	readonly switchQueueMode: (delta: 1 | -1) => void
+	readonly scrollDetailPreviewBy: (delta: number) => void
+	readonly scrollDetailPreviewTo: (line: number) => void
+	readonly clearFilter: () => void
+	readonly stepSelected: (delta: number) => void
+	readonly stepSelectedUp: (count?: number) => void
+	readonly stepSelectedDown: (count?: number) => void
+	readonly stepSelectedUpWrap: () => void
+	readonly stepSelectedDownWithLoadMore: () => void
+	readonly moveSelectedToPreviousGroup: () => void
+	readonly moveSelectedToNextGroup: () => void
+	readonly setSelected: (index: number) => void
+}
+
+const List = context<ListNavCtx>()
+
+export const listNavKeymap = List(
+	// Single-key command shortcuts (delegate to existing AppCommand registry)
+	{ 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") },
+
+	// Queue mode tabs
+	{ 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) },
+
+	// Escape clears filter only when one is set
+	{
+		id: "list.clear-filter",
+		title: "Clear filter",
+		keys: ["escape"],
+		enabled: (s) => s.hasFilter ? true : "No filter to clear.",
+		run: (s) => s.clearFilter(),
+	},
+
+	// Wide-layout detail preview scroll
+	{
+		id: "list.preview.top",
+		title: "Detail preview top",
+		keys: ["home"],
+		enabled: (s) => s.canScrollDetailPreview ? true : "Detail preview not visible.",
+		run: (s) => s.scrollDetailPreviewTo(0),
+	},
+	{
+		id: "list.preview.bottom",
+		title: "Detail preview bottom",
+		keys: ["end"],
+		enabled: (s) => s.canScrollDetailPreview ? true : "Detail preview not visible.",
+		run: (s) => s.scrollDetailPreviewTo(Number.MAX_SAFE_INTEGER),
+	},
+	{
+		id: "list.preview.half-up",
+		title: "Detail preview ½ up",
+		keys: ["pageup"],
+		enabled: (s) => s.canScrollDetailPreview ? true : "Detail preview not visible.",
+		run: (s) => s.scrollDetailPreviewBy(-s.halfPage),
+	},
+	{
+		id: "list.preview.half-down",
+		title: "Detail preview ½ down",
+		keys: ["pagedown"],
+		enabled: (s) => s.canScrollDetailPreview ? true : "Detail preview not visible.",
+		run: (s) => s.scrollDetailPreviewBy(s.halfPage),
+	},
+
+	// Group jumps
+	{
+		id: "list.group-prev",
+		title: "Previous group",
+		keys: ["[", "meta+up", "meta+k", "shift+k"],
+		run: (s) => s.moveSelectedToPreviousGroup(),
+	},
+	{
+		id: "list.group-next",
+		title: "Next group",
+		keys: ["]", "meta+down", "meta+j", "shift+j"],
+		run: (s) => s.moveSelectedToNextGroup(),
+	},
+
+	// Half-page steps
+	{ id: "list.half-up", title: "Half page up", keys: ["ctrl+u"], run: (s) => s.stepSelected(-s.halfPage) },
+	{ id: "list.half-down", title: "Half page down", keys: ["ctrl+d"], run: (s) => s.stepSelected(s.halfPage) },
+
+	// Vim count prefixes
+	...countedVerticalBindings<ListNavCtx>((s, delta) => {
+		if (delta < 0) s.stepSelectedUp(-delta)
+		else s.stepSelectedDown(delta)
+	}),
+
+	// Single-step (with wrap up, load-more on down)
+	{ id: "list.up", title: "Up", keys: ["up", "k"], run: (s) => s.stepSelectedUpWrap() },
+	{ id: "list.down", title: "Down", keys: ["down", "j"], run: (s) => s.stepSelectedDownWithLoadMore() },
+
+	// Top / bottom
+	{ id: "list.top", title: "Top", keys: ["g g"], run: (s) => s.setSelected(0) },
+	{
+		id: "list.bottom",
+		title: "Bottom",
+		keys: ["shift+g"],
+		run: (s) => s.setSelected(s.visibleCount === 0 ? 0 : s.visibleCount - 1),
+	},
+)

package/src/keymap/mergeModal.ts

@@ -0,0 +1,23 @@
+import { context } from "@ghui/keymap"
+
+export interface MergeModalCtx {
+	readonly availableActionCount: number
+	readonly closeModal: () => void
+	readonly confirmMerge: () => void
+	readonly moveSelection: (delta: -1 | 1) => void
+}
+
+const Merge = context<MergeModalCtx>()
+
+export const mergeModalKeymap = Merge(
+	{ id: "merge-modal.cancel", title: "Cancel", keys: ["escape"], run: (s) => s.closeModal() },
+	{
+		id: "merge-modal.confirm",
+		title: "Merge pull request",
+		keys: ["return"],
+		enabled: (s) => s.availableActionCount > 0 ? true : "No merge actions available.",
+		run: (s) => s.confirmMerge(),
+	},
+	{ id: "merge-modal.up", title: "Up", keys: ["k", "up"], run: (s) => s.moveSelection(-1) },
+	{ id: "merge-modal.down", title: "Down", keys: ["j", "down"], run: (s) => s.moveSelection(1) },
+)

package/src/keymap/openRepositoryModal.ts

@@ -0,0 +1,13 @@
+import { context } from "@ghui/keymap"
+
+export interface OpenRepositoryModalCtx {
+	readonly closeModal: () => void
+	readonly openFromInput: () => void
+}
+
+const OpenRepo = context<OpenRepositoryModalCtx>()
+
+export const openRepositoryModalKeymap = OpenRepo(
+	{ id: "open-repo.close", title: "Cancel", keys: ["escape"], run: (s) => s.closeModal() },
+	{ id: "open-repo.open", title: "Open repository", keys: ["return"], run: (s) => s.openFromInput() },
+)

package/src/keymap/themeModal.ts

@@ -0,0 +1,49 @@
+import { context } from "@ghui/keymap"
+
+export interface ThemeModalCtx {
+	readonly filterMode: boolean
+	readonly hasFilteredResults: boolean
+	readonly closeWithoutSaving: () => void
+	readonly clearFilter: () => void
+	readonly enterFilterMode: () => void
+	readonly confirmSelection: () => void
+	readonly moveSelection: (delta: -1 | 1) => void
+}
+
+const Theme = context<ThemeModalCtx>()
+
+export const themeModalKeymap = Theme(
+	{
+		id: "theme-modal.escape",
+		title: "Cancel",
+		keys: ["escape"],
+		run: (s) => {
+			if (s.filterMode) s.clearFilter()
+			else s.closeWithoutSaving()
+		},
+	},
+	{ id: "theme-modal.filter", title: "Filter themes", keys: ["/"], run: (s) => s.enterFilterMode() },
+	{
+		id: "theme-modal.confirm",
+		title: "Apply theme",
+		keys: ["return"],
+		enabled: (s) => s.filterMode && !s.hasFilteredResults ? "No matching themes." : true,
+		run: (s) => s.confirmSelection(),
+	},
+	{ id: "theme-modal.up-arrow", title: "Up", keys: ["up"], run: (s) => s.moveSelection(-1) },
+	{ id: "theme-modal.down-arrow", title: "Down", keys: ["down"], run: (s) => s.moveSelection(1) },
+	{
+		id: "theme-modal.up-letter",
+		title: "Up",
+		keys: ["k"],
+		when: (s) => !s.filterMode,
+		run: (s) => s.moveSelection(-1),
+	},
+	{
+		id: "theme-modal.down-letter",
+		title: "Down",
+		keys: ["j"],
+		when: (s) => !s.filterMode,
+		run: (s) => s.moveSelection(1),
+	},
+)

package/src/mergeActions.ts

@@ -1,4 +1,4 @@
-import type { PullRequestItem, PullRequestMergeAction, PullRequestMergeInfo } from "./domain.js"
+import type { PullRequestItem, PullRequestMergeAction, PullRequestMergeInfo, PullRequestState } from "./domain.js"
 
 export interface MergeActionDefinition {
 	readonly action: PullRequestMergeAction
@@ -8,6 +8,7 @@ export interface MergeActionDefinition {
 	readonly pastTense: string
 	readonly danger?: boolean
 	readonly refreshOnSuccess?: boolean
+	readonly optimisticState?: PullRequestState
 	readonly optimisticAutoMergeEnabled?: boolean
 	readonly isAvailable: (info: PullRequestMergeInfo) => boolean
 }
@@ -29,6 +30,7 @@ const mergeActionDefinitions = {
 		cliArgs: ["--squash", "--delete-branch"],
 		pastTense: "Merged",
 		refreshOnSuccess: true,
+		optimisticState: "merged",
 		isAvailable: isCleanlyMergeable,
 	},
 	auto: {
@@ -57,6 +59,7 @@ const mergeActionDefinitions = {
 		pastTense: "Admin merged",
 		danger: true,
 		refreshOnSuccess: true,
+		optimisticState: "merged",
 		isAvailable: (info) => info.state === "open" && !info.isDraft && info.mergeable !== "conflicting",
 	},
 } as const satisfies Record<PullRequestMergeAction, MergeActionDefinition>

package/src/services/GitHubService.ts

@@ -1,6 +1,6 @@
 import { Context, Effect, Layer, Schema } from "effect"
 import { config } from "../config.js"
-import { DiffCommentSide, pullRequestQueueSearchQualifier, type CheckItem, type CreatePullRequestCommentInput, type ListPullRequestPageInput, type Mergeable, type PullRequestItem, type PullRequestMergeAction, type PullRequestMergeInfo, type PullRequestPage, type PullRequestQueueMode, type PullRequestReviewComment, type ReviewStatus } from "../domain.js"
+import { DiffCommentSide, pullRequestQueueSearchQualifier, type CheckItem, type CreatePullRequestCommentInput, type ListPullRequestPageInput, type Mergeable, type PullRequestConversationItem, type PullRequestItem, type PullRequestMergeAction, type PullRequestMergeInfo, type PullRequestPage, type PullRequestQueueMode, type PullRequestReviewComment, type ReviewStatus } from "../domain.js"
 import { getMergeActionDefinition } from "../mergeActions.js"
 import { CommandError, CommandRunner, type JsonParseError } from "./CommandRunner.js"
 
@@ -429,18 +429,22 @@ const repositoryParts = (repository: string) => {
 	return owner && name ? { owner, name } : null
 }
 
+const rawCommentFields = (comment: RawPullRequestComment, fallbackId: string) => ({
+	id: String(comment.id ?? comment.node_id ?? fallbackId),
+	author: comment.user?.login ?? "unknown",
+	body: comment.body ?? "",
+	createdAt: comment.created_at ? new Date(comment.created_at) : null,
+	url: comment.html_url ?? comment.url ?? null,
+})
+
 const parsePullRequestComment = (comment: RawPullRequestComment): PullRequestReviewComment | null => {
 	const line = comment.line ?? comment.original_line
 	if (!comment.path || !line || (comment.side !== "LEFT" && comment.side !== "RIGHT")) return null
 	return {
-		id: String(comment.id ?? comment.node_id ?? `${comment.path}:${comment.side}:${line}:${comment.created_at ?? ""}:${comment.body ?? ""}`),
+		...rawCommentFields(comment, `${comment.path}:${comment.side}:${line}:${comment.created_at ?? ""}:${comment.body ?? ""}`),
 		path: comment.path,
 		line,
 		side: comment.side,
-		author: comment.user?.login ?? "unknown",
-		body: comment.body ?? "",
-		createdAt: comment.created_at ? new Date(comment.created_at) : null,
-		url: comment.html_url ?? comment.url ?? null,
 	}
 }
 
@@ -451,6 +455,24 @@ const parsePullRequestComments = (response: Schema.Schema.Type<typeof CommentsRe
 	})
 }
 
+const parseIssueComment = (comment: RawPullRequestComment): PullRequestConversationItem => ({
+	_tag: "comment",
+	...rawCommentFields(comment, `${comment.created_at ?? ""}:${comment.body ?? ""}`),
+})
+
+const reviewCommentConversationItem = (comment: PullRequestReviewComment): PullRequestConversationItem => ({
+	_tag: "review-comment",
+	...comment,
+})
+
+const conversationItemTime = (item: PullRequestConversationItem) => item.createdAt?.getTime() ?? Number.MAX_SAFE_INTEGER
+
+const sortConversationItems = (items: readonly PullRequestConversationItem[]) =>
+	[...items].sort((left, right) => conversationItemTime(left) - conversationItemTime(right) || left.id.localeCompare(right.id))
+
+const parseIssueComments = (response: Schema.Schema.Type<typeof CommentsResponseSchema>): readonly PullRequestConversationItem[] =>
+	flattenSlurpedPages(response).map(parseIssueComment)
+
 const flattenSlurpedPages = <Item>(response: readonly Item[] | readonly (readonly Item[])[]): readonly Item[] =>
 	Array.isArray(response[0]) ? (response as readonly (readonly Item[])[]).flat() : response as readonly Item[]
 
@@ -508,6 +530,7 @@ export class GitHubService extends Context.Service<GitHubService, {
 	readonly getAuthenticatedUser: () => Effect.Effect<string, GitHubError>
 	readonly getPullRequestDiff: (repository: string, number: number) => Effect.Effect<string, GitHubError>
 	readonly listPullRequestComments: (repository: string, number: number) => Effect.Effect<readonly PullRequestReviewComment[], GitHubError>
+	readonly listPullRequestConversation: (repository: string, number: number) => Effect.Effect<readonly PullRequestConversationItem[], GitHubError>
 	readonly getPullRequestMergeInfo: (repository: string, number: number) => Effect.Effect<PullRequestMergeInfo, GitHubError>
 	readonly mergePullRequest: (repository: string, number: number, action: PullRequestMergeAction) => Effect.Effect<void, CommandError>
 	readonly closePullRequest: (repository: string, number: number) => Effect.Effect<void, CommandError>
@@ -628,6 +651,17 @@ export class GitHubService extends Context.Service<GitHubService, {
 					"api", "--paginate", "--slurp", `repos/${repository}/pulls/${number}/comments`,
 				]).pipe(Effect.map(parsePullRequestComments))
 
+			const listPullRequestConversation = Effect.fn("GitHubService.listPullRequestConversation")(function*(repository: string, number: number) {
+				const [issueComments, reviewComments] = yield* Effect.all([
+					ghJson("listPullRequestIssueComments", CommentsResponseSchema, [
+						"api", "--paginate", "--slurp", `repos/${repository}/issues/${number}/comments`,
+					]).pipe(Effect.map(parseIssueComments)),
+					listPullRequestComments(repository, number).pipe(Effect.map((comments) => comments.map(reviewCommentConversationItem))),
+				], { concurrency: "unbounded" })
+
+				return sortConversationItems([...issueComments, ...reviewComments])
+			})
+
 			const getPullRequestMergeInfo = Effect.fn("GitHubService.getPullRequestMergeInfo")(function*(repository: string, number: number) {
 				const info = yield* command.runSchema(MergeInfoResponseSchema, "gh", [
 					"pr", "view", String(number), "--repo", repository,
@@ -663,6 +697,7 @@ export class GitHubService extends Context.Service<GitHubService, {
 					"-f", `path=${input.path}`,
 					"-F", `line=${input.line}`,
 					"-f", `side=${input.side}`,
+					...(input.startLine === undefined ? [] : ["-F", `start_line=${input.startLine}`, "-f", `start_side=${input.startSide ?? input.side}`]),
 				])
 				return parsePullRequestComment(response) ?? fallbackCreatedComment(input)
 			})
@@ -689,6 +724,7 @@ export class GitHubService extends Context.Service<GitHubService, {
 				getAuthenticatedUser,
 				getPullRequestDiff,
 				listPullRequestComments,
+				listPullRequestConversation,
 				getPullRequestMergeInfo,
 				mergePullRequest,
 				closePullRequest,

package/src/services/MockGitHubService.ts

@@ -1,5 +1,5 @@
 import { Effect, Layer } from "effect"
-import type { CheckItem, CreatePullRequestCommentInput, Mergeable, PullRequestItem, PullRequestLabel, PullRequestMergeInfo, PullRequestPage, PullRequestQueueMode, PullRequestReviewComment, ReviewStatus } from "../domain.js"
+import type { CheckItem, CreatePullRequestCommentInput, Mergeable, PullRequestConversationItem, PullRequestItem, PullRequestLabel, PullRequestMergeInfo, PullRequestPage, PullRequestQueueMode, PullRequestReviewComment, ReviewStatus } from "../domain.js"
 import { GitHubService } from "./GitHubService.js"
 
 export interface MockOptions {
@@ -87,6 +87,19 @@ const pageItems = (source: readonly PullRequestItem[], cursor: string | null, pa
 	}
 }
 
+const mockDiff = `diff --git a/src/mockDiff.ts b/src/mockDiff.ts
+--- a/src/mockDiff.ts
++++ b/src/mockDiff.ts
+@@ -1,6 +1,6 @@
+ export const before = true
+-const oldOne = 1
++const newOne = 1
+-  sameName()
++	sameName()
+-const oldTwo = 2
++const newTwo = 2
+ export const after = true`
+
 export const MockGitHubService = {
 	layer: (options: MockOptions) => {
 		const items = buildMockPullRequests(options)
@@ -101,6 +114,27 @@ export const MockGitHubService = {
 			detailLoaded: false,
 		} satisfies PullRequestItem))
 		const findPullRequest = (repository: string, number: number) => items.find((item) => item.repository === repository && item.number === number) ?? items[0]!
+		const conversationItems = (repository: string, number: number): readonly PullRequestConversationItem[] => [
+			{
+				_tag: "comment",
+				id: `mock-comment:${repository}:${number}:1`,
+				author: "mock-reviewer",
+				body: `Top-level discussion for #${number}. This should appear after the summary with its own separator.`,
+				createdAt: new Date(Date.now() - 3_600_000),
+				url: null,
+			},
+			{
+				_tag: "review-comment",
+				id: `mock-review:${repository}:${number}:1`,
+				author: "mock-reviewer",
+				body: "Inline review comment rendered in the same conversation stream.",
+				createdAt: new Date(Date.now() - 1_800_000),
+				url: null,
+				path: "src/App.tsx",
+				line: 42,
+				side: "RIGHT",
+			},
+		]
 
 		return Layer.succeed(
 			GitHubService,
@@ -110,8 +144,9 @@ export const MockGitHubService = {
 				listOpenPullRequestDetails: (mode: PullRequestQueueMode, repository: string | null) => Effect.succeed(filterByView(mode, repository, items)),
 				getPullRequestDetails: (repository, number) => Effect.succeed(findPullRequest(repository, number)),
 				getAuthenticatedUser: () => Effect.succeed(username),
-				getPullRequestDiff: (_repo, _number) => Effect.succeed(""),
+				getPullRequestDiff: (_repo, _number) => Effect.succeed(mockDiff),
 				listPullRequestComments: (_repo, _number) => Effect.succeed([] as readonly PullRequestReviewComment[]),
+				listPullRequestConversation: (repository, number) => Effect.succeed(conversationItems(repository, number)),
 				getPullRequestMergeInfo: (repository, number) => Effect.succeed({
 					repository,
 					number,

package/src/themeStore.ts

@@ -1,11 +1,13 @@
 import { mkdir } from "node:fs/promises"
 import { homedir } from "node:os"
 import { dirname, join } from "node:path"
-import { Effect } from "effect"
+import { Effect, Schema } from "effect"
 import { isThemeId, type ThemeId } from "./ui/colors.js"
+import { DiffWhitespaceMode } from "./ui/diff.js"
 
 interface StoredConfig {
 	readonly theme?: unknown
+	readonly diffWhitespaceMode?: unknown
 }
 
 const configDirectory = () => {
@@ -22,22 +24,37 @@ const parseConfig = (text: string): StoredConfig => {
 	return value && typeof value === "object" ? value : {}
 }
 
-export const loadStoredThemeId: Effect.Effect<ThemeId> = Effect.catchCause(Effect.tryPromise(async () => {
+const readStoredConfig = async () => {
 	const file = Bun.file(configPath())
-	if (!(await file.exists())) return "ghui" satisfies ThemeId
+	return await file.exists() ? parseConfig(await file.text()) : {}
+}
 
-	const config = parseConfig(await file.text())
+const writeStoredConfig = async (config: StoredConfig) => {
+	const path = configPath()
+	await mkdir(dirname(path), { recursive: true })
+	await Bun.write(path, `${JSON.stringify(config, null, "\t")}\n`)
+}
+
+export const loadStoredThemeId: Effect.Effect<ThemeId> = Effect.catchCause(Effect.tryPromise(async () => {
+	const config = await readStoredConfig()
 	return isThemeId(config.theme) ? config.theme : "ghui"
 }), () => Effect.succeed("ghui" satisfies ThemeId))
 
+export const loadStoredDiffWhitespaceMode: Effect.Effect<DiffWhitespaceMode> = Effect.catchCause(Effect.tryPromise(async () => {
+	const config = await readStoredConfig()
+	return Schema.is(DiffWhitespaceMode)(config.diffWhitespaceMode) ? config.diffWhitespaceMode : "ignore"
+}), () => Effect.succeed("ignore" satisfies DiffWhitespaceMode))
+
 export const saveStoredThemeId = (theme: ThemeId): Effect.Effect<void> => Effect.tryPromise(async () => {
-	const path = configPath()
-	const file = Bun.file(path)
-	const config = await file.exists()
-		? parseConfig(await file.text())
-		: {}
+	const config = await readStoredConfig()
 	if (config.theme === theme) return
 
-	await mkdir(dirname(path), { recursive: true })
-	await Bun.write(path, `${JSON.stringify({ ...config, theme }, null, "\t")}\n`)
+	await writeStoredConfig({ ...config, theme })
+})
+
+export const saveStoredDiffWhitespaceMode = (diffWhitespaceMode: DiffWhitespaceMode): Effect.Effect<void> => Effect.tryPromise(async () => {
+	const config = await readStoredConfig()
+	if (config.diffWhitespaceMode === diffWhitespaceMode) return
+
+	await writeStoredConfig({ ...config, diffWhitespaceMode })
 })