From 43e17c1e7c16967d4f65bda5ee36f895fe369ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E4=B8=9C=E8=BE=89?= <aibaiiqpl@gmail.com>
Date: Mon, 15 Jun 2026 00:06:52 +0800
Subject: [PATCH] fix: pass appBaseUrl to generateLocalPairingOffer in daemon
 pair RPC (#1187)

Threads the configured app.baseUrl through daemonRuntimeConfig to generateLocalPairingOffer in the daemon pair RPC path, so `paseo daemon pair` honors a custom app.baseUrl when the daemon is already running.

Fixes #1494
Fixes #1186
---
 packages/server/src/server/bootstrap.ts        | 1 +
 packages/server/src/server/session.ts          | 2 ++
 packages/server/src/server/websocket-server.ts | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 4673e3e32..985863bf5 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -1124,6 +1124,7 @@ export async function createPaseoDaemon(
               {
                 listen: formatListenTarget(boundListenTarget ?? listenTarget),
                 worktreesRoot: config.worktreesRoot,
+                appBaseUrl: config.appBaseUrl,
                 relay: {
                   enabled: relayEnabled,
                   endpoint: relayEndpoint,
diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts
index c4a26420b..340412931 100644
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -624,6 +624,7 @@ export interface SessionOptions {
   daemonVersion?: string;
   daemonRuntimeConfig?: {
     listen: string | null;
+    appBaseUrl?: string;
     relay: {
       enabled: boolean;
       endpoint: string;
@@ -3872,6 +3873,7 @@ export class Session {
         relayPublicEndpoint: relay?.publicEndpoint,
         relayUseTls: relay?.useTls,
         relayPublicUseTls: relay?.publicUseTls,
+        appBaseUrl: this.daemonRuntimeConfig?.appBaseUrl,
         includeQr: true,
         logger: this.sessionLogger,
       });
diff --git a/packages/server/src/server/websocket-server.ts b/packages/server/src/server/websocket-server.ts
index 81285e646..4af704a0d 100644
--- a/packages/server/src/server/websocket-server.ts
+++ b/packages/server/src/server/websocket-server.ts
@@ -352,6 +352,7 @@ export class VoiceAssistantWebSocketServer {
   private readonly daemonRuntimeConfig:
     | {
         listen: string | null;
+        appBaseUrl?: string;
         relay: {
           enabled: boolean;
           endpoint: string;
@@ -447,6 +448,7 @@ export class VoiceAssistantWebSocketServer {
     daemonRuntimeConfig?: {
       listen: string | null;
       worktreesRoot?: string;
+      appBaseUrl?: string;
       relay: {
         enabled: boolean;
         endpoint: string;