@livedesk/client 0.1.172 → 0.1.173

package/bin/livedesk-client.js

@@ -2888,15 +2888,18 @@ async function startConnectionChoiceServer(supabase, options = {}) {
 
 async function chooseClientConnection(supabase, options = {}) {
     if (isTruthy(process.env.LIVEDESK_UNIFIED_RUNTIME)) {
-        const connectionPage = createClientRuntimeServer({
-            host: process.env.LIVEDESK_CLIENT_RUNTIME_HOST || '127.0.0.1',
-            port: options.authPort || DEFAULT_AUTH_CALLBACK_PORT,
-            webDist: process.env.LIVEDESK_WEB_DIST || '',
+        const connectionPage = createClientRuntimeServer({
+            host: process.env.LIVEDESK_CLIENT_RUNTIME_HOST || '127.0.0.1',
+            port: options.authPort || DEFAULT_AUTH_CALLBACK_PORT,
+            webDist: process.env.LIVEDESK_WEB_DIST || '',
             appVersion: process.env.LIVEDESK_NPM_LAUNCHER_VERSION || readPackageVersion(),
-            deviceId: options.deviceId,
-            engine: options.engine,
+            deviceId: options.deviceId,
+            engine: options.engine,
             savedSession: options.savedSession,
+            initialChoice: options.initialChoice,
+            initialChoiceMessage: options.initialChoiceMessage,
             beginGoogleSignIn: async redirectTo => {
+                if (!supabase?.auth) throw new Error('supabase-session-required');
                 const { data, error } = await supabase.auth.signInWithOAuth({
                     provider: 'google',
                     options: {
@@ -2910,15 +2913,22 @@ async function chooseClientConnection(supabase, options = {}) {
                 return { url: data.url };
             },
             exchangeGoogleCode: async code => {
+                if (!supabase?.auth) throw new Error('supabase-session-required');
                 const { data, error } = await supabase.auth.exchangeCodeForSession(code);
                 if (error) throw error;
                 if (!data?.session) throw new Error('google-session-missing');
                 if (!writeSavedSessionToFile(data.session)) throw new Error('refresh-token-required');
                 return data.session;
             },
-            resolvePin: pin => resolveManagerFromPin(supabase, pin),
-            changeRole: async (role, snapshot) => {
-                const session = await refreshSessionIfNeeded(supabase);
+            resolvePin: pin => {
+                if (!supabase) throw new Error('supabase-session-required');
+                return resolveManagerFromPin(supabase, pin);
+            },
+            changeRole: async (role, snapshot) => {
+                if (!supabase) {
+                    return { ok: false, error: 'supabase-session-required' };
+                }
+                const session = await refreshSessionIfNeeded(supabase);
                 if (!session?.access_token) {
                     return { ok: false, error: 'supabase-session-required' };
                 }
@@ -3255,7 +3265,7 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null) {
     let connectionPage = null;
     let discoverySource = '';
 
-    if (shouldLogin) {
+    if (shouldLogin) {
         const supabase = await createSupabaseClient();
         const startupArgs = buildStartupClientArgs(parsed);
         let savedSession = null;
@@ -3362,10 +3372,38 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null) {
                 message: `Connected to LiveDesk Hub at ${manager}.`
             });
         }
-        console.log(`Found LiveDesk Hub at ${manager}.`);
-    }
-
-    const slot = normalizeSlotNumber(parsed.slot);
+        console.log(`Found LiveDesk Hub at ${manager}.`);
+    }
+    // Exact-package updates preserve the already paired Hub endpoint and pass
+    // --no-login so the replacement cannot block on browser auth. The unified
+    // launcher must still own its local runtime/status API; the package
+    // supervisor uses that API to prove the new launcher and Agent are stable
+    // before it commits the update.
+    if (!shouldLogin
+        && !existingConnectionPage
+        && isTruthy(process.env.LIVEDESK_UNIFIED_RUNTIME)
+        && manager
+        && pair) {
+        const preservedSession = readSavedSessionFromFile();
+        const explicitConnection = await chooseClientConnection(null, {
+            authPort: parsed.authPort,
+            deviceId: parsed.deviceId,
+            engine: parsed.engine,
+            savedSession: preservedSession,
+            openBrowser: false,
+            initialChoice: {
+                type: 'explicit',
+                manager,
+                pair,
+                endpointCandidates: [manager],
+                ...(preservedSession?.access_token ? { session: preservedSession } : {})
+            },
+            initialChoiceMessage: `Using the existing LiveDesk Hub pairing at ${manager}.`
+        });
+        connectionPage = explicitConnection.connectionPage || null;
+    }
+
+    const slot = normalizeSlotNumber(parsed.slot);
     if (manager) {
         forwarded = upsertForwardedOption(forwarded, '--manager', manager);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.172",
+  "version": "0.1.173",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -39,10 +39,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.378",
-    "@livedesk/fast-osx-arm64": "0.1.378",
-    "@livedesk/fast-osx-x64": "0.1.378",
-    "@livedesk/fast-win-x64": "0.1.378"
+    "@livedesk/fast-linux-x64": "0.1.379",
+    "@livedesk/fast-osx-arm64": "0.1.379",
+    "@livedesk/fast-osx-x64": "0.1.379",
+    "@livedesk/fast-win-x64": "0.1.379"
   },
   "publishConfig": {
     "access": "public"

package/src/runtime/client-runtime-server.js

@@ -514,9 +514,16 @@ function sendText(res, status, body, type = 'text/plain; charset=utf-8') {
   res.end(body);
 }
 
-export function createClientRuntimeServer(options = {}) {
-  const host = normalizeString(options.host, 80) || DEFAULT_HOST;
+export function createClientRuntimeServer(options = {}) {
+  const host = normalizeString(options.host, 80) || DEFAULT_HOST;
   const port = normalizePort(options.port, DEFAULT_PORT);
+  const initialChoice = options.initialChoice && typeof options.initialChoice === 'object'
+    ? options.initialChoice
+    : null;
+  const initialChoiceMessage = normalizeString(
+    options.initialChoiceMessage,
+    1000
+  ) || 'Existing LiveDesk credentials accepted. Starting the Client.';
   const trustedWebOrigins = createTrustedWebOrigins(port);
   const webDist = resolve(String(options.webDist || process.env.LIVEDESK_WEB_DIST || '').trim() || join(process.cwd(), 'apps', 'web', 'dist'));
   const deviceId = normalizeString(options.deviceId || process.env.LIVEDESK_DEVICE_ID, 160);
@@ -1030,23 +1037,29 @@ export function createClientRuntimeServer(options = {}) {
         else res.end();
       });
     });
-    server.once('error', rejectStart);
-    server.listen(port, host, () => {
-      runtime.emit('runtime.http.started', { host, port });
-      const saved = normalizeRuntimeAuthSession(options.savedSession, { requireRefreshToken: true });
-      if (saved.ok) {
+    server.once('error', rejectStart);
+    server.listen(port, host, () => {
+      runtime.emit('runtime.http.started', { host, port });
+      if (initialChoice) {
         setImmediate(() => {
-          try {
-            if (!writeSavedSession(saved.session)) throw new Error('refresh-token-required');
-            state.auth.persisted = true;
-            complete({ type: 'google', session: saved.session }, 'Saved sign-in found. Finding the LiveDesk Hub.');
-          } catch (error) {
-            recordAuthAttempt('rejected', `session-persistence-failed:${normalizeString(error?.message || error, 160)}`);
-          }
+          complete(initialChoice, initialChoiceMessage);
         });
+      } else {
+        const saved = normalizeRuntimeAuthSession(options.savedSession, { requireRefreshToken: true });
+        if (saved.ok) {
+          setImmediate(() => {
+            try {
+              if (!writeSavedSession(saved.session)) throw new Error('refresh-token-required');
+              state.auth.persisted = true;
+              complete({ type: 'google', session: saved.session }, 'Saved sign-in found. Finding the LiveDesk Hub.');
+            } catch (error) {
+              recordAuthAttempt('rejected', `session-persistence-failed:${normalizeString(error?.message || error, 160)}`);
+            }
+          });
+        }
       }
-      resolveStart();
-    });
+      resolveStart();
+    });
   });
 
   return {