Skip to content

Commit 3a1c56e

Browse files
committed
Merge PR #274: refactor: extract experimental sync target wrapper
# Conflicts: # lib/codex-manager/experimental-sync-target-entry.ts # test/experimental-sync-target-entry.test.ts
2 parents ee9135e + c328fc7 commit 3a1c56e

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

lib/codex-manager/experimental-sync-target-entry.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export async function loadExperimentalSyncTargetEntry(params: {
5252
"EBUSY",
5353
"EPERM",
5454
"EAGAIN",
55+
"ENOTEMPTY",
5556
"EACCES",
5657
]),
5758
maxAttempts: 4,

lib/codex-manager/settings-hub.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ import {
9999
normalizeStatuslineFields,
100100
} from "./settings-preview.js";
101101
import { withQueuedRetry } from "./settings-write-queue.js";
102-
import { reorderStatuslineField } from "./statusline-order.js";
103-
104-
const reorderField = reorderStatuslineField;
105102

106103
import { promptStatuslineSettingsPanel } from "./statusline-settings-panel.js";
107104
import { promptThemeSettingsPanel } from "./theme-settings-panel.js";
@@ -464,7 +461,8 @@ async function promptDashboardDisplaySettings(
464461
buildAccountListPreview,
465462
formatDashboardSettingState,
466463
formatMenuSortMode,
467-
resolveMenuLayoutMode,
464+
resolveMenuLayoutMode: (settings = DEFAULT_DASHBOARD_DISPLAY_SETTINGS) =>
465+
resolveMenuLayoutMode(settings),
468466
formatMenuLayoutMode,
469467
applyDashboardDefaultsForKeys,
470468
DASHBOARD_DISPLAY_OPTIONS,

test/experimental-sync-target-entry.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe("experimental sync target entry", () => {
6767

6868
expect(capturedReadJson).toBeDefined();
6969
expect(readFileWithRetry).toHaveBeenCalledWith("C:\\state.json", {
70-
retryableCodes: new Set(["EBUSY", "EPERM", "EAGAIN", "EACCES"]),
70+
retryableCodes: new Set(["EBUSY", "EPERM", "EAGAIN", "ENOTEMPTY", "EACCES"]),
7171
maxAttempts: 4,
7272
sleep,
7373
});

0 commit comments

Comments
 (0)