@livedesk/hub 0.1.40 → 0.1.42

package/src/live-desk-update.js

@@ -8,11 +8,11 @@ export const LIVE_DESK_UPDATE_COMMAND = 'livedesk.client-update';
 // same device returned, so the Hub-owned compatibility bridge upgrades them.
 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_VERIFIED_CLIENT_STABILITY_MS = 10_000;
-export const LIVE_DESK_UPDATE_CHECK_INTERVAL_MS = 60_000;
+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_VERIFIED_CLIENT_STABILITY_MS = 10_000;
+export const LIVE_DESK_UPDATE_CHECK_INTERVAL_MS = 60_000;
 export const LIVE_DESK_LEGACY_COMMAND_MAX_LENGTH = 3900;
 
 function cleanVersion(value) {
@@ -66,13 +66,17 @@ export function isVersionAtLeast(candidate, required) {
   return !!cleanVersion(candidate) && !!cleanVersion(required) && compareVersions(candidate, required) >= 0;
 }
 
+function isDedicatedBootstrapFailure(value) {
+  return /^Update worker exited before terminal proof\b/i.test(String(value || '').trim());
+}
+
 function encodePowerShell(value) {
   return Buffer.from(String(value || ''), 'utf16le').toString('base64');
 }
 
 function buildLegacyPackageSupervisorStarterSource() {
   const source = [
-    "const{spawn}=require('node:child_process'),f=require('node:fs'),p=require('node:path'),c=JSON.parse(Buffer.from(process.env.C,'base64')),e={...process.env,LIVEDESK_UPDATE_STARTER_PID:String(process.pid),LIVEDESK_UPDATE_ORIGINAL_CWD:process.cwd()},w=p.join(require('node:os').tmpdir(),'livedesk-update-cwd','client-'+c[0]),u=e.LIVEDESK_NPX_EXECUTABLE,s=process.platform,j=process.execPath,n=u||(s==='win32'?'npx.cmd':'npx'),x=[e.LIVEDESK_NPX_CLI_PATH,e.npm_execpath&&p.join(p.dirname(e.npm_execpath),'npx-cli.js'),u&&p.join(p.dirname(u),'node_modules/npm/bin/npx-cli.js'),p.join(p.dirname(j),'node_modules/npm/bin/npx-cli.js')].find(v=>v&&f.existsSync(v)),a=['-y','--prefer-online','--prefix',w,'--workspaces=false','livedesk@'+c[6],'--internal-legacy-client-update'],z=String.fromCharCode(32),q=v=>'\"'+String(v).replaceAll('\"','\"\"')+'\"';if(!(+c[7]>0))process.exit(1);c[7]=String(Date.now()+Number(c[7]));e.C=Buffer.from(JSON.stringify(c)).toString('base64');f.mkdirSync(w,{recursive:true});if(f.readdirSync(w)[0])process.exit(1);Object.keys(e).forEach(k=>/^(INIT_CWD|npm_config_(local_prefix|workspaces?|include_workspace_root))$/i.test(k)&&Reflect.deleteProperty(e,k));Object.assign(e,{INIT_CWD:w,npm_config_local_prefix:w,npm_config_workspaces:'false',npm_config_include_workspace_root:'false',LIVEDESK_UPDATE_NEUTRAL_CWD:w});e.i=x?{c:j,a:[x,...a]}:s==='win32'?{c:e.ComSpec||'cmd.exe',a:['/d','/s','/c','call'+z+q(n)+z+a.map(q).join(z)]}:{c:n,a};e.r=spawn(e.i.c,e.i.a,{cwd:w,env:e,detached:true,stdio:'ignore',windowsHide:true});",
+    "const{spawn}=require('node:child_process'),f=require('node:fs'),p=require('node:path'),o=require('node:os'),c=JSON.parse(Buffer.from(process.env.C,'base64')),e={...process.env,LIVEDESK_UPDATE_STARTER_PID:String(process.pid),LIVEDESK_UPDATE_ORIGINAL_CWD:process.cwd()},w=p.join(o.tmpdir(),'livedesk-update-cwd','client-'+c[0]),k=p.join(o.tmpdir(),'livedesk-update-cache','client-'+c[0]),u=e.LIVEDESK_NPX_EXECUTABLE,s=process.platform,j=process.execPath,n=u||(s==='win32'?'npx.cmd':'npx'),x=[e.LIVEDESK_NPX_CLI_PATH,e.npm_execpath&&p.join(p.dirname(e.npm_execpath),'npx-cli.js'),u&&p.join(p.dirname(u),'node_modules/npm/bin/npx-cli.js'),p.join(p.dirname(j),'node_modules/npm/bin/npx-cli.js')].find(v=>v&&f.existsSync(v)),a=['-y','--prefer-online','--prefix',w,'--workspaces=false','livedesk@'+c[6],'--internal-legacy-client-update'],z=String.fromCharCode(32),q=v=>'\"'+String(v).replaceAll('\"','\"\"')+'\"';if(!(+c[7]>0))process.exit(1);c[7]=String(Date.now()+Number(c[7]));e.C=Buffer.from(JSON.stringify(c)).toString('base64');f.mkdirSync(w,{recursive:true});if(f.readdirSync(w)[0])process.exit(1);f.mkdirSync(k,{recursive:true});Object.keys(e).forEach(n=>/^(INIT_CWD|npm_config_(cache|local_prefix|workspaces?|include_workspace_root))$/i.test(n)&&Reflect.deleteProperty(e,n));Object.assign(e,{INIT_CWD:w,npm_config_cache:k,npm_config_local_prefix:w,npm_config_workspaces:'false',npm_config_include_workspace_root:'false',LIVEDESK_UPDATE_NEUTRAL_CWD:w});e.i=x?{c:j,a:[x,...a]}:s==='win32'?{c:e.ComSpec||'cmd.exe',a:['/d','/s','/c','call'+z+q(n)+z+a.map(q).join(z)]}:{c:n,a};e.r=spawn(e.i.c,e.i.a,{cwd:w,env:e,detached:true,stdio:'ignore',windowsHide:true});",
     "e.r.on('error',()=>process.exit(1));e.r.unref();"
   ].join('');
   if (source.includes(' ')) throw new Error('LiveDesk legacy starter source must not contain spaces.');
@@ -195,10 +199,10 @@ function statusForRun(run) {
     activeCount,
     queuedCount,
     pendingOfflineCount,
-    failedCount,
-    batchSize: run.batchSize,
-    clientRestartStabilityMs: run.clientRestartStabilityMs,
-    verifiedClientRestartStabilityMs: run.verifiedClientRestartStabilityMs,
+    failedCount,
+    batchSize: run.batchSize,
+    clientRestartStabilityMs: run.clientRestartStabilityMs,
+    verifiedClientRestartStabilityMs: run.verifiedClientRestartStabilityMs,
     latestManagerVersion: run.latestManagerVersion,
     latestClientVersion: run.latestClientVersion,
     error: run.error || '',
@@ -228,35 +232,45 @@ function resetReconnectCandidate(target) {
   target.candidatePid = 0;
   target.candidateConnectedAt = '';
   target.candidateProductVersion = '';
-  target.candidateAgentVersion = '';
-  target.candidateSupervisorProofId = '';
-  target.verificationSource = '';
-  target.requiredStabilityMs = 0;
-  target.supervisorProofAt = '';
-  target.candidateSince = '';
-  target.stabilityDeadlineAt = '';
-}
-
-export function createLiveDeskUpdateManager({
-  remoteHub,
-  currentManagerVersion,
-  currentClientVersion,
+  target.candidateAgentVersion = '';
+  target.candidateSupervisorProofId = '';
+  target.verificationSource = '';
+  target.requiredStabilityMs = 0;
+  target.supervisorProofAt = '';
+  target.candidateSince = '';
+  target.stabilityDeadlineAt = '';
+}
+
+export function createLiveDeskUpdateManager({
+  remoteHub,
+  currentManagerVersion,
+  currentClientVersion,
+  excludedDeviceIds = [],
   restartSupported = false,
   requestHubRestart,
   fetchImpl = globalThis.fetch,
   now = () => Date.now(),
   clientBatchSize = LIVE_DESK_UPDATE_CLIENT_BATCH_SIZE,
-  targetTimeoutMs = LIVE_DESK_UPDATE_TARGET_TIMEOUT_MS,
-  operationTimeoutMs = LIVE_DESK_UPDATE_TIMEOUT_MS,
-  clientRestartStabilityMs = LIVE_DESK_UPDATE_CLIENT_RESTART_STABILITY_MS,
-  verifiedClientRestartStabilityMs = LIVE_DESK_UPDATE_VERIFIED_CLIENT_STABILITY_MS
-}) {
+  targetTimeoutMs = LIVE_DESK_UPDATE_TARGET_TIMEOUT_MS,
+  operationTimeoutMs = LIVE_DESK_UPDATE_TIMEOUT_MS,
+  clientRestartStabilityMs = LIVE_DESK_UPDATE_CLIENT_RESTART_STABILITY_MS,
+  verifiedClientRestartStabilityMs = LIVE_DESK_UPDATE_VERIFIED_CLIENT_STABILITY_MS
+}) {
   let latestRelease = null;
   let checkError = '';
   let checkPromise = null;
   let run = null;
   let checkTimer = null;
-  let runTimer = null;
+  let runTimer = null;
+  const excludedDeviceIdSet = new Set(
+    (Array.isArray(excludedDeviceIds) ? excludedDeviceIds : [excludedDeviceIds])
+      .map(value => String(value || '').trim())
+      .filter(Boolean)
+  );
+  const connectedClientDevices = () => connectedDevices(remoteHub)
+    .filter(device => !excludedDeviceIdSet.has(String(device?.deviceId || '')));
+  const knownOfflineClientDevices = () => knownOfflineDevices(remoteHub)
+    .filter(device => !excludedDeviceIdSet.has(String(device?.deviceId || '')));
   const effectiveClientBatchSize = Math.max(
     1,
     Math.min(50, Math.floor(Number(clientBatchSize) || LIVE_DESK_UPDATE_CLIENT_BATCH_SIZE))
@@ -269,18 +283,18 @@ export function createLiveDeskUpdateManager({
     effectiveTargetTimeoutMs,
     Number(operationTimeoutMs) || LIVE_DESK_UPDATE_TIMEOUT_MS
   );
-  const effectiveClientRestartStabilityMs = Math.max(
+  const effectiveClientRestartStabilityMs = Math.max(
     0,
     Number.isFinite(Number(clientRestartStabilityMs))
       ? Number(clientRestartStabilityMs)
-      : LIVE_DESK_UPDATE_CLIENT_RESTART_STABILITY_MS
-  );
-  const effectiveVerifiedClientRestartStabilityMs = Math.max(
-    5_000,
-    Number.isFinite(Number(verifiedClientRestartStabilityMs))
-      ? Number(verifiedClientRestartStabilityMs)
-      : LIVE_DESK_UPDATE_VERIFIED_CLIENT_STABILITY_MS
-  );
+      : LIVE_DESK_UPDATE_CLIENT_RESTART_STABILITY_MS
+  );
+  const effectiveVerifiedClientRestartStabilityMs = Math.max(
+    5_000,
+    Number.isFinite(Number(verifiedClientRestartStabilityMs))
+      ? Number(verifiedClientRestartStabilityMs)
+      : LIVE_DESK_UPDATE_VERIFIED_CLIENT_STABILITY_MS
+  );
 
   const touch = () => {
     if (run) run.updatedAt = new Date(now()).toISOString();
@@ -307,7 +321,7 @@ export function createLiveDeskUpdateManager({
   const getStatus = () => {
     const managerUpdateAvailable = !!latestRelease
       && compareVersions(latestRelease.latestManagerVersion, currentManagerVersion) > 0;
-    const clientDevices = connectedDevices(remoteHub);
+    const clientDevices = connectedClientDevices();
     const outdatedClientDevices = latestRelease
       ? clientDevices.filter(device => deviceNeedsUpdate(
         device,
@@ -316,7 +330,7 @@ export function createLiveDeskUpdateManager({
       ))
       : [];
     const pendingOfflineClientCount = latestRelease
-      ? knownOfflineDevices(remoteHub).filter(device => deviceNeedsUpdate(
+      ? knownOfflineClientDevices().filter(device => deviceNeedsUpdate(
         device,
         latestRelease.latestManagerVersion,
         latestRelease.latestClientVersion
@@ -354,10 +368,10 @@ export function createLiveDeskUpdateManager({
         queuedCount: 0,
         pendingOfflineCount: 0,
         failedCount: 0,
-        batchSize: effectiveClientBatchSize,
-        clientRestartStabilityMs: effectiveClientRestartStabilityMs,
-        verifiedClientRestartStabilityMs: effectiveVerifiedClientRestartStabilityMs,
-        targets: []
+        batchSize: effectiveClientBatchSize,
+        clientRestartStabilityMs: effectiveClientRestartStabilityMs,
+        verifiedClientRestartStabilityMs: effectiveVerifiedClientRestartStabilityMs,
+        targets: []
       })
     };
   };
@@ -400,8 +414,9 @@ export function createLiveDeskUpdateManager({
     if (!run || run.state !== 'failed') return [];
     const currentTime = now();
     const devices = new Map(
-      remoteHub.listDevices({ includeDataUrl: false })
-        .map(device => [String(device.deviceId), device])
+      remoteHub.listDevices({ includeDataUrl: false })
+        .filter(device => !excludedDeviceIdSet.has(String(device?.deviceId || '')))
+        .map(device => [String(device.deviceId), device])
     );
     return run.targets.filter(target => {
       if (target.state !== 'failed' || !target.dispatchedAt) return false;
@@ -436,9 +451,16 @@ export function createLiveDeskUpdateManager({
     return true;
   };
 
-  const dispatchTarget = (target, device) => {
+  const dispatchTarget = (target, device, options = {}) => {
     const dispatchedAtEpochMs = now();
-    const updateDeadlineEpochMs = dispatchedAtEpochMs + effectiveTargetTimeoutMs;
+    const requestedTimeoutMs = Math.max(
+      10_000,
+      Math.min(
+        effectiveTargetTimeoutMs,
+        Number(options.updateTimeoutMs) || effectiveTargetTimeoutMs
+      )
+    );
+    const updateDeadlineEpochMs = dispatchedAtEpochMs + requestedTimeoutMs;
     const dispatchedSessionId = String(device?.sessionId || '').trim();
     if (!dispatchedSessionId) {
       target.state = 'failed';
@@ -448,14 +470,15 @@ export function createLiveDeskUpdateManager({
     target.dispatchedSessionId = dispatchedSessionId;
     target.dispatchedPid = Math.max(0, Math.floor(Number(device?.pid) || 0));
     resetReconnectCandidate(target);
-    const supportsDedicated = device.capabilities?.clientUpdate === true
+    const supportsDedicated = options.forceLegacy !== true
+      && device.capabilities?.clientUpdate === true
       && isVersionAtLeast(device.agentVersion, LIVE_DESK_DEDICATED_CLIENT_UPDATE_MIN_VERSION);
     const payload = {
       targetVersion: run.latestClientVersion,
       targetProductVersion: run.latestManagerVersion,
       managerVersion: run.latestManagerVersion,
       operationId: run.operationId,
-      updateTimeoutMs: effectiveTargetTimeoutMs
+      updateTimeoutMs: requestedTimeoutMs
     };
     const result = supportsDedicated
       ? remoteHub.sendCommand(device.deviceId, { command: LIVE_DESK_UPDATE_COMMAND, payload })
@@ -465,7 +488,7 @@ export function createLiveDeskUpdateManager({
           run.operationId,
           run.latestClientVersion,
           run.latestManagerVersion,
-          effectiveTargetTimeoutMs
+          requestedTimeoutMs
         ),
         timeoutMs: 30_000
       });
@@ -500,7 +523,7 @@ export function createLiveDeskUpdateManager({
     const activeCount = run.targets.filter(target => target.state === 'waiting').length;
     let availableSlots = Math.max(0, run.batchSize - activeCount);
     if (availableSlots <= 0) return true;
-    const devices = new Map(connectedDevices(remoteHub).map(device => [String(device.deviceId), device]));
+    const devices = new Map(connectedClientDevices().map(device => [String(device.deviceId), device]));
     for (const target of run.targets) {
       if (availableSlots <= 0) break;
       if (!['queued', 'pending-offline'].includes(target.state)) continue;
@@ -539,7 +562,7 @@ export function createLiveDeskUpdateManager({
       failRun(`Timed out waiting for ${unfinishedCount} client(s) to finish the rollout.`);
       return;
     }
-    const devices = new Map(connectedDevices(remoteHub).map(device => [String(device.deviceId), device]));
+    const devices = new Map(connectedClientDevices().map(device => [String(device.deviceId), device]));
     for (const target of run.targets) {
       if (target.state === 'failed' || target.state === 'completed') continue;
       const device = devices.get(target.deviceId);
@@ -549,30 +572,30 @@ export function createLiveDeskUpdateManager({
         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 supervisorProof = device?.clientUpdateProof;
-        const supervisorProofId = [
-          String(supervisorProof?.operationId || ''),
-          String(supervisorProof?.attemptId || ''),
-          String(supervisorProof?.sessionId || ''),
-          String(supervisorProof?.agentPid || ''),
-          String(supervisorProof?.launcherPid || ''),
-          String(supervisorProof?.completedAt || '')
-        ].join(':');
-        const hasSupervisorProof = !!supervisorProof
-          && String(supervisorProof.operationId || '') === run.operationId
-          && !!String(supervisorProof.attemptId || '')
-          && String(supervisorProof.sessionId || '') === sessionId
-          && Number(supervisorProof.agentPid || 0) === candidatePid
-          && Number(supervisorProof.launcherPid || 0) > 1
-          && cleanVersion(supervisorProof.productVersion) === cleanVersion(candidateProductVersion)
-          && cleanVersion(supervisorProof.agentVersion) === cleanVersion(candidateAgentVersion)
-          && Date.parse(String(supervisorProof.receivedAt || '')) >= connectedAtEpochMs;
-        const requiredStabilityMs = hasSupervisorProof
-          ? run.verifiedClientRestartStabilityMs
-          : run.clientRestartStabilityMs;
-        const qualifiesForStability = device?.connected === true
+        const candidateProductVersion = String(device?.productVersion || '');
+        const candidateAgentVersion = String(device?.agentVersion || '');
+        const supervisorProof = device?.clientUpdateProof;
+        const supervisorProofId = [
+          String(supervisorProof?.operationId || ''),
+          String(supervisorProof?.attemptId || ''),
+          String(supervisorProof?.sessionId || ''),
+          String(supervisorProof?.agentPid || ''),
+          String(supervisorProof?.launcherPid || ''),
+          String(supervisorProof?.completedAt || '')
+        ].join(':');
+        const hasSupervisorProof = !!supervisorProof
+          && String(supervisorProof.operationId || '') === run.operationId
+          && !!String(supervisorProof.attemptId || '')
+          && String(supervisorProof.sessionId || '') === sessionId
+          && Number(supervisorProof.agentPid || 0) === candidatePid
+          && Number(supervisorProof.launcherPid || 0) > 1
+          && cleanVersion(supervisorProof.productVersion) === cleanVersion(candidateProductVersion)
+          && cleanVersion(supervisorProof.agentVersion) === cleanVersion(candidateAgentVersion)
+          && Date.parse(String(supervisorProof.receivedAt || '')) >= connectedAtEpochMs;
+        const requiredStabilityMs = hasSupervisorProof
+          ? run.verifiedClientRestartStabilityMs
+          : run.clientRestartStabilityMs;
+        const qualifiesForStability = device?.connected === true
           && !!sessionId
           && candidatePid > 1
           && sessionId !== target.dispatchedSessionId
@@ -581,10 +604,10 @@ export function createLiveDeskUpdateManager({
         const sameCandidate = qualifiesForStability
           && target.candidateSessionId === sessionId
           && target.candidatePid === candidatePid
-          && target.candidateConnectedAt === connectedAt
-          && target.candidateProductVersion === candidateProductVersion
-          && target.candidateAgentVersion === candidateAgentVersion
-          && target.candidateSupervisorProofId === (hasSupervisorProof ? supervisorProofId : '');
+          && target.candidateConnectedAt === connectedAt
+          && target.candidateProductVersion === candidateProductVersion
+          && target.candidateAgentVersion === candidateAgentVersion
+          && target.candidateSupervisorProofId === (hasSupervisorProof ? supervisorProofId : '');
 
         if (!qualifiesForStability) {
           resetReconnectCandidate(target);
@@ -592,18 +615,18 @@ export function createLiveDeskUpdateManager({
           target.candidateSessionId = sessionId;
           target.candidatePid = candidatePid;
           target.candidateConnectedAt = connectedAt;
-          target.candidateProductVersion = candidateProductVersion;
-          target.candidateAgentVersion = candidateAgentVersion;
-          target.candidateSupervisorProofId = hasSupervisorProof ? supervisorProofId : '';
-          target.verificationSource = hasSupervisorProof ? 'supervisor-proof' : 'hub-session';
-          target.requiredStabilityMs = requiredStabilityMs;
-          target.supervisorProofAt = hasSupervisorProof
-            ? String(supervisorProof.receivedAt || supervisorProof.completedAt || '')
-            : '';
-          target.candidateSince = new Date(currentTime).toISOString();
-          target.stabilityDeadlineAt = new Date(
-            currentTime + requiredStabilityMs
-          ).toISOString();
+          target.candidateProductVersion = candidateProductVersion;
+          target.candidateAgentVersion = candidateAgentVersion;
+          target.candidateSupervisorProofId = hasSupervisorProof ? supervisorProofId : '';
+          target.verificationSource = hasSupervisorProof ? 'supervisor-proof' : 'hub-session';
+          target.requiredStabilityMs = requiredStabilityMs;
+          target.supervisorProofAt = hasSupervisorProof
+            ? String(supervisorProof.receivedAt || supervisorProof.completedAt || '')
+            : '';
+          target.candidateSince = new Date(currentTime).toISOString();
+          target.stabilityDeadlineAt = new Date(
+            currentTime + requiredStabilityMs
+          ).toISOString();
         }
 
         if (qualifiesForStability
@@ -666,7 +689,7 @@ export function createLiveDeskUpdateManager({
     if (!release) return { ok: false, error: checkError || 'LiveDesk update check failed.', ...getStatus() };
     const managerNeedsUpdate = compareVersions(release.latestManagerVersion, currentManagerVersion) > 0;
     const clientPackageNeedsUpdate = compareVersions(release.latestClientVersion, currentClientVersion) > 0;
-    const connected = connectedDevices(remoteHub);
+    const connected = connectedClientDevices();
     const outdatedClients = connected.filter(device => deviceNeedsUpdate(
       device,
       release.latestManagerVersion,
@@ -688,9 +711,9 @@ export function createLiveDeskUpdateManager({
       latestManagerVersion: release.latestManagerVersion,
       latestClientVersion: release.latestClientVersion,
       needsHubRestart,
-      batchSize: effectiveClientBatchSize,
-      clientRestartStabilityMs: effectiveClientRestartStabilityMs,
-      verifiedClientRestartStabilityMs: effectiveVerifiedClientRestartStabilityMs,
+      batchSize: effectiveClientBatchSize,
+      clientRestartStabilityMs: effectiveClientRestartStabilityMs,
+      verifiedClientRestartStabilityMs: effectiveVerifiedClientRestartStabilityMs,
       error: '',
       targets: targets.map(device => ({
         deviceId: String(device.deviceId || ''),
@@ -709,15 +732,18 @@ export function createLiveDeskUpdateManager({
         candidateSessionId: '',
         candidatePid: 0,
         candidateConnectedAt: '',
-        candidateProductVersion: '',
-        candidateAgentVersion: '',
-        candidateSupervisorProofId: '',
-        verificationSource: '',
-        requiredStabilityMs: 0,
-        supervisorProofAt: '',
-        candidateSince: '',
+        candidateProductVersion: '',
+        candidateAgentVersion: '',
+        candidateSupervisorProofId: '',
+        verificationSource: '',
+        requiredStabilityMs: 0,
+        supervisorProofAt: '',
+        candidateSince: '',
         stabilityDeadlineAt: '',
         completedAt: '',
+        bootstrapRetryCount: 0,
+        bootstrapRetryAt: '',
+        bootstrapRetryReason: '',
         error: ''
       }))
     };
@@ -745,9 +771,9 @@ export function createLiveDeskUpdateManager({
 
   const handleRemoteEvent = (type, event) => {
     if (!run || run.state !== 'waiting-for-clients') return;
-    if (type === 'RemoteDeviceConnected'
-      || type === 'RemoteDeviceDisconnected'
-      || type === 'RemoteClientUpdateVerified') {
+    if (type === 'RemoteDeviceConnected'
+      || type === 'RemoteDeviceDisconnected'
+      || type === 'RemoteClientUpdateVerified') {
       verifyTargets();
       return;
     }
@@ -760,8 +786,41 @@ export function createLiveDeskUpdateManager({
       || !['dedicated', 'legacy-command-run'].includes(target.method)) return;
     const result = event?.result;
     if (event?.error || result?.ok === false || result?.status === 'failed' || result?.status === 'rejected') {
+      const failure = String(event.error || result?.error || result?.message || 'client-update-command-failed').slice(0, 500);
+      if (target.method === 'dedicated'
+        && target.bootstrapRetryCount === 0
+        && isDedicatedBootstrapFailure(failure)) {
+        const retryDevice = connectedClientDevices()
+          .find(device => String(device.deviceId || '') === target.deviceId);
+        const remainingMs = Date.parse(target.deadlineAt || '') - now();
+        if (retryDevice?.connected === true && remainingMs >= 10_000) {
+          target.bootstrapRetryCount = 1;
+          target.bootstrapRetryAt = new Date(now()).toISOString();
+          target.bootstrapRetryReason = failure;
+          target.error = '';
+          let retryResult;
+          try {
+            retryResult = dispatchTarget(target, retryDevice, {
+              forceLegacy: true,
+              updateTimeoutMs: remainingMs
+            });
+          } catch (error) {
+            target.error = String(error?.message || error || 'client-update-bootstrap-retry-failed').slice(0, 500);
+            retryResult = false;
+          }
+          if (retryResult === true) {
+            touch();
+            return;
+          }
+          target.state = 'failed';
+          if (!target.error) target.error = 'client-update-bootstrap-retry-failed';
+          touch();
+          failRun(`Client ${target.deviceName || target.deviceId} bootstrap retry failed: ${target.error}`);
+          return;
+        }
+      }
       target.state = 'failed';
-      target.error = String(event.error || result?.error || result?.message || 'client-update-command-failed').slice(0, 500);
+      target.error = failure;
       touch();
       failRun(target.method === 'dedicated'
         ? `Client ${target.deviceName || target.deviceId} rejected the update request: ${target.error}`

package/src/live-stream-monitor-contract.js

@@ -1,38 +1,38 @@
-export const LIVE_STREAM_MONITOR_INDEX_MIN = 0;
-export const LIVE_STREAM_MONITOR_INDEX_MAX = 63;
-
-export function parseExactLiveStreamMonitorIndex(value) {
-    return typeof value === 'number'
-        && Number.isInteger(value)
-        && value >= LIVE_STREAM_MONITOR_INDEX_MIN
-        && value <= LIVE_STREAM_MONITOR_INDEX_MAX
-        ? value
-        : null;
-}
-
-export function isReusedLiveStreamFrameReady(result, activeStream, expectedBinding) {
-    const expectedMonitorIndex = parseExactLiveStreamMonitorIndex(expectedBinding?.monitorIndex);
-    const activeMonitorIndex = parseExactLiveStreamMonitorIndex(activeStream?.monitorIndex);
-    const latestFrame = activeStream?.latestFrame;
-    const frameMonitorIndex = parseExactLiveStreamMonitorIndex(latestFrame?.monitorIndex);
-    const expectedStreamId = String(expectedBinding?.streamId || '');
-    const expectedCommandId = String(expectedBinding?.commandId || '');
-    const expectedCaptureGeneration = Number(expectedBinding?.captureGeneration || 0);
-
-    return result?.reused === true
-        && result?.ready === true
-        && Number(activeStream?.framesReceived || 0) > 0
-        && !!expectedStreamId
-        && String(activeStream?.streamId || '') === expectedStreamId
-        && !!expectedCommandId
-        && String(activeStream?.commandId || '') === expectedCommandId
-        && Number.isInteger(expectedCaptureGeneration)
-        && expectedCaptureGeneration > 0
-        && Number(activeStream?.captureGeneration || 0) === expectedCaptureGeneration
-        && latestFrame?.currentGenerationVerified === true
-        && String(latestFrame?.commandId || '') === expectedCommandId
-        && Number(latestFrame?.captureGeneration || 0) === expectedCaptureGeneration
-        && expectedMonitorIndex !== null
-        && activeMonitorIndex === expectedMonitorIndex
-        && frameMonitorIndex === expectedMonitorIndex;
-}
+export const LIVE_STREAM_MONITOR_INDEX_MIN = 0;
+export const LIVE_STREAM_MONITOR_INDEX_MAX = 63;
+
+export function parseExactLiveStreamMonitorIndex(value) {
+    return typeof value === 'number'
+        && Number.isInteger(value)
+        && value >= LIVE_STREAM_MONITOR_INDEX_MIN
+        && value <= LIVE_STREAM_MONITOR_INDEX_MAX
+        ? value
+        : null;
+}
+
+export function isReusedLiveStreamFrameReady(result, activeStream, expectedBinding) {
+    const expectedMonitorIndex = parseExactLiveStreamMonitorIndex(expectedBinding?.monitorIndex);
+    const activeMonitorIndex = parseExactLiveStreamMonitorIndex(activeStream?.monitorIndex);
+    const latestFrame = activeStream?.latestFrame;
+    const frameMonitorIndex = parseExactLiveStreamMonitorIndex(latestFrame?.monitorIndex);
+    const expectedStreamId = String(expectedBinding?.streamId || '');
+    const expectedCommandId = String(expectedBinding?.commandId || '');
+    const expectedCaptureGeneration = Number(expectedBinding?.captureGeneration || 0);
+
+    return result?.reused === true
+        && result?.ready === true
+        && Number(activeStream?.framesReceived || 0) > 0
+        && !!expectedStreamId
+        && String(activeStream?.streamId || '') === expectedStreamId
+        && !!expectedCommandId
+        && String(activeStream?.commandId || '') === expectedCommandId
+        && Number.isInteger(expectedCaptureGeneration)
+        && expectedCaptureGeneration > 0
+        && Number(activeStream?.captureGeneration || 0) === expectedCaptureGeneration
+        && latestFrame?.currentGenerationVerified === true
+        && String(latestFrame?.commandId || '') === expectedCommandId
+        && Number(latestFrame?.captureGeneration || 0) === expectedCaptureGeneration
+        && expectedMonitorIndex !== null
+        && activeMonitorIndex === expectedMonitorIndex
+        && frameMonitorIndex === expectedMonitorIndex;
+}