diff --git a/packages/coding-agent/src/config/settings.ts b/packages/coding-agent/src/config/settings.ts
index 09d4425b5..5a8ec994b 100644
--- a/packages/coding-agent/src/config/settings.ts
+++ b/packages/coding-agent/src/config/settings.ts
@@ -30,6 +30,7 @@ import {
 	setWorktreesDir,
 	toError,
 } from "@oh-my-pi/pi-utils";
+import { withFileLock } from "@oh-my-pi/pi-utils/file-lock";
 import { JSONC, YAML } from "bun";
 import { invalidate as invalidateCapabilityFsCache } from "../capability/fs";
 import { type Settings as SettingsCapabilityItem, settingsCapability } from "../capability/settings";
@@ -41,7 +42,6 @@ import { AUTO_IMAGE_PROVIDER_ORDER, isImageProviderId } from "../tools/image-pro
 import { type EditMode, normalizeEditMode } from "../utils/edit-mode";
 import { INSPECT_IMAGE_MODES } from "../utils/inspect-image-mode";
 import { isSearchProviderId, SEARCH_PROVIDER_ORDER } from "../web/search/types";
-import { withFileLock } from "@oh-my-pi/pi-utils/file-lock";
 import {
 	type BashInterceptorRule,
 	type GroupPrefix,
diff --git a/packages/coding-agent/src/mcp/config-writer.ts b/packages/coding-agent/src/mcp/config-writer.ts
index a7a95015c..990f89a6c 100644
--- a/packages/coding-agent/src/mcp/config-writer.ts
+++ b/packages/coding-agent/src/mcp/config-writer.ts
@@ -7,8 +7,8 @@ import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { isEnoent } from "@oh-my-pi/pi-utils";
-import { invalidate as invalidateFsCache } from "../capability/fs";
 import { withFileLock } from "@oh-my-pi/pi-utils/file-lock";
+import { invalidate as invalidateFsCache } from "../capability/fs";
 
 import { validateServerConfig } from "./config";
 import { MCP_CONFIG_SCHEMA_URL, type MCPConfigFile, type MCPServerConfig } from "./types";
diff --git a/packages/coding-agent/test/settings-manager.test.ts b/packages/coding-agent/test/settings-manager.test.ts
index 884e8a9ce..c9f6dfd83 100644
--- a/packages/coding-agent/test/settings-manager.test.ts
+++ b/packages/coding-agent/test/settings-manager.test.ts
@@ -19,8 +19,8 @@ import { AgentStorage } from "@oh-my-pi/pi-coding-agent/session/agent-storage";
 import { AUTO_IMAGE_PROVIDER_ORDER } from "@oh-my-pi/pi-coding-agent/tools/image-providers";
 import { SEARCH_PROVIDER_ORDER } from "@oh-my-pi/pi-coding-agent/web/search/types";
 import { getProjectAgentDir, TempDir } from "@oh-my-pi/pi-utils";
-import { YAML } from "bun";
 import * as fileLock from "@oh-my-pi/pi-utils/file-lock";
+import { YAML } from "bun";
 import { beginSettingsTest, restoreSettingsTestState, type SettingsTestState } from "./helpers/settings-test-state";
 
 function context(): Context {
diff --git a/packages/stats/test/sync-serial.test.ts b/packages/stats/test/sync-serial.test.ts
index 7b0b7e87c..20a1a3f60 100644
--- a/packages/stats/test/sync-serial.test.ts
+++ b/packages/stats/test/sync-serial.test.ts
@@ -134,10 +134,7 @@ describe("stats sync serial mode", () => {
 		const lockPath = `${dbPath}.sync.lock`;
 		const infoPath = path.join(lockPath, "info");
 		await fs.mkdir(lockPath, { recursive: true });
-		await Bun.write(
-			infoPath,
-			JSON.stringify({ pid: process.pid, timestamp: Date.now(), token: "live-owner" }),
-		);
+		await Bun.write(infoPath, JSON.stringify({ pid: process.pid, timestamp: Date.now(), token: "live-owner" }));
 		const retryScheduled = Promise.withResolvers<void>();
 		const resumeRetry = Promise.withResolvers<void>();
 		let lockReleased = false;