Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions lib/codex-manager/settings-hub-entry.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import type { MenuItem, SelectOptions } from "../ui/select.js";
import type { SettingsHubActionType } from "./unified-settings-controller.js";

export async function promptSettingsHubEntry<
TAction extends { type: SettingsHubActionType },
>(params: {
initialFocus: TAction["type"];
promptSettingsHubMenu: (
initialFocus: TAction["type"],
deps: {
isInteractive: () => boolean;
getUiRuntimeOptions: () => ReturnType<
typeof import("../ui/runtime.js").getUiRuntimeOptions
>;
buildItems: () => MenuItem<TAction>[];
findInitialCursor: (
items: MenuItem<TAction>[],
initialFocus: TAction["type"],
) => number | undefined;
select: <T>(
items: MenuItem<T>[],
options: SelectOptions<T>,
) => Promise<T | null>;
copy: {
title: string;
subtitle: string;
help: string;
};
},
) => Promise<TAction | null>;
isInteractive: () => boolean;
getUiRuntimeOptions: () => ReturnType<
typeof import("../ui/runtime.js").getUiRuntimeOptions
>;
buildItems: () => MenuItem<TAction>[];
findInitialCursor: (
items: MenuItem<TAction>[],
initialFocus: TAction["type"],
) => number | undefined;
select: <T>(
items: MenuItem<T>[],
options: SelectOptions<T>,
) => Promise<T | null>;
copy: {
title: string;
subtitle: string;
help: string;
};
}): Promise<TAction | null> {
return params.promptSettingsHubMenu(params.initialFocus, {
isInteractive: params.isInteractive,
getUiRuntimeOptions: params.getUiRuntimeOptions,
buildItems: params.buildItems,
findInitialCursor: params.findInitialCursor,
select: params.select,
copy: params.copy,
});
}
5 changes: 4 additions & 1 deletion lib/codex-manager/settings-hub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import {
} from "./experimental-settings-schema.js";
import { loadExperimentalSyncTargetState } from "./experimental-sync-target.js";
import { loadExperimentalSyncTargetEntry } from "./experimental-sync-target-entry.js";
import { promptSettingsHubEntry } from "./settings-hub-entry.js";
import {
buildSettingsHubItems,
findSettingsHubInitialCursor,
Expand Down Expand Up @@ -758,7 +759,9 @@ async function configureBackendSettings(
async function promptSettingsHub(
initialFocus: SettingsHubAction["type"] = "account-list",
): Promise<SettingsHubAction | null> {
return promptSettingsHubMenu(initialFocus, {
return promptSettingsHubEntry({
initialFocus,
promptSettingsHubMenu,
isInteractive: () => input.isTTY && output.isTTY,
getUiRuntimeOptions,
buildItems: () => buildSettingsHubItems(UI_COPY.settings),
Expand Down
56 changes: 56 additions & 0 deletions test/settings-hub-entry.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { describe, expect, it, vi } from "vitest";
import { promptSettingsHubEntry } from "../lib/codex-manager/settings-hub-entry.js";

describe("settings hub entry", () => {
it("passes focus and dependencies through to the settings hub prompt helper", async () => {
const promptSettingsHubMenu = vi.fn(async () => ({
type: "back" as const,
}));
const buildItems = vi.fn(() => []);
const findInitialCursor = vi.fn(() => 0);
const select = vi.fn();

const result = await promptSettingsHubEntry({
initialFocus: "account-list",
promptSettingsHubMenu,
isInteractive: () => true,
getUiRuntimeOptions: vi.fn(() => ({ theme: {} }) as never),
buildItems,
findInitialCursor,
select,
copy: { title: "Settings", subtitle: "Subtitle", help: "Help" },
});

expect(promptSettingsHubMenu).toHaveBeenCalledWith(
"account-list",
expect.objectContaining({
isInteractive: expect.any(Function),
getUiRuntimeOptions: expect.any(Function),
buildItems,
findInitialCursor,
select,
copy: { title: "Settings", subtitle: "Subtitle", help: "Help" },
}),
);
expect(result).toEqual({ type: "back" });
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.

it("passes through null when the settings hub prompt is cancelled", async () => {
const promptSettingsHubMenu = vi.fn(async () => null);
const select = vi.fn();

const result = await promptSettingsHubEntry({
initialFocus: "account-list",
promptSettingsHubMenu,
isInteractive: () => true,
getUiRuntimeOptions: vi.fn(() => ({ theme: {} }) as never),
buildItems: vi.fn(() => []),
findInitialCursor: vi.fn(() => 0),
select,
copy: { title: "Settings", subtitle: "Subtitle", help: "Help" },
});

expect(promptSettingsHubMenu).toHaveBeenCalledOnce();
expect(result).toBeNull();
});
});