From fd4d36f892f471f53cdd4df238cd81301b673ede Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Mon, 31 Aug 2026 06:14:40 -0700
Subject: [PATCH] refactor(serve): reuse validated option snapshot

---
 src/cli/handlers/core.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/cli/handlers/core.ts b/src/cli/handlers/core.ts
index d44873f47fd..d4979ff2ae9 100644
--- a/src/cli/handlers/core.ts
+++ b/src/cli/handlers/core.ts
@@ -95,26 +95,27 @@ export const CORE_HANDLERS: Record<string, CommandHandler> = {
   serve: async ({ flags, json }) => {
     const projectRootValue = flags.get('project-root')
     const projectRoot = typeof projectRootValue === 'string' ? projectRootValue : null
+    const noPairing = flags.get('no-pairing') === true
+    const mobilePairing = flags.get('mobile-pairing') === true
+    const recipeJson = flags.get('recipe-json') === true
     const validationError = getServeOptionValidationError({
-      noPairing: flags.get('no-pairing') === true,
-      mobilePairing: flags.get('mobile-pairing') === true,
-      recipeJson: flags.get('recipe-json') === true,
+      noPairing,
+      mobilePairing,
+      recipeJson,
       projectRoot
     })
     if (validationError) {
       throw new RuntimeClientError('invalid_argument', validationError)
     }
     const port = getOptionalServePort(flags)
+    const pairingAddressValue = flags.get('pairing-address')
     const exitCode = await serveOrcaApp({
       json,
       port,
-      pairingAddress:
-        typeof flags.get('pairing-address') === 'string'
-          ? (flags.get('pairing-address') as string)
-          : null,
-      noPairing: flags.get('no-pairing') === true,
-      mobilePairing: flags.get('mobile-pairing') === true,
-      recipeJson: flags.get('recipe-json') === true,
+      pairingAddress: typeof pairingAddressValue === 'string' ? pairingAddressValue : null,
+      noPairing,
+      mobilePairing,
+      recipeJson,
       projectRoot
     })
     process.exitCode = exitCode