livedesk 0.1.430 → 0.1.432

package/bin/livedesk.js

@@ -5,7 +5,7 @@ import net from 'node:net';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { execFile, spawn } from 'node:child_process';
-import { createWriteStream, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { randomBytes } from 'node:crypto';
 import os from 'node:os';
 import { resolveDeviceRole, writeRoleCache } from '../bootstrap/device-role.js';
@@ -62,17 +62,12 @@ function prepareUpdateNeutralCwd(kind, operationId) {
     `${safeUpdatePathSegment(kind, 'update')}-${safeUpdatePathSegment(operationId)}`
   );
   mkdirSync(neutralCwd, { recursive: true });
-  for (let ancestor = neutralCwd; ; ancestor = dirname(ancestor)) {
-    const shadowPath = ['package.json', join('node_modules', 'livedesk', 'package.json')]
-      .map(relativePath => join(ancestor, relativePath))
-      .find(candidate => existsSync(candidate));
-    if (shadowPath) {
-      throw new Error(
-        `LiveDesk update neutral working directory is shadowed by ${shadowPath}: ${neutralCwd}`
-      );
-    }
-    const parent = dirname(ancestor);
-    if (parent === ancestor) break;
+  const unexpectedEntry = readdirSync(neutralCwd)[0];
+  if (unexpectedEntry) {
+    const shadowPath = join(neutralCwd, unexpectedEntry);
+    throw new Error(
+      `LiveDesk update neutral working directory is shadowed by ${shadowPath}: ${neutralCwd}`
+    );
   }
   return neutralCwd;
 }
@@ -94,6 +89,7 @@ function buildNeutralNpxEnvironment(baseEnv, neutralCwd) {
   }
   env.INIT_CWD = neutralCwd;
   env.npm_config_local_prefix = neutralCwd;
+  env.npm_config_workspaces = 'false';
   env.npm_config_include_workspace_root = 'false';
   return env;
 }
@@ -1037,7 +1033,7 @@ function resolveNpxInvocation(npxArgs) {
 function buildHubRestartBootstrapScript() {
   return [
     'const { execFile, spawn } = require("node:child_process");',
-    'const { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } = require("node:fs");',
+    'const { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } = require("node:fs");',
     'const { dirname, join } = require("node:path");',
     'const net = require("node:net");',
     'const waitPid = Number(process.env.LIVEDESK_RESTART_WAIT_PID || 0);',
@@ -1077,8 +1073,8 @@ function buildHubRestartBootstrapScript() {
     'const healthTimeoutMs = terminationFailureOperationId === operationId ? numberFromEnv("LIVEDESK_TEST_HUB_RESTART_TERMINATION_HEALTH_TIMEOUT_MS", 1000, 250) : configuredHealthTimeoutMs;',
     'const pollMs = numberFromEnv("LIVEDESK_RESTART_HEALTH_POLL_MS", 250, 50);',
     'const stabilityMs = numberFromEnv("LIVEDESK_RESTART_STABILITY_MS", 5000, 5000);',
-    'const prepareNeutralCwd = () => { if (!neutralCwd) throw new Error("LiveDesk Hub update neutral working directory is unavailable"); mkdirSync(neutralCwd, { recursive: true }); for (let ancestor = neutralCwd; ; ancestor = dirname(ancestor)) { const shadow = [join(ancestor, "package.json"), join(ancestor, "node_modules", "livedesk", "package.json")].find(existsSync); if (shadow) throw new Error(`LiveDesk Hub update neutral working directory is shadowed by ${shadow}: ${neutralCwd}`); const parent = dirname(ancestor); if (parent === ancestor) break; } };',
-    'const buildLaunchEnv = () => { const env = { ...process.env }; const isolated = new Set(["init_cwd", "npm_config_local_prefix", "npm_config_workspace", "npm_config_workspaces", "npm_config_include_workspace_root", "npm_package_json", "npm_lifecycle_event", "npm_lifecycle_script"]); for (const key of Object.keys(env)) if (isolated.has(key.toLowerCase())) delete env[key]; env.INIT_CWD = neutralCwd; env.npm_config_local_prefix = neutralCwd; env.npm_config_include_workspace_root = "false"; return env; };',
+    'const prepareNeutralCwd = () => { if (!neutralCwd) throw new Error("LiveDesk Hub update neutral working directory is unavailable"); mkdirSync(neutralCwd, { recursive: true }); const unexpectedEntry = readdirSync(neutralCwd)[0]; if (unexpectedEntry) { const shadow = join(neutralCwd, unexpectedEntry); throw new Error(`LiveDesk Hub update neutral working directory is shadowed by ${shadow}: ${neutralCwd}`); } };',
+    'const buildLaunchEnv = () => { const env = { ...process.env }; const isolated = new Set(["init_cwd", "npm_config_local_prefix", "npm_config_workspace", "npm_config_workspaces", "npm_config_include_workspace_root", "npm_package_json", "npm_lifecycle_event", "npm_lifecycle_script"]); for (const key of Object.keys(env)) if (isolated.has(key.toLowerCase())) delete env[key]; env.INIT_CWD = neutralCwd; env.npm_config_local_prefix = neutralCwd; env.npm_config_workspaces = "false"; env.npm_config_include_workspace_root = "false"; return env; };',
     'const requestJson = async path => { const response = await fetch(new URL(path, healthBaseUrl), { cache: "no-store", signal: AbortSignal.timeout(Math.min(2000, healthTimeoutMs)) }); if (!response.ok) throw new Error(`HTTP ${response.status} from ${path}`); return response.json(); };',
     'const probeRemotePort = () => new Promise((resolve, reject) => { const socket = net.createConnection({ host: remoteHost, port: remotePort }); const timer = setTimeout(() => socket.destroy(new Error("TCP probe timed out")), Math.min(1500, healthTimeoutMs)); timer.unref?.(); socket.once("connect", () => { clearTimeout(timer); socket.destroy(); resolve(); }); socket.once("error", error => { clearTimeout(timer); reject(error); }); });',
     'const probeReplacement = async requiredVersion => { const [status, health] = await Promise.all([requestJson("/api/runtime/status"), requestJson("/api/health")]); const runtimePid = Number(status?.runtimePid || 0); if (status?.role !== "hub" || status?.runtimeStarted !== true || runtimePid <= 1) throw new Error("replacement runtime status is not ready"); if (previousRuntimePid > 1 && runtimePid === previousRuntimePid) throw new Error(`old runtime pid=${runtimePid} is still answering`); if (requiredVersion && String(status?.appVersion || "") !== requiredVersion) throw new Error(`version mismatch expected=${requiredVersion} actual=${status?.appVersion || "unknown"}`); if (health?.ok !== true || health?.product !== "LiveDesk") throw new Error("replacement health response is invalid"); await probeRemotePort(); return { runtimePid, appVersion: String(status?.appVersion || "") }; };',
@@ -1192,7 +1188,18 @@ async function runManager(args, resolvedRole = null) {
       || prepareUpdateNeutralCwd('hub', operationId)
     );
     const packageTarget = `livedesk@${requestedVersion}`;
-    const nextArgs = ['-y', '--prefer-online', packageTarget, '--force-role', 'hub', '--no-open', ...args];
+    const nextArgs = [
+      '-y',
+      '--prefer-online',
+      '--prefix',
+      neutralCwd,
+      '--workspaces=false',
+      packageTarget,
+      '--force-role',
+      'hub',
+      '--no-open',
+      ...args
+    ];
     const restartInvocation = resolveNpxInvocation(nextArgs);
     const fallbackInvocation = {
       command: process.execPath,

package/bootstrap/legacy-client-update.js

@@ -7,6 +7,7 @@ import {
   mkdirSync,
   openSync,
   readFileSync,
+  readdirSync,
   renameSync,
   rmSync,
   statSync,
@@ -138,18 +139,12 @@ function prepareNeutralCwd(cwd) {
   if (!configuredCwd) throw new Error('LiveDesk update neutral working directory is unavailable');
   const neutralCwd = resolve(configuredCwd);
   mkdirSync(neutralCwd, { recursive: true });
-  for (let ancestor = neutralCwd; ; ancestor = dirname(ancestor)) {
-    const shadowPath = [
-      join(ancestor, 'package.json'),
-      join(ancestor, 'node_modules', 'livedesk', 'package.json')
-    ].find(candidate => existsSync(candidate));
-    if (shadowPath) {
-      throw new Error(
-        `LiveDesk update neutral working directory is shadowed by ${shadowPath}: ${neutralCwd}`
-      );
-    }
-    const parent = dirname(ancestor);
-    if (parent === ancestor) break;
+  const unexpectedEntry = readdirSync(neutralCwd)[0];
+  if (unexpectedEntry) {
+    const shadowPath = join(neutralCwd, unexpectedEntry);
+    throw new Error(
+      `LiveDesk update neutral working directory is shadowed by ${shadowPath}: ${neutralCwd}`
+    );
   }
   return neutralCwd;
 }
@@ -171,10 +166,23 @@ export function buildLegacyClientUpdateNpxEnvironment(baseEnv, neutralCwd) {
   }
   env.INIT_CWD = neutralCwd;
   env.npm_config_local_prefix = neutralCwd;
+  env.npm_config_workspaces = 'false';
   env.npm_config_include_workspace_root = 'false';
   return env;
 }
 
+function buildExactNpxArgs(neutralCwd, preference, version, args = []) {
+  return [
+    '-y',
+    preference,
+    '--prefix',
+    neutralCwd,
+    '--workspaces=false',
+    `livedesk@${version}`,
+    ...args
+  ];
+}
+
 function positivePid(value) {
   const parsed = Number(value);
   return Number.isInteger(parsed) && parsed > 1 ? parsed : 0;
@@ -1011,11 +1019,11 @@ export function prefetchExactNpxRestore(config, env = process.env, options = {})
   if (!version) {
     throw new Error('LiveDesk cannot prefetch an exact restore without the current product version.');
   }
+  const neutralCwd = prepareNeutralCwd(config?.neutralCwd);
   const invocation = resolveNpxInvocation(
-    ['-y', '--prefer-online', `livedesk@${version}`, '--version'],
+    buildExactNpxArgs(neutralCwd, '--prefer-online', version, ['--version']),
     env
   );
-  const neutralCwd = prepareNeutralCwd(config?.neutralCwd);
   const result = (options.spawnSyncImpl || spawnSync)(
     invocation.command,
     invocation.args,
@@ -1067,12 +1075,12 @@ export function spawnReplacement(version, preference, env = process.env, restart
   const isLocalRestore = env.LIVEDESK_CLIENT_UPDATE_ATTEMPT_KIND === 'restore'
     && localRestoreLauncher
     && existsSync(localRestoreLauncher);
-  const invocation = isLocalRestore
-    ? { command: process.execPath, args: [localRestoreLauncher, ...roleArgs] }
-    : resolveNpxInvocation(['-y', preference, `livedesk@${version}`, ...roleArgs], env);
   const neutralCwd = isLocalRestore
     ? ''
     : prepareNeutralCwd(env.LIVEDESK_UPDATE_NEUTRAL_CWD);
+  const invocation = isLocalRestore
+    ? { command: process.execPath, args: [localRestoreLauncher, ...roleArgs] }
+    : resolveNpxInvocation(buildExactNpxArgs(neutralCwd, preference, version, roleArgs), env);
   const replacementEnv = isLocalRestore
     ? { ...env }
     : buildLegacyClientUpdateNpxEnvironment(env, neutralCwd);

package/client/bin/livedesk-client-node.js

@@ -58,16 +58,10 @@ function getClientUpdateNeutralCwd(operationId) {
 async function prepareClientUpdateNeutralCwd(operationId) {
     const neutralCwd = path.resolve(getClientUpdateNeutralCwd(operationId));
     await fs.mkdir(neutralCwd, { recursive: true });
-    for (let ancestor = neutralCwd; ; ancestor = path.dirname(ancestor)) {
-        const shadowPath = [
-            path.join(ancestor, 'package.json'),
-            path.join(ancestor, 'node_modules', 'livedesk', 'package.json')
-        ].find(candidate => existsSync(candidate));
-        if (shadowPath) {
-            throw new Error(`LiveDesk update neutral working directory is shadowed by ${shadowPath}: ${neutralCwd}`);
-        }
-        const parent = path.dirname(ancestor);
-        if (parent === ancestor) break;
+    const unexpectedEntry = (await fs.readdir(neutralCwd))[0];
+    if (unexpectedEntry) {
+        const shadowPath = path.join(neutralCwd, unexpectedEntry);
+        throw new Error(`LiveDesk update neutral working directory is shadowed by ${shadowPath}: ${neutralCwd}`);
     }
     return neutralCwd;
 }
@@ -89,6 +83,7 @@ function buildClientUpdateNpxEnvironment(baseEnv, neutralCwd) {
     }
     env.INIT_CWD = neutralCwd;
     env.npm_config_local_prefix = neutralCwd;
+    env.npm_config_workspaces = 'false';
     env.npm_config_include_workspace_root = 'false';
     return env;
 }
@@ -1583,13 +1578,13 @@ function buildClientUpdateBootstrapScript() {
         'const terminateTree = async child => { const pid = Number(child?.pid || 0); if (pid <= 1) return; if (process.platform === "win32") { await new Promise(resolve => { const killer = spawn("taskkill.exe", ["/PID", String(pid), "/T", "/F"], { windowsHide: true, stdio: "ignore" }); let done = false; const finish = () => { if (done) return; done = true; clearTimeout(timer); resolve(); }; const timer = setTimeout(() => { try { killer.kill("SIGKILL"); } catch {} finish(); }, 10000); killer.once("error", finish); killer.once("exit", finish); }); if (isAlive(pid)) { try { child.kill("SIGKILL"); } catch {} } return; } try { process.kill(-pid, "SIGTERM"); } catch { try { child.kill("SIGTERM"); } catch {} } const gracefulDeadline = Date.now() + 2000; while (Date.now() < gracefulDeadline && (isGroupAlive(pid) || isAlive(pid))) await sleep(100); if (isGroupAlive(pid) || isAlive(pid)) { try { process.kill(-pid, "SIGKILL"); } catch { try { child.kill("SIGKILL"); } catch {} } } };',
         'const writeHandoffStarted = () => withStateLock(() => { if (deadlineExpired()) throw new Error("The absolute LiveDesk Client update deadline expired before handoff."); const previous = readState(); if (previous.operationId !== operationId) throw new Error("LiveDesk update handoff was superseded before exact-package launch."); const now = new Date().toISOString(); const next = { ...previous, operationId, stage: "handoff-started", starterPid: process.pid, updateDeadlineEpochMs, restartVerified: false, error: "", updatedAt: now }; const temporary = statePath + "." + process.pid + ".handoff-started.tmp"; fs.writeFileSync(temporary, JSON.stringify(next, null, 2), { encoding: "utf8", mode: 0o600 }); fs.renameSync(temporary, statePath); });',
         'const monitorPreflight = child => { let settled = false; const finish = (error, preserveFailure = false) => { if (settled) return; settled = true; clearInterval(poll); clearTimeout(timeout); child.unref(); if (preserveFailure) process.exitCode = 1; else if (error) writeFailure(error); }; const inspect = () => { const state = readState(); if (state.operationId !== operationId) return; if (state.stage === "preflight-ready" || state.stage === "waiting-for-shutdown") finish(); else if (state.stage === "failed") finish(null, true); }; const cancelTimedOutHandoff = async () => { const error = new Error(deadlineExpired() ? "The absolute LiveDesk Client update deadline expired before exact-package preflight." : "Timed out waiting for exact-package update preflight."); while (!settled) { inspect(); if (settled) return; let outcome; try { outcome = writeCancellation(error); } catch (lockError) { finish(lockError); return; } if (outcome === "ready" || outcome === "failed") { inspect(); if (settled) return; } else if (outcome === "cancelled" || outcome === "superseded") { await terminateTree(child); finish(null, true); return; } await sleep(25); } }; const poll = setInterval(inspect, 100); const timeoutMs = Math.max(1, Math.min(Math.max(1000, Number(process.env.LIVEDESK_CLIENT_UPDATE_HANDOFF_TIMEOUT_MS || 140000)), updateDeadlineEpochMs - Date.now())); const timeout = setTimeout(() => { void cancelTimedOutHandoff(); }, timeoutMs); child.once("exit", (code, signal) => { inspect(); if (!settled) finish(new Error("Exact-package update supervisor exited before preflight (code=" + (code ?? "none") + ", signal=" + (signal || "none") + ").")); }); inspect(); };',
-        'const prepareNeutralCwd = () => { if (!neutralCwd) throw new Error("LiveDesk update neutral working directory is unavailable"); fs.mkdirSync(neutralCwd, { recursive: true }); for (let ancestor = neutralCwd; ; ancestor = path.dirname(ancestor)) { const shadow = [path.join(ancestor, "package.json"), path.join(ancestor, "node_modules", "livedesk", "package.json")].find(fs.existsSync); if (shadow) throw new Error("LiveDesk update neutral working directory is shadowed by " + shadow + ": " + neutralCwd); const parent = path.dirname(ancestor); if (parent === ancestor) break; } };',
+        'const prepareNeutralCwd = () => { if (!neutralCwd) throw new Error("LiveDesk update neutral working directory is unavailable"); fs.mkdirSync(neutralCwd, { recursive: true }); const unexpectedEntry = fs.readdirSync(neutralCwd)[0]; if (unexpectedEntry) { const shadow = path.join(neutralCwd, unexpectedEntry); throw new Error("LiveDesk update neutral working directory is shadowed by " + shadow + ": " + neutralCwd); } };',
         'if (!operationId || !versionPattern.test(targetProductVersion) || deadlineExpired()) { writeFailure(new Error("Invalid or expired LiveDesk exact-package update handoff."), true); } else { try { prepareNeutralCwd(); writeHandoffStarted();',
-        'const env = { ...process.env, LIVEDESK_UPDATE_STARTER_PID: String(process.pid) }; const isolated = new Set(["init_cwd", "npm_config_local_prefix", "npm_config_workspace", "npm_config_workspaces", "npm_config_include_workspace_root", "npm_package_json", "npm_lifecycle_event", "npm_lifecycle_script"]); for (const key of Object.keys(env)) if (isolated.has(key.toLowerCase())) delete env[key]; env.INIT_CWD = neutralCwd; env.npm_config_local_prefix = neutralCwd; env.npm_config_include_workspace_root = "false";',
+        'const env = { ...process.env, LIVEDESK_UPDATE_STARTER_PID: String(process.pid) }; const isolated = new Set(["init_cwd", "npm_config_local_prefix", "npm_config_workspace", "npm_config_workspaces", "npm_config_include_workspace_root", "npm_package_json", "npm_lifecycle_event", "npm_lifecycle_script"]); for (const key of Object.keys(env)) if (isolated.has(key.toLowerCase())) delete env[key]; env.INIT_CWD = neutralCwd; env.npm_config_local_prefix = neutralCwd; env.npm_config_workspaces = "false"; env.npm_config_include_workspace_root = "false";',
         'const nodeDir = path.dirname(process.execPath);',
         'const npxCli = [env.LIVEDESK_NPX_CLI_PATH, env.npm_execpath ? path.join(path.dirname(env.npm_execpath), "npx-cli.js") : "", env.LIVEDESK_NPX_EXECUTABLE ? path.join(path.dirname(env.LIVEDESK_NPX_EXECUTABLE), "node_modules", "npm", "bin", "npx-cli.js") : "", path.join(nodeDir, "node_modules", "npm", "bin", "npx-cli.js")].find(value => value && fs.existsSync(value));',
         'const npx = env.LIVEDESK_NPX_EXECUTABLE || (process.platform === "win32" ? "npx.cmd" : "npx");',
-        'const args = ["-y", "--prefer-online", "livedesk@" + targetProductVersion, "--internal-legacy-client-update"];',
+        'const args = ["-y", "--prefer-online", "--prefix", neutralCwd, "--workspaces=false", "livedesk@" + targetProductVersion, "--internal-legacy-client-update"];',
         'const quoteCmd = value => "\\"" + String(value).replaceAll("%", "%%").replaceAll("\\"", "\\"\\"") + "\\"";',
         'const invocation = npxCli ? { command: process.execPath, args: [npxCli, ...args] } : process.platform === "win32" ? { command: env.ComSpec || "cmd.exe", args: ["/d", "/s", "/c", "call " + quoteCmd(npx) + " " + args.map(quoteCmd).join(" ")] } : { command: npx, args };',
         'if (!npxCli && path.isAbsolute(npx) && !fs.existsSync(npx)) { writeFailure(new Error("LiveDesk npx executable was not found: " + npx)); } else { try { const child = spawn(invocation.command, invocation.args, { cwd: neutralCwd, env, detached: true, stdio: "ignore", windowsHide: true }); child.once("error", writeFailure); child.once("spawn", () => monitorPreflight(child)); } catch (error) { writeFailure(error); } }',

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.188",
+  "version": "0.1.190",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -41,10 +41,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.395",
-    "@livedesk/fast-osx-arm64": "0.1.395",
-    "@livedesk/fast-osx-x64": "0.1.395",
-    "@livedesk/fast-win-x64": "0.1.395"
+    "@livedesk/fast-linux-x64": "0.1.397",
+    "@livedesk/fast-osx-arm64": "0.1.397",
+    "@livedesk/fast-osx-x64": "0.1.397",
+    "@livedesk/fast-win-x64": "0.1.397"
   },
   "publishConfig": {
     "access": "public"

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

@@ -49,7 +49,20 @@ function normalizeAccountAvatarUrl(value) {
   }
 }
 
+function readAccessTokenProfile(accessToken) {
+  const token = normalizeString(accessToken, 8192);
+  const payloadSegment = token.split('.')[1] || '';
+  if (!payloadSegment) return {};
+  try {
+    const payload = JSON.parse(Buffer.from(payloadSegment, 'base64url').toString('utf8'));
+    return payload && typeof payload === 'object' ? payload : {};
+  } catch {
+    return {};
+  }
+}
+
 function readClientAccountProfile(sessionOrUser) {
+  const tokenProfile = readAccessTokenProfile(sessionOrUser?.access_token);
   const user = sessionOrUser?.user && typeof sessionOrUser.user === 'object'
     ? sessionOrUser.user
     : sessionOrUser && typeof sessionOrUser === 'object'
@@ -58,12 +71,19 @@ function readClientAccountProfile(sessionOrUser) {
   const metadata = user.user_metadata && typeof user.user_metadata === 'object'
     ? user.user_metadata
     : {};
-  const email = normalizeString(user.email, 320);
+  const tokenMetadata = tokenProfile.user_metadata && typeof tokenProfile.user_metadata === 'object'
+    ? tokenProfile.user_metadata
+    : {};
+  const email = normalizeString(user.email || tokenProfile.email, 320);
   const name = normalizeString(
     metadata.full_name
       || metadata.name
       || metadata.preferred_username
+      || tokenMetadata.full_name
+      || tokenMetadata.name
+      || tokenMetadata.preferred_username
       || user.name
+      || tokenProfile.name
       || email
       || user.id,
     160
@@ -71,6 +91,8 @@ function readClientAccountProfile(sessionOrUser) {
   const avatarUrl = normalizeAccountAvatarUrl(
     metadata.avatar_url
       || metadata.picture
+      || tokenMetadata.avatar_url
+      || tokenMetadata.picture
       || user.avatar_url
       || user.picture
   );
@@ -79,7 +101,11 @@ function readClientAccountProfile(sessionOrUser) {
 
 function mergeClientAccountProfile(session, sourceUser) {
   const profile = readClientAccountProfile(sourceUser);
+  const existingUserMetadata = session?.user?.user_metadata && typeof session.user.user_metadata === 'object'
+    ? session.user.user_metadata
+    : {};
   const userMetadata = {
+    ...existingUserMetadata,
     ...(profile.name ? { full_name: profile.name } : {}),
     ...(profile.avatarUrl ? { avatar_url: profile.avatarUrl } : {})
   };
@@ -1275,7 +1301,11 @@ export function createClientRuntimeServer(options = {}) {
           setImmediate(() => {
             void (async () => {
               try {
-                const normalizedSession = mergeClientAccountProfile(saved.session, savedSession?.user);
+                // Older persisted sessions kept only id/email on `user`, while
+                // Supabase still carries Google name/avatar claims in the
+                // access-token payload. Recover those display-only claims
+                // locally before any best-effort network hydration.
+                const normalizedSession = mergeClientAccountProfile(saved.session, savedSession);
                 const hydratedSession = await hydrateClientAccountProfile(normalizedSession);
                 if (!writeSavedSession(hydratedSession)) throw new Error('refresh-token-required');
                 state.auth.persisted = true;

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

@@ -71,7 +71,7 @@ function encodePowerShell(value) {
 
 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','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);let/**/t=w;for(;;t=p.dirname(t)){if(['package.json','node_modules/livedesk/package.json'].some(v=>f.existsSync(p.join(t,v))))process.exit(1);if(p.dirname(t)===t)break}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_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'),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});",
     "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.');

package/hub/src/remote-hub.js

@@ -685,7 +685,9 @@ function normalizeRemoteInputEvent(value = {}) {
     const captureGeneration = Number(input.captureGeneration ?? input.CaptureGeneration);
     return {
         type,
-        monitorIndex: Number.isFinite(monitorIndex) ? normalizeMonitorIndex(monitorIndex) : 0,
+        // A missing monitor is not equivalent to the primary display. Control
+        // input must prove the exact monitor owned by its capture generation.
+        monitorIndex: Number.isFinite(monitorIndex) ? normalizeMonitorIndex(monitorIndex) : null,
         normalizedX: Number.isFinite(normalizedX) ? Math.max(0, Math.min(1, normalizedX)) : undefined,
         normalizedY: Number.isFinite(normalizedY) ? Math.max(0, Math.min(1, normalizedY)) : undefined,
         button: safeString(input.button || input.Button, 24),
@@ -2144,9 +2146,12 @@ export function createRemoteHub(options = {}) {
             byteLength: frame.byteLength
         });
         streamState.latestFrame = frame;
-        streamState.lastFrameAt = frame.receivedAt;
-        streamState.lastFrameSeq = frame.frameSeq;
-        streamState.framesReceived = (streamState.framesReceived || 0) + 1;
+        streamState.lastFrameAt = frame.receivedAt;
+        streamState.lastFrameSeq = frame.frameSeq;
+        streamState.framesReceived = (streamState.framesReceived || 0) + 1;
+        // A synthetic PNG is a complete independently decodable surface and
+        // therefore key-frame equivalent for Control readiness.
+        streamState.readyFrameReceived = true;
         device.lastSeenAt = frame.receivedAt;
         device.counters.liveFramesReceived += 1;
         emitRemoteEvent('RemoteFrameReceived', device, {
@@ -3337,6 +3342,13 @@ export function createRemoteHub(options = {}) {
                 || result.InputType
                 || pending?.inputType,
                 48),
+            monitorIndex: Number(
+                message.monitorIndex
+                ?? message.MonitorIndex
+                ?? result.monitorIndex
+                ?? result.MonitorIndex
+                ?? pending?.monitorIndex
+                ?? 0) || 0,
             issuedAtEpochMs: Number(
                 message.issuedAtEpochMs
                 ?? message.IssuedAtEpochMs
@@ -3602,13 +3614,35 @@ export function createRemoteHub(options = {}) {
             : 0;
     }
 
-    function readFrameStageMs(message, property) {
-        const value = Number(message?.[property]);
-        return Number.isFinite(value) && value >= 0
-            ? Math.round(value)
-            : 0;
-    }
-
+    function readFrameStageMs(message, property) {
+        const value = Number(message?.[property]);
+        return Number.isFinite(value) && value >= 0
+            ? Math.round(value)
+            : 0;
+    }
+
+    function readOptionalFrameStageMs(message, property) {
+        const rawValue = message?.[property];
+        if (rawValue === undefined || rawValue === null || rawValue === '') {
+            return undefined;
+        }
+        const value = Number(rawValue);
+        return Number.isFinite(value) && value >= 0
+            ? Math.round(value)
+            : undefined;
+    }
+
+    function hasFrameCaptureTiming(message) {
+        if (message?.captureTimingAvailable === false) {
+            return false;
+        }
+        if (message?.captureTimingAvailable === true) {
+            return true;
+        }
+        return ['captureP95Ms', 'captureAverageMs', 'captureStageMs']
+            .some(property => readOptionalFrameStageMs(message, property) !== undefined);
+    }
+
     function computeSameContentStreak(previousFrame, contentHash) {
         if (!contentHash || !previousFrame?.contentHash || previousFrame.contentHash !== contentHash) {
             return 0;
@@ -3682,7 +3716,7 @@ export function createRemoteHub(options = {}) {
             byteLength,
             transport,
             contentHash,
-            captureMs: readFrameCaptureMs(message),
+            captureMs: readFrameCaptureMs(message),
             captureStageMs: readFrameStageMs(message, 'captureStageMs'),
             convertMs: readFrameStageMs(message, 'convertMs'),
             compressMs: readFrameStageMs(message, 'compressMs'),
@@ -3774,6 +3808,7 @@ export function createRemoteHub(options = {}) {
             lastFrameAt: '',
             lastFrameSeq: 0,
             framesReceived: 0,
+            readyFrameReceived: false,
             latestFrame: null,
             stoppedAt: '',
             stopReason: ''
@@ -3991,6 +4026,8 @@ export function createRemoteHub(options = {}) {
             && (activeCaptureGeneration <= 0
                 || (frameCaptureGeneration > 0
                     && frameCaptureGeneration === activeCaptureGeneration));
+        const readyFrameReceivedBeforeFrame = streamState.readyFrameReceived === true;
+        const captureTimingAvailable = hasFrameCaptureTiming(message);
         device.latestLiveFrame = {
             streamId,
             frameSeq,
@@ -4037,10 +4074,11 @@ export function createRemoteHub(options = {}) {
             transferProtocolVersion: transfer.transferProtocolVersion,
             handshake: transfer.handshake,
             fps: Number.isFinite(Number(message.fps)) ? Number(message.fps) : streamState.fps,
-            requestedFps: Number.isFinite(Number(message.requestedFps)) ? Number(message.requestedFps) : Number(streamState.fps || 0),
-            effectiveFps: Number.isFinite(Number(message.effectiveFps)) ? Number(message.effectiveFps) : Number(message.fps || streamState.fps || 0),
-            captureAverageMs: readFrameStageMs(message, 'captureAverageMs'),
-            captureP95Ms: readFrameStageMs(message, 'captureP95Ms'),
+            requestedFps: Number.isFinite(Number(message.requestedFps)) ? Number(message.requestedFps) : Number(streamState.fps || 0),
+            effectiveFps: Number.isFinite(Number(message.effectiveFps)) ? Number(message.effectiveFps) : Number(message.fps || streamState.fps || 0),
+            captureTimingAvailable,
+            captureAverageMs: captureTimingAvailable ? readOptionalFrameStageMs(message, 'captureAverageMs') : undefined,
+            captureP95Ms: captureTimingAvailable ? readOptionalFrameStageMs(message, 'captureP95Ms') : undefined,
             slowFrameCount: Number.isFinite(Number(message.slowFrameCount)) ? Number(message.slowFrameCount) : 0,
             captureHelperRestarts: Number.isFinite(Number(message.captureHelperRestarts)) ? Number(message.captureHelperRestarts) : 0,
             capturedAt,
@@ -4048,8 +4086,8 @@ export function createRemoteHub(options = {}) {
             byteLength,
             transport,
             contentHash,
-            captureMs: readFrameCaptureMs(message),
-            captureStageMs: readFrameStageMs(message, 'captureStageMs'),
+            captureMs: captureTimingAvailable ? readOptionalFrameStageMs(message, 'captureMs') : undefined,
+            captureStageMs: captureTimingAvailable ? readOptionalFrameStageMs(message, 'captureStageMs') : undefined,
             convertMs: readFrameStageMs(message, 'convertMs'),
             compressMs: readFrameStageMs(message, 'compressMs'),
             captureSourceSerial: Number.isFinite(Number(message.captureSourceSerial)) ? Number(message.captureSourceSerial) : 0,
@@ -4073,9 +4111,12 @@ export function createRemoteHub(options = {}) {
             mimeType: device.latestLiveFrame.mimeType,
             byteLength: device.latestLiveFrame.byteLength
         });
-        streamState.lastFrameAt = device.lastSeenAt;
-        streamState.lastFrameSeq = frameSeq;
-        streamState.framesReceived = (streamState.framesReceived || 0) + 1;
+        streamState.lastFrameAt = device.lastSeenAt;
+        streamState.lastFrameSeq = frameSeq;
+        streamState.framesReceived = (streamState.framesReceived || 0) + 1;
+        streamState.readyFrameReceived = readyFrameReceivedBeforeFrame
+            || (currentGenerationVerified
+                && liveFrameSatisfiesReadiness(streamState, device.latestLiveFrame));
         streamState.mode = transfer.mode;
         streamState.frameMode = transfer.frameMode;
         streamState.frameProfile = transfer.frameProfile;
@@ -4093,7 +4134,9 @@ export function createRemoteHub(options = {}) {
         streamState.monitorCount = device.latestLiveFrame.monitorCount;
         ensureDeviceLiveStreams(device).set(streamId, streamState);
         device.counters.liveFramesReceived += 1;
-        if (streamState.framesReceived === 1 && liveStreamHasCurrentFrame(streamState)) {
+        if (!readyFrameReceivedBeforeFrame
+            && streamState.readyFrameReceived === true
+            && liveStreamHasCurrentFrame(streamState)) {
             emitRemoteEvent('RemoteLiveStreamReady', device, {
                 streamId,
                 commandId: streamState.commandId,
@@ -5292,6 +5335,15 @@ export function createRemoteHub(options = {}) {
                 activeCaptureGeneration: Number(controlStream.captureGeneration || 0)
             };
         }
+        const activeMonitorIndex = normalizeMonitorIndex(controlStream.monitorIndex);
+        if (!Number.isInteger(normalized.monitorIndex)
+            || normalized.monitorIndex !== activeMonitorIndex) {
+            return {
+                ok: false,
+                error: 'STALE_CONTROL_MONITOR',
+                activeMonitorIndex
+            };
+        }
 
         const inputSocket = device.inputSocket;
         if (inputSocket && !inputSocket.destroyed) {
@@ -5311,7 +5363,8 @@ export function createRemoteHub(options = {}) {
                     inputSocket: true,
                     sessionId: device.sessionId,
                     commandId: controlStream.commandId,
-                    captureGeneration: controlStream.captureGeneration
+                    captureGeneration: controlStream.captureGeneration,
+                    monitorIndex: activeMonitorIndex
                 };
             }
 
@@ -5332,6 +5385,7 @@ export function createRemoteHub(options = {}) {
                 commandId: fallback.commandId,
                 inputSeq: normalized.inputSeq,
                 inputType: normalized.type,
+                monitorIndex: normalized.monitorIndex,
                 issuedAtEpochMs: normalized.issuedAtEpochMs,
                 hubReceivedAtEpochMs: normalized.hubReceivedAtEpochMs,
                 hubForwardedAtEpochMs,
@@ -5348,6 +5402,7 @@ export function createRemoteHub(options = {}) {
                 deliveryCommandId: fallback.commandId,
                 commandId: controlStream.commandId,
                 captureGeneration: controlStream.captureGeneration,
+                monitorIndex: activeMonitorIndex,
                 inputSeq: normalized.inputSeq
             }
             : {
@@ -5855,12 +5910,31 @@ export function createRemoteHub(options = {}) {
         return Number.isFinite(startedAt) && Date.now() - startedAt < LIVE_STREAM_REPLACEMENT_PENDING_MS;
     }
 
+    function liveStreamRequiresReadyKeyFrame(activeLiveStream) {
+        if (safeString(activeLiveStream?.streamPurpose, 24).toLowerCase() !== 'control') {
+            return false;
+        }
+        const codec = safeString(activeLiveStream?.codec, 80).toLowerCase();
+        const mode = safeString(activeLiveStream?.frameMode || activeLiveStream?.mode, 80).toLowerCase();
+        return codec.includes('h264') || mode === 'mode3-h264-hw';
+    }
+
+    function liveFrameSatisfiesReadiness(activeLiveStream, frame) {
+        return !liveStreamRequiresReadyKeyFrame(activeLiveStream)
+            || frame?.isKeyFrame === true
+            || safeString(frame?.chunkType, 20).toLowerCase() === 'key';
+    }
+
     function liveStreamHasCurrentFrame(activeLiveStream) {
         if (!activeLiveStream?.active
             || activeLiveStream.open !== true
             || Number(activeLiveStream.framesReceived || 0) < 1) {
             return false;
         }
+        if (liveStreamRequiresReadyKeyFrame(activeLiveStream)
+            && activeLiveStream.readyFrameReceived !== true) {
+            return false;
+        }
         const latestFrame = activeLiveStream.latestFrame;
         if (!latestFrame || latestFrame.currentGenerationVerified !== true) {
             return false;
@@ -5984,6 +6058,7 @@ export function createRemoteHub(options = {}) {
                 lastFrameAt: '',
                 lastFrameSeq: 0,
                 framesReceived: 0,
+                readyFrameReceived: false,
                 streamPurpose,
                 captureGeneration
             });
@@ -6201,8 +6276,9 @@ export function createRemoteHub(options = {}) {
             stoppedAt: '',
             stopReason: '',
             lastFrameAt: '',
-            lastFrameSeq: 0,
+            lastFrameSeq: 0,
             framesReceived: 0,
+            readyFrameReceived: false,
             streamPurpose,
             captureGeneration,
             latestFrame: null,

package/hub/src/server.js

@@ -2045,8 +2045,13 @@ function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
     fps: Number(frame.fps || 0) || 0,
     requestedFps: Number(frame.requestedFps || 0) || 0,
     effectiveFps: Number(frame.effectiveFps || 0) || 0,
-    captureAverageMs: Number(frame.captureAverageMs || 0) || 0,
-    captureP95Ms: Number(frame.captureP95Ms || 0) || 0,
+    captureTimingAvailable: frame.captureTimingAvailable === true,
+    captureAverageMs: frame.captureTimingAvailable === true && Number.isFinite(Number(frame.captureAverageMs))
+      ? Number(frame.captureAverageMs)
+      : null,
+    captureP95Ms: frame.captureTimingAvailable === true && Number.isFinite(Number(frame.captureP95Ms))
+      ? Number(frame.captureP95Ms)
+      : null,
     slowFrameCount: Number(frame.slowFrameCount || 0) || 0,
     captureHelperRestarts: Number(frame.captureHelperRestarts || 0) || 0,
     capturedAt: frame.capturedAt || '',
@@ -2055,8 +2060,12 @@ function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
     hubPacketEpochMs,
     byteLength: Number(frameEvent.byteLength || payload.length) || payload.length,
     contentHash: frame.contentHash || '',
-    captureMs: Number(frame.captureMs || 0) || 0,
-    captureStageMs: Number(frame.captureStageMs || 0) || 0,
+    captureMs: frame.captureTimingAvailable === true && Number.isFinite(Number(frame.captureMs))
+      ? Number(frame.captureMs)
+      : null,
+    captureStageMs: frame.captureTimingAvailable === true && Number.isFinite(Number(frame.captureStageMs))
+      ? Number(frame.captureStageMs)
+      : null,
     convertMs: Number(frame.convertMs || 0) || 0,
     compressMs: Number(frame.compressMs || 0) || 0,
     captureSourceSerial: Number(frame.captureSourceSerial || 0) || 0,
@@ -2157,7 +2166,8 @@ function broadcastRemoteBinaryFrame(frameEvent) {
       || Number(frame.monitorIndex || 0) !== expectedBinding.monitorIndex) {
       continue;
     }
-    if (!expectedBinding.readySent) {
+    const requiresReadyKeyFrame = String(expectedBinding.streamPurpose || '').toLowerCase() === 'control' && isH264;
+    if (!expectedBinding.readySent && (!requiresReadyKeyFrame || isKeyFrame)) {
       expectedBinding.readySent = sendJson(client, {
         type: 'RemoteFrameStreamReady',
         deviceId,