diff --git a/src/cli/pairing-cli.ts b/src/cli/pairing-cli.ts
index 044cf12ca..d671dc76c 100644
--- a/src/cli/pairing-cli.ts
+++ b/src/cli/pairing-cli.ts
@@ -3,12 +3,12 @@ import type { Command } from "commander";
 import { loadConfig } from "../config/config.js";
 import { sendMessageDiscord } from "../discord/send.js";
 import { sendMessageIMessage } from "../imessage/send.js";
+import { PROVIDER_ID_LABELS } from "../pairing/pairing-labels.js";
 import {
   approveProviderPairingCode,
   listProviderPairingRequests,
   type PairingProvider,
 } from "../pairing/pairing-store.js";
-import { PROVIDER_ID_LABELS } from "../pairing/pairing-labels.js";
 import { sendMessageSignal } from "../signal/send.js";
 import { sendMessageSlack } from "../slack/send.js";
 import { sendMessageTelegram } from "../telegram/send.js";
diff --git a/src/discord/monitor.ts b/src/discord/monitor.ts
index 06f737b1c..224c63a70 100644
--- a/src/discord/monitor.ts
+++ b/src/discord/monitor.ts
@@ -49,11 +49,11 @@ import { enqueueSystemEvent } from "../infra/system-events.js";
 import { getChildLogger } from "../logging.js";
 import { detectMime } from "../media/mime.js";
 import { saveMediaBuffer } from "../media/store.js";
+import { buildPairingReply } from "../pairing/pairing-messages.js";
 import {
   readProviderAllowFromStore,
   upsertProviderPairingRequest,
 } from "../pairing/pairing-store.js";
-import { buildPairingReply } from "../pairing/pairing-messages.js";
 import {
   buildAgentSessionKey,
   resolveAgentRoute,
diff --git a/src/imessage/monitor.ts b/src/imessage/monitor.ts
index a2dbbfad9..b8c0aef4a 100644
--- a/src/imessage/monitor.ts
+++ b/src/imessage/monitor.ts
@@ -17,11 +17,11 @@ import {
 import { resolveStorePath, updateLastRoute } from "../config/sessions.js";
 import { danger, logVerbose, shouldLogVerbose } from "../globals.js";
 import { mediaKindFromMime } from "../media/constants.js";
+import { buildPairingReply } from "../pairing/pairing-messages.js";
 import {
   readProviderAllowFromStore,
   upsertProviderPairingRequest,
 } from "../pairing/pairing-store.js";
-import { buildPairingReply } from "../pairing/pairing-messages.js";
 import { resolveAgentRoute } from "../routing/resolve-route.js";
 import type { RuntimeEnv } from "../runtime.js";
 import { resolveIMessageAccount } from "./accounts.js";
diff --git a/src/signal/monitor.ts b/src/signal/monitor.ts
index dc843d161..19f308e8b 100644
--- a/src/signal/monitor.ts
+++ b/src/signal/monitor.ts
@@ -9,6 +9,7 @@ import { resolveStorePath, updateLastRoute } from "../config/sessions.js";
 import { danger, logVerbose, shouldLogVerbose } from "../globals.js";
 import { mediaKindFromMime } from "../media/constants.js";
 import { saveMediaBuffer } from "../media/store.js";
+import { buildPairingReply } from "../pairing/pairing-messages.js";
 import {
   readProviderAllowFromStore,
   upsertProviderPairingRequest,
@@ -20,15 +21,14 @@ import { resolveSignalAccount } from "./accounts.js";
 import { signalCheck, signalRpcRequest } from "./client.js";
 import { spawnSignalDaemon } from "./daemon.js";
 import {
+  formatSignalPairingIdLine,
   formatSignalSenderDisplay,
   formatSignalSenderId,
-  formatSignalPairingIdLine,
   isSignalSenderAllowed,
   resolveSignalPeerId,
   resolveSignalRecipient,
   resolveSignalSender,
 } from "./identity.js";
-import { buildPairingReply } from "../pairing/pairing-messages.js";
 import { sendMessageSignal } from "./send.js";
 import { runSignalSseLoop } from "./sse-reconnect.js";
 
diff --git a/src/slack/monitor.ts b/src/slack/monitor.ts
index c8be2a293..352370d3e 100644
--- a/src/slack/monitor.ts
+++ b/src/slack/monitor.ts
@@ -43,11 +43,11 @@ import { enqueueSystemEvent } from "../infra/system-events.js";
 import { getChildLogger } from "../logging.js";
 import { detectMime } from "../media/mime.js";
 import { saveMediaBuffer } from "../media/store.js";
+import { buildPairingReply } from "../pairing/pairing-messages.js";
 import {
   readProviderAllowFromStore,
   upsertProviderPairingRequest,
 } from "../pairing/pairing-store.js";
-import { buildPairingReply } from "../pairing/pairing-messages.js";
 import { resolveAgentRoute } from "../routing/resolve-route.js";
 import { resolveThreadSessionKeys } from "../routing/session-key.js";
 import type { RuntimeEnv } from "../runtime.js";
diff --git a/src/web/inbound.ts b/src/web/inbound.ts
index 804b6b285..ccfee4f06 100644
--- a/src/web/inbound.ts
+++ b/src/web/inbound.ts
@@ -17,11 +17,11 @@ import { logVerbose, shouldLogVerbose } from "../globals.js";
 import { recordProviderActivity } from "../infra/provider-activity.js";
 import { createSubsystemLogger, getChildLogger } from "../logging.js";
 import { saveMediaBuffer } from "../media/store.js";
+import { buildPairingReply } from "../pairing/pairing-messages.js";
 import {
   readProviderAllowFromStore,
   upsertProviderPairingRequest,
 } from "../pairing/pairing-store.js";
-import { buildPairingReply } from "../pairing/pairing-messages.js";
 import {
   formatLocationText,
   type NormalizedLocation,