livedesk 0.1.389 → 0.1.390

package/bootstrap/legacy-client-update.js

@@ -1061,14 +1061,14 @@ function readReplacementOutput(outputPath) {
   }
 }
 
-function listWindowsProcessTree() {
+export function listWindowsProcessTree() {
   const script = [
     '$ErrorActionPreference = "Stop"',
     '[Console]::OutputEncoding = New-Object System.Text.UTF8Encoding($false)',
-    'Get-CimInstance Win32_Process',
-    '| Select-Object ProcessId,ParentProcessId,Name,ExecutablePath,CommandLine',
-    '| ConvertTo-Json -Compress'
-  ].join(' ');
+    'Get-CimInstance Win32_Process'
+      + ' | Select-Object ProcessId,ParentProcessId,Name,ExecutablePath,CommandLine'
+      + ' | ConvertTo-Json -Compress'
+  ].join('; ');
   const encoded = Buffer.from(script, 'utf16le').toString('base64');
   const result = spawnSync(
     'powershell.exe',

package/client/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/client/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/client/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 {

package/hub/src/live-desk-update.js

@@ -10,6 +10,7 @@ export const LIVE_DESK_DEDICATED_CLIENT_UPDATE_MIN_VERSION = '0.1.172';
 export const LIVE_DESK_UPDATE_CLIENT_BATCH_SIZE = 5;
 export const LIVE_DESK_UPDATE_TARGET_TIMEOUT_MS = 480_000;
 export const LIVE_DESK_UPDATE_TIMEOUT_MS = 90 * 60_000;
+export const LIVE_DESK_UPDATE_CLIENT_RESTART_STABILITY_MS = 60_000;
 export const LIVE_DESK_UPDATE_CHECK_INTERVAL_MS = 60_000;
 export const LIVE_DESK_LEGACY_COMMAND_MAX_LENGTH = 3900;
 
@@ -195,6 +196,7 @@ function statusForRun(run) {
     pendingOfflineCount,
     failedCount,
     batchSize: run.batchSize,
+    clientRestartStabilityMs: run.clientRestartStabilityMs,
     latestManagerVersion: run.latestManagerVersion,
     latestClientVersion: run.latestClientVersion,
     error: run.error || '',
@@ -218,8 +220,18 @@ function deviceNeedsUpdate(device, latestManagerVersion, latestClientVersion) {
   return !isVersionAtLeast(device?.productVersion, latestManagerVersion)
     || !isVersionAtLeast(device?.agentVersion, latestClientVersion);
 }
-
-export function createLiveDeskUpdateManager({
+
+function resetReconnectCandidate(target) {
+  target.candidateSessionId = '';
+  target.candidatePid = 0;
+  target.candidateConnectedAt = '';
+  target.candidateProductVersion = '';
+  target.candidateAgentVersion = '';
+  target.candidateSince = '';
+  target.stabilityDeadlineAt = '';
+}
+
+export function createLiveDeskUpdateManager({
   remoteHub,
   currentManagerVersion,
   currentClientVersion,
@@ -229,7 +241,8 @@ export function createLiveDeskUpdateManager({
   now = () => Date.now(),
   clientBatchSize = LIVE_DESK_UPDATE_CLIENT_BATCH_SIZE,
   targetTimeoutMs = LIVE_DESK_UPDATE_TARGET_TIMEOUT_MS,
-  operationTimeoutMs = LIVE_DESK_UPDATE_TIMEOUT_MS
+  operationTimeoutMs = LIVE_DESK_UPDATE_TIMEOUT_MS,
+  clientRestartStabilityMs = LIVE_DESK_UPDATE_CLIENT_RESTART_STABILITY_MS
 }) {
   let latestRelease = null;
   let checkError = '';
@@ -249,6 +262,12 @@ export function createLiveDeskUpdateManager({
     effectiveTargetTimeoutMs,
     Number(operationTimeoutMs) || LIVE_DESK_UPDATE_TIMEOUT_MS
   );
+  const effectiveClientRestartStabilityMs = Math.max(
+    0,
+    Number.isFinite(Number(clientRestartStabilityMs))
+      ? Number(clientRestartStabilityMs)
+      : LIVE_DESK_UPDATE_CLIENT_RESTART_STABILITY_MS
+  );
 
   const touch = () => {
     if (run) run.updatedAt = new Date(now()).toISOString();
@@ -323,6 +342,7 @@ export function createLiveDeskUpdateManager({
         pendingOfflineCount: 0,
         failedCount: 0,
         batchSize: effectiveClientBatchSize,
+        clientRestartStabilityMs: effectiveClientRestartStabilityMs,
         targets: []
       })
     };
@@ -405,6 +425,15 @@ export function createLiveDeskUpdateManager({
   const dispatchTarget = (target, device) => {
     const dispatchedAtEpochMs = now();
     const updateDeadlineEpochMs = dispatchedAtEpochMs + effectiveTargetTimeoutMs;
+    const dispatchedSessionId = String(device?.sessionId || '').trim();
+    if (!dispatchedSessionId) {
+      target.state = 'failed';
+      target.error = 'client-update-session-unavailable';
+      return false;
+    }
+    target.dispatchedSessionId = dispatchedSessionId;
+    target.dispatchedPid = Math.max(0, Math.floor(Number(device?.pid) || 0));
+    resetReconnectCandidate(target);
     const supportsDedicated = device.capabilities?.clientUpdate === true
       && isVersionAtLeast(device.agentVersion, LIVE_DESK_DEDICATED_CLIENT_UPDATE_MIN_VERSION);
     const payload = {
@@ -434,6 +463,9 @@ export function createLiveDeskUpdateManager({
         target.commandId = '';
         target.dispatchedAt = '';
         target.deadlineAt = '';
+        target.dispatchedSessionId = '';
+        target.dispatchedPid = 0;
+        resetReconnectCandidate(target);
         target.error = '';
         return 'pending-offline';
       }
@@ -497,14 +529,50 @@ export function createLiveDeskUpdateManager({
     for (const target of run.targets) {
       if (target.state === 'failed' || target.state === 'completed') continue;
       const device = devices.get(target.deviceId);
-      if (target.state === 'waiting'
-        && device?.connected === true
-        && !deviceNeedsUpdate(device, run.latestManagerVersion, run.latestClientVersion)) {
-        target.state = 'completed';
-        target.currentVersion = String(device.agentVersion || '');
-        target.currentProductVersion = String(device.productVersion || '');
-        target.completedAt = new Date(currentTime).toISOString();
-        continue;
+      if (target.state === 'waiting') {
+        const sessionId = String(device?.sessionId || '').trim();
+        const connectedAt = String(device?.connectedAt || '');
+        const connectedAtEpochMs = Date.parse(connectedAt);
+        const dispatchedAtEpochMs = Date.parse(target.dispatchedAt || '');
+        const candidatePid = Math.max(0, Math.floor(Number(device?.pid) || 0));
+        const candidateProductVersion = String(device?.productVersion || '');
+        const candidateAgentVersion = String(device?.agentVersion || '');
+        const qualifiesForStability = device?.connected === true
+          && !!sessionId
+          && candidatePid > 1
+          && sessionId !== target.dispatchedSessionId
+          && connectedAtEpochMs >= dispatchedAtEpochMs
+          && !deviceNeedsUpdate(device, run.latestManagerVersion, run.latestClientVersion);
+        const sameCandidate = qualifiesForStability
+          && target.candidateSessionId === sessionId
+          && target.candidatePid === candidatePid
+          && target.candidateConnectedAt === connectedAt
+          && target.candidateProductVersion === candidateProductVersion
+          && target.candidateAgentVersion === candidateAgentVersion;
+
+        if (!qualifiesForStability) {
+          resetReconnectCandidate(target);
+        } else if (!sameCandidate) {
+          target.candidateSessionId = sessionId;
+          target.candidatePid = candidatePid;
+          target.candidateConnectedAt = connectedAt;
+          target.candidateProductVersion = candidateProductVersion;
+          target.candidateAgentVersion = candidateAgentVersion;
+          target.candidateSince = new Date(currentTime).toISOString();
+          target.stabilityDeadlineAt = new Date(
+            currentTime + run.clientRestartStabilityMs
+          ).toISOString();
+        }
+
+        if (qualifiesForStability
+          && target.candidateSessionId === sessionId
+          && currentTime >= Date.parse(target.stabilityDeadlineAt || '')) {
+          target.state = 'completed';
+          target.currentVersion = String(device.agentVersion || '');
+          target.currentProductVersion = String(device.productVersion || '');
+          target.completedAt = new Date(currentTime).toISOString();
+          continue;
+        }
       }
       if (target.state === 'waiting'
         && Date.parse(target.deadlineAt || '') > 0
@@ -579,6 +647,7 @@ export function createLiveDeskUpdateManager({
       latestClientVersion: release.latestClientVersion,
       needsHubRestart,
       batchSize: effectiveClientBatchSize,
+      clientRestartStabilityMs: effectiveClientRestartStabilityMs,
       error: '',
       targets: targets.map(device => ({
         deviceId: String(device.deviceId || ''),
@@ -592,6 +661,15 @@ export function createLiveDeskUpdateManager({
         commandId: '',
         dispatchedAt: '',
         deadlineAt: '',
+        dispatchedSessionId: '',
+        dispatchedPid: 0,
+        candidateSessionId: '',
+        candidatePid: 0,
+        candidateConnectedAt: '',
+        candidateProductVersion: '',
+        candidateAgentVersion: '',
+        candidateSince: '',
+        stabilityDeadlineAt: '',
         completedAt: '',
         error: ''
       }))
@@ -616,10 +694,15 @@ export function createLiveDeskUpdateManager({
     runTimer.unref?.();
     verifyTargets();
     return { ok: true, ...getStatus() };
-  };
-
-  const handleRemoteEvent = (type, event) => {
-    if (!run || run.state !== 'waiting-for-clients' || type !== 'RemoteCommandResult') return;
+  };
+
+  const handleRemoteEvent = (type, event) => {
+    if (!run || run.state !== 'waiting-for-clients') return;
+    if (type === 'RemoteDeviceConnected' || type === 'RemoteDeviceDisconnected') {
+      verifyTargets();
+      return;
+    }
+    if (type !== 'RemoteCommandResult') return;
     const deviceId = String(event?.device?.deviceId || '');
     const commandId = String(event?.commandId || '');
     const target = run.targets.find(item => item.deviceId === deviceId && item.commandId === commandId);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livedesk",
-  "version": "0.1.389",
-  "livedeskClientVersion": "0.1.172",
+  "version": "0.1.390",
+  "livedeskClientVersion": "0.1.173",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
@@ -49,10 +49,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"