diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8054c4a8a..3e92a9d6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,8 @@ Docs: https://docs.clawd.bot
 - **BREAKING:** `clawdbot plugins install <path>` now copies into `~/.clawdbot/extensions` (use `--link` to keep path-based loading).
 
 ### Changes
-- Plugins: ship bundled plugins disabled by default, allow overrides by installed versions, and add bundled Antigravity + Gemini CLI OAuth + Copilot Proxy provider plugins. (#1066) — thanks @ItzR3NO.
+- Plugins: ship bundled plugins disabled by default and allow overrides by installed versions. (#1066) — thanks @ItzR3NO.
+- Plugins: add bundled Antigravity + Gemini CLI OAuth + Copilot Proxy provider plugins. (#1066) — thanks @ItzR3NO.
 - Tools: improve `web_fetch` extraction using Readability (with fallback).
 - Tools: add Firecrawl fallback for `web_fetch` when configured.
 - Tools: send Chrome-like headers by default for `web_fetch` to improve extraction on bot-sensitive sites.
diff --git a/src/commands/onboard-non-interactive/local/auth-choice.ts b/src/commands/onboard-non-interactive/local/auth-choice.ts
index bfc51ea80..15151d690 100644
--- a/src/commands/onboard-non-interactive/local/auth-choice.ts
+++ b/src/commands/onboard-non-interactive/local/auth-choice.ts
@@ -331,11 +331,7 @@ export async function applyNonInteractiveAuthChoice(params: {
     return applyOpencodeZenConfig(nextConfig);
   }
 
-  if (
-    authChoice === "oauth" ||
-    authChoice === "chutes" ||
-    authChoice === "openai-codex"
-  ) {
+  if (authChoice === "oauth" || authChoice === "chutes" || authChoice === "openai-codex") {
     runtime.error("OAuth requires interactive mode.");
     runtime.exit(1);
     return null;
diff --git a/src/infra/outbound/target-resolver.ts b/src/infra/outbound/target-resolver.ts
index 80688325d..6b6f3f8f9 100644
--- a/src/infra/outbound/target-resolver.ts
+++ b/src/infra/outbound/target-resolver.ts
@@ -86,11 +86,7 @@ export function formatTargetDisplay(params: {
   const display = params.display?.trim();
   const kind =
     params.kind ??
-    (lowered.startsWith("user:")
-      ? "user"
-      : lowered.startsWith("channel:")
-        ? "group"
-        : undefined);
+    (lowered.startsWith("user:") ? "user" : lowered.startsWith("channel:") ? "group" : undefined);
 
   if (display) {
     if (display.startsWith("#") || display.startsWith("@")) return display;
diff --git a/src/media-understanding/runner.ts b/src/media-understanding/runner.ts
index 90e5cc597..89720b796 100644
--- a/src/media-understanding/runner.ts
+++ b/src/media-understanding/runner.ts
@@ -98,14 +98,6 @@ function buildDeepgramCompatQuery(options?: {
   return Object.keys(query).length > 0 ? query : undefined;
 }
 
-function mergeProviderQuery(
-  base: ProviderQuery | undefined,
-  incoming: ProviderQuery | undefined,
-): ProviderQuery | undefined {
-  if (!base && !incoming) return undefined;
-  return { ...(base ?? {}), ...(incoming ?? {}) };
-}
-
 function normalizeDeepgramQueryKeys(query: ProviderQuery): ProviderQuery {
   const normalized = { ...query };
   if ("detectLanguage" in normalized) {
@@ -126,8 +118,8 @@ function resolveProviderQuery(params: {
 }): ProviderQuery | undefined {
   const { providerId, config, entry } = params;
   const mergedOptions = normalizeProviderQuery({
-    ...(config?.providerOptions?.[providerId] ?? {}),
-    ...(entry.providerOptions?.[providerId] ?? {}),
+    ...config?.providerOptions?.[providerId],
+    ...entry.providerOptions?.[providerId],
   });
   if (providerId !== "deepgram") {
     return mergedOptions;
diff --git a/src/plugins/loader.test.ts b/src/plugins/loader.test.ts
index 0c474e676..21f26d595 100644
--- a/src/plugins/loader.test.ts
+++ b/src/plugins/loader.test.ts
@@ -239,11 +239,7 @@ describe("loadClawdbotPlugins", () => {
 
   it("prefers higher-precedence plugins with the same id", () => {
     const bundledDir = makeTempDir();
-    fs.writeFileSync(
-      path.join(bundledDir, "shadow.js"),
-      "export default function () {}",
-      "utf-8",
-    );
+    fs.writeFileSync(path.join(bundledDir, "shadow.js"), "export default function () {}", "utf-8");
     process.env.CLAWDBOT_BUNDLED_PLUGINS_DIR = bundledDir;
 
     const override = writePlugin({