livedesk 0.1.501 → 0.1.503

package/bin/livedesk.js

@@ -31,16 +31,16 @@ import {
   isKnownLiveDeskCaptureHelperProcess,
   isKnownLiveDeskClientAgentProcess
 } from '../bootstrap/client-process-identity.js';
-import { runLegacyClientUpdateSupervisorCli } from '../bootstrap/legacy-client-update.js';
-import { transferSavedClientSessionToHub } from '../bootstrap/hub-auth-handoff.js';
-import {
-  buildUpdateHostWorkerEnvironment,
-  cancelUpdateHostJob,
-  ensureUpdateHost,
-  getUpdateHostJob,
-  submitUpdateHostJob,
-  updateHostEnvironment
-} from '../bootstrap/update-host-client.mjs';
+import { runLegacyClientUpdateSupervisorCli } from '../bootstrap/legacy-client-update.js';
+import { transferSavedClientSessionToHub } from '../bootstrap/hub-auth-handoff.js';
+import {
+  buildUpdateHostWorkerEnvironment,
+  cancelUpdateHostJob,
+  ensureUpdateHost,
+  getUpdateHostJob,
+  submitUpdateHostJob,
+  updateHostEnvironment
+} from '../bootstrap/update-host-client.mjs';
 import {
   consumeDeadWindowsOwnedProcessManifest,
   readDeadWindowsOwnedProcessManifest,
@@ -228,80 +228,80 @@ function readBoundedMilliseconds(value, fallback, minimum = 1) {
   return Number.isFinite(parsed) && parsed >= minimum ? Math.round(parsed) : fallback;
 }
 
-async function cancelUnclaimedHubUpdateHostJob(updateHost, jobId, reason) {
-  try {
-    await cancelUpdateHostJob(updateHost, jobId, reason);
-  } catch (error) {
-    const job = await getUpdateHostJob(updateHost, jobId).catch(() => null);
-    if (job && ['accepted', 'running', 'cancelling'].includes(String(job.state || ''))) {
-      throw new Error(
-        `Update Host job ${jobId} could not be cancelled: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-}
-
-async function waitForHubRestartUpdateHostClaim(updateHost, jobId, expected) {
-  const claimDeadline = Date.now() + expected.timeoutMs;
-  let matchingClaimSince = 0;
-  let workerPid = 0;
-  while (Date.now() < claimDeadline) {
-    const job = await getUpdateHostJob(updateHost, jobId, {
-      timeoutMs: Math.min(2_000, Math.max(250, claimDeadline - Date.now()))
-    });
-    if (!job) {
-      throw new Error(`LiveDesk Update Host lost job ${jobId} before handoff.`);
-    }
-    if (['failed', 'cancelled'].includes(String(job.state || ''))) {
-      throw new Error(
-        `LiveDesk Update Host job ${jobId} failed before handoff: ${job.error || `state=${job.state}`}`
-      );
-    }
-    workerPid = Number(job.workerPid || 0);
-    const claim = readJsonFile(expected.resultPath);
-    if (
-      job.state === 'running'
-      && workerPid > 1
-      && claim?.operationId === expected.operationId
-      && claim?.stage === 'waiting-for-old-launcher'
-      && claim?.outcome === 'in-progress'
-      && Number(claim?.supervisorPid || 0) === workerPid
-      && Number(claim?.launcherPid || 0) === expected.launcherPid
-      && claim?.targetVersion === expected.targetVersion
-      && claim?.handoffToken === expected.handoffToken
-    ) {
-      if (!matchingClaimSince) matchingClaimSince = Date.now();
-      if (Date.now() - matchingClaimSince >= expected.stabilityMs) {
-        await delay(HUB_UPDATE_SUPERVISOR_HANDSHAKE_POLL_MS);
-        const stableJob = await getUpdateHostJob(updateHost, jobId, { timeoutMs: 2_000 });
-        const stableClaim = readJsonFile(expected.resultPath);
-        if (
-          stableJob?.state === 'running'
-          && Number(stableJob?.workerPid || 0) === workerPid
-          && stableClaim?.operationId === expected.operationId
-          && stableClaim?.stage === 'waiting-for-old-launcher'
-          && stableClaim?.outcome === 'in-progress'
-          && Number(stableClaim?.supervisorPid || 0) === workerPid
-          && Number(stableClaim?.launcherPid || 0) === expected.launcherPid
-          && stableClaim?.targetVersion === expected.targetVersion
-          && stableClaim?.handoffToken === expected.handoffToken
-        ) {
-          return stableClaim;
-        }
-        matchingClaimSince = 0;
-      }
-    } else {
-      matchingClaimSince = 0;
-    }
-    await delay(Math.max(50, HUB_UPDATE_SUPERVISOR_HANDSHAKE_POLL_MS));
-  }
-  throw new Error(
-    `LiveDesk Update Host job ${jobId} did not publish an atomic handoff for `
-    + `operation ${expected.operationId} within ${expected.timeoutMs}ms.`
-  );
-}
-
-function writeJsonAtomic(filePath, value) {
+async function cancelUnclaimedHubUpdateHostJob(updateHost, jobId, reason) {
+  try {
+    await cancelUpdateHostJob(updateHost, jobId, reason);
+  } catch (error) {
+    const job = await getUpdateHostJob(updateHost, jobId).catch(() => null);
+    if (job && ['accepted', 'running', 'cancelling'].includes(String(job.state || ''))) {
+      throw new Error(
+        `Update Host job ${jobId} could not be cancelled: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+}
+
+async function waitForHubRestartUpdateHostClaim(updateHost, jobId, expected) {
+  const claimDeadline = Date.now() + expected.timeoutMs;
+  let matchingClaimSince = 0;
+  let workerPid = 0;
+  while (Date.now() < claimDeadline) {
+    const job = await getUpdateHostJob(updateHost, jobId, {
+      timeoutMs: Math.min(2_000, Math.max(250, claimDeadline - Date.now()))
+    });
+    if (!job) {
+      throw new Error(`LiveDesk Update Host lost job ${jobId} before handoff.`);
+    }
+    if (['failed', 'cancelled'].includes(String(job.state || ''))) {
+      throw new Error(
+        `LiveDesk Update Host job ${jobId} failed before handoff: ${job.error || `state=${job.state}`}`
+      );
+    }
+    workerPid = Number(job.workerPid || 0);
+    const claim = readJsonFile(expected.resultPath);
+    if (
+      job.state === 'running'
+      && workerPid > 1
+      && claim?.operationId === expected.operationId
+      && claim?.stage === 'waiting-for-old-launcher'
+      && claim?.outcome === 'in-progress'
+      && Number(claim?.supervisorPid || 0) === workerPid
+      && Number(claim?.launcherPid || 0) === expected.launcherPid
+      && claim?.targetVersion === expected.targetVersion
+      && claim?.handoffToken === expected.handoffToken
+    ) {
+      if (!matchingClaimSince) matchingClaimSince = Date.now();
+      if (Date.now() - matchingClaimSince >= expected.stabilityMs) {
+        await delay(HUB_UPDATE_SUPERVISOR_HANDSHAKE_POLL_MS);
+        const stableJob = await getUpdateHostJob(updateHost, jobId, { timeoutMs: 2_000 });
+        const stableClaim = readJsonFile(expected.resultPath);
+        if (
+          stableJob?.state === 'running'
+          && Number(stableJob?.workerPid || 0) === workerPid
+          && stableClaim?.operationId === expected.operationId
+          && stableClaim?.stage === 'waiting-for-old-launcher'
+          && stableClaim?.outcome === 'in-progress'
+          && Number(stableClaim?.supervisorPid || 0) === workerPid
+          && Number(stableClaim?.launcherPid || 0) === expected.launcherPid
+          && stableClaim?.targetVersion === expected.targetVersion
+          && stableClaim?.handoffToken === expected.handoffToken
+        ) {
+          return stableClaim;
+        }
+        matchingClaimSince = 0;
+      }
+    } else {
+      matchingClaimSince = 0;
+    }
+    await delay(Math.max(50, HUB_UPDATE_SUPERVISOR_HANDSHAKE_POLL_MS));
+  }
+  throw new Error(
+    `LiveDesk Update Host job ${jobId} did not publish an atomic handoff for `
+    + `operation ${expected.operationId} within ${expected.timeoutMs}ms.`
+  );
+}
+
+function writeJsonAtomic(filePath, value) {
   if (!filePath) return;
   mkdirSync(dirname(filePath), { recursive: true });
   const previous = readJsonFile(filePath);
@@ -2445,7 +2445,7 @@ function buildHubRestartBootstrapScript() {
   ].join('\n');
 }
 
-async function runManager(args, resolvedRole = null, runtimeLock = null, updateHost = null) {
+async function runManager(args, resolvedRole = null, runtimeLock = null, updateHost = null) {
   const runtimeOwner = runtimeLock?.payload || null;
   const options = parseManagerArgs(args);
   const httpPort = normalizePort(
@@ -2493,7 +2493,7 @@ async function runManager(args, resolvedRole = null, runtimeLock = null, updateH
     LIVEDESK_HUB_HTTP_PORT: String(httpPort),
     LIVEDESK_MANAGER_VERSION: readVersion(),
     LIVEDESK_CLIENT_PACKAGE_VERSION: readClientVersion(),
-    LIVEDESK_HUB_UPDATE_REQUEST_PATH: updateHost?.available ? updateRequestPath : '',
+    LIVEDESK_HUB_UPDATE_REQUEST_PATH: updateHost?.available ? updateRequestPath : '',
     LIVEDESK_HUB_UPDATE_RESULT_PATH: hubUpdateResultPath,
     LIVEDESK_UDP_ENABLED: String(process.env.LIVEDESK_UDP_ENABLED || '1'),
     LIVEDESK_UDP_PREFER_P2P: String(process.env.LIVEDESK_UDP_PREFER_P2P || '0'),
@@ -2621,10 +2621,10 @@ async function runManager(args, resolvedRole = null, runtimeLock = null, updateH
     process.on(signal, handler);
   }
 
-  const restartWithLatest = async request => {
-    if (!updateHost?.available) {
-      throw new Error('The independent LiveDesk Update Host is unavailable. The unchanged Hub remains running.');
-    }
+  const restartWithLatest = async request => {
+    if (!updateHost?.available) {
+      throw new Error('The independent LiveDesk Update Host is unavailable. The unchanged Hub remains running.');
+    }
     const requestedVersion = normalizeExactUpdateVersion(request?.latestVersion);
     if (!requestedVersion) {
       throw new Error('The Hub update target version must be one exact semantic version.');
@@ -2641,9 +2641,9 @@ async function runManager(args, resolvedRole = null, runtimeLock = null, updateH
     );
     const packageTarget = `livedesk@${requestedVersion}`;
     const nextArgs = [
-      '-y',
-      '--prefer-offline',
-      '--prefix',
+      '-y',
+      '--prefer-offline',
+      '--prefix',
       neutralCwd,
       '--workspaces=false',
       packageTarget,
@@ -2681,82 +2681,82 @@ async function runManager(args, resolvedRole = null, runtimeLock = null, updateH
       reportLauncherUpdate(`[LiveDesk Hub] Could not persist the restart supervisor state: ${error instanceof Error ? error.message : String(error)}.`, true);
       throw error;
     }
-    const workerEnvironment = buildUpdateHostWorkerEnvironment(process.env, {
-      LIVEDESK_RESTART_WAIT_PID: String(process.pid),
-      LIVEDESK_RESTART_PREVIOUS_RUNTIME_PID: String(request?.pid || 0),
-      LIVEDESK_RESTART_OPERATION_ID: operationId,
-      LIVEDESK_RESTART_STARTED_AT: restartStartedAt,
-      LIVEDESK_RESTART_HANDOFF_TOKEN: handoffToken,
-      LIVEDESK_RESTART_RESULT_PATH: hubUpdateResultPath,
-      LIVEDESK_RESTART_COMMAND: restartInvocation.command,
-      LIVEDESK_RESTART_ARGS_BASE64: Buffer.from(JSON.stringify(restartInvocation.args), 'utf8').toString('base64'),
-      LIVEDESK_RESTART_FALLBACK_COMMAND: fallbackInvocation.command,
-      LIVEDESK_RESTART_FALLBACK_ARGS_BASE64: Buffer.from(JSON.stringify(fallbackInvocation.args), 'utf8').toString('base64'),
-      LIVEDESK_RESTART_EXPECTED_VERSION: requestedVersion,
-      LIVEDESK_RESTART_FALLBACK_VERSION: readVersion(),
-      LIVEDESK_RESTART_HEALTH_URL: hubProbeBaseUrl,
-      LIVEDESK_RESTART_REMOTE_HOST: '127.0.0.1',
-      LIVEDESK_RESTART_REMOTE_PORT: String(remotePort),
-      LIVEDESK_RESTART_NEUTRAL_CWD: neutralCwd,
-      LIVEDESK_RESTART_FALLBACK_CWD: originalCwd,
-      LIVEDESK_UPDATE_ORIGINAL_CWD: originalCwd,
-      LIVEDESK_RESTART_LOG_PATH: hubLogPath
-    });
-    const hostJobId = `hub-${safeUpdatePathSegment(operationId)}`;
-    let hostJob;
-    try {
-      const submitted = await submitUpdateHostJob(updateHost, {
-        jobId: hostJobId,
-        kind: 'hub-update',
-        operationId,
-        command: process.execPath,
-        args: ['-e', buildHubRestartBootstrapScript()],
-        cwd: neutralCwd,
-        env: workerEnvironment,
-        resultPath: hubUpdateResultPath,
-        requestedAt: restartStartedAt,
-        expiresAt: new Date(Date.parse(restartStartedAt) + 90 * 60_000).toISOString()
-      }, { timeoutMs: handshakeTimeoutMs });
-      hostJob = submitted?.job || null;
-      if (!hostJob || Number(hostJob.workerPid || 0) <= 1) {
-        throw new Error('LiveDesk Update Host accepted the request without a worker identity.');
-      }
-    } catch (error) {
-      throw new Error(`LiveDesk Update Host rejected the Hub replacement: ${error instanceof Error ? error.message : String(error)}`);
-    }
-    try {
-      await waitForHubRestartUpdateHostClaim(updateHost, hostJobId, {
-        operationId,
-        targetVersion: requestedVersion,
-        resultPath: hubUpdateResultPath,
+    const workerEnvironment = buildUpdateHostWorkerEnvironment(process.env, {
+      LIVEDESK_RESTART_WAIT_PID: String(process.pid),
+      LIVEDESK_RESTART_PREVIOUS_RUNTIME_PID: String(request?.pid || 0),
+      LIVEDESK_RESTART_OPERATION_ID: operationId,
+      LIVEDESK_RESTART_STARTED_AT: restartStartedAt,
+      LIVEDESK_RESTART_HANDOFF_TOKEN: handoffToken,
+      LIVEDESK_RESTART_RESULT_PATH: hubUpdateResultPath,
+      LIVEDESK_RESTART_COMMAND: restartInvocation.command,
+      LIVEDESK_RESTART_ARGS_BASE64: Buffer.from(JSON.stringify(restartInvocation.args), 'utf8').toString('base64'),
+      LIVEDESK_RESTART_FALLBACK_COMMAND: fallbackInvocation.command,
+      LIVEDESK_RESTART_FALLBACK_ARGS_BASE64: Buffer.from(JSON.stringify(fallbackInvocation.args), 'utf8').toString('base64'),
+      LIVEDESK_RESTART_EXPECTED_VERSION: requestedVersion,
+      LIVEDESK_RESTART_FALLBACK_VERSION: readVersion(),
+      LIVEDESK_RESTART_HEALTH_URL: hubProbeBaseUrl,
+      LIVEDESK_RESTART_REMOTE_HOST: '127.0.0.1',
+      LIVEDESK_RESTART_REMOTE_PORT: String(remotePort),
+      LIVEDESK_RESTART_NEUTRAL_CWD: neutralCwd,
+      LIVEDESK_RESTART_FALLBACK_CWD: originalCwd,
+      LIVEDESK_UPDATE_ORIGINAL_CWD: originalCwd,
+      LIVEDESK_RESTART_LOG_PATH: hubLogPath
+    });
+    const hostJobId = `hub-${safeUpdatePathSegment(operationId)}`;
+    let hostJob;
+    try {
+      const submitted = await submitUpdateHostJob(updateHost, {
+        jobId: hostJobId,
+        kind: 'hub-update',
+        operationId,
+        command: process.execPath,
+        args: ['-e', buildHubRestartBootstrapScript()],
+        cwd: neutralCwd,
+        env: workerEnvironment,
+        resultPath: hubUpdateResultPath,
+        requestedAt: restartStartedAt,
+        expiresAt: new Date(Date.parse(restartStartedAt) + 90 * 60_000).toISOString()
+      }, { timeoutMs: handshakeTimeoutMs });
+      hostJob = submitted?.job || null;
+      if (!hostJob || Number(hostJob.workerPid || 0) <= 1) {
+        throw new Error('LiveDesk Update Host accepted the request without a worker identity.');
+      }
+    } catch (error) {
+      throw new Error(`LiveDesk Update Host rejected the Hub replacement: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    try {
+      await waitForHubRestartUpdateHostClaim(updateHost, hostJobId, {
+        operationId,
+        targetVersion: requestedVersion,
+        resultPath: hubUpdateResultPath,
         launcherPid: process.pid,
         handoffToken,
         timeoutMs: handshakeTimeoutMs,
         stabilityMs: HUB_UPDATE_SUPERVISOR_CLAIM_STABILITY_MS
       });
-    } catch (handshakeError) {
-      let stopError = null;
-      try {
-        await cancelUnclaimedHubUpdateHostJob(updateHost, hostJobId, 'Hub handoff was not proven.');
-      } catch (error) {
-        stopError = error;
-      }
+    } catch (handshakeError) {
+      let stopError = null;
+      try {
+        await cancelUnclaimedHubUpdateHostJob(updateHost, hostJobId, 'Hub handoff was not proven.');
+      } catch (error) {
+        stopError = error;
+      }
       const error = new Error(
         `Hub restart supervisor handoff failed: `
         + `${handshakeError instanceof Error ? handshakeError.message : String(handshakeError)}`
         + `${stopError ? ` ${stopError.message}` : ''}`
       );
-      error.supervisorPid = Number(hostJob?.workerPid || 0);
-      error.updateHostPid = Number(updateHost?.host?.pid || 0);
-      error.handoffToken = handoffToken;
-      error.handoffCancelled = true;
-      throw error;
-    }
-    reportLauncherUpdate(
-      `[LiveDesk Hub] Update handoff claimed target=${requestedVersion} `
-      + `updateHostPid=${updateHost.host?.pid || 0} workerPid=${hostJob.workerPid || 0} operation=${operationId}. `
-      + `The current launcher will now exit. Restart diagnostics: ${hubLogPath}`
-    );
+      error.supervisorPid = Number(hostJob?.workerPid || 0);
+      error.updateHostPid = Number(updateHost?.host?.pid || 0);
+      error.handoffToken = handoffToken;
+      error.handoffCancelled = true;
+      throw error;
+    }
+    reportLauncherUpdate(
+      `[LiveDesk Hub] Update handoff claimed target=${requestedVersion} `
+      + `updateHostPid=${updateHost.host?.pid || 0} workerPid=${hostJob.workerPid || 0} operation=${operationId}. `
+      + `The current launcher will now exit. Restart diagnostics: ${hubLogPath}`
+    );
     process.exit(0);
   };
 
@@ -3034,19 +3034,22 @@ async function runManager(args, resolvedRole = null, runtimeLock = null, updateH
   updatePollId = setInterval(pollUpdateRequest, HUB_UPDATE_POLL_MS);
 
   const hubReady = waitForManager(hubProbeBaseUrl);
-  const hubStartup = hubReady.then(async ok => {
+  const hubStartup = hubReady.then(ok => {
     if (!ok) {
       return false;
     }
-    const handoff = await transferSavedClientSessionToHub(hubProbeBaseUrl, MANAGER_STATE_DIR);
-    if (handoff.ok) {
-      reportLauncherUpdate('[LiveDesk Hub] Saved Client sign-in adopted by the Hub.');
-      if (!handoff.hostTargetOk) {
-        reportLauncherUpdate('[LiveDesk Hub] Sign-in was adopted; host publication will continue through lease renewal.', true);
+    void transferSavedClientSessionToHub(hubProbeBaseUrl, MANAGER_STATE_DIR).then(handoff => {
+      if (handoff.ok) {
+        reportLauncherUpdate('[LiveDesk Hub] Saved Client sign-in adopted by the Hub.');
+        if (!handoff.hostTargetOk) {
+          reportLauncherUpdate('[LiveDesk Hub] Sign-in was adopted; host publication will continue through lease renewal.', true);
+        }
+      } else if (!handoff.skipped) {
+        reportLauncherUpdate(`[LiveDesk Hub] Saved Client sign-in could not be adopted: ${handoff.reason}. Continue sign-in in the Hub page.`, true);
       }
-    } else if (!handoff.skipped) {
-      reportLauncherUpdate(`[LiveDesk Hub] Saved Client sign-in could not be adopted: ${handoff.reason}. Continue sign-in in the Hub page.`, true);
-    }
+    }).catch(error => {
+      reportLauncherUpdate(`[LiveDesk Hub] Saved Client sign-in could not be adopted: ${error instanceof Error ? error.message : String(error)}. Continue sign-in in the Hub page.`, true);
+    });
     return true;
   });
 
@@ -3285,30 +3288,30 @@ async function main() {
       });
     }
   }
-  if (!lock.acquired) {
-    reportExistingRuntime(lock.existing || { role: resolvedRole.role, pid: 'unknown' });
-    return;
-  }
-  process.once('exit', lock.release);
-
-  const updateHost = await ensureUpdateHost({
-    stateDir: MANAGER_STATE_DIR,
-    entryPath: resolve(packageRoot, 'bootstrap', 'update-host.mjs'),
-    sourceVersion: readVersion(),
-    env: process.env
-  });
-  Object.assign(process.env, updateHostEnvironment(updateHost));
-  if (updateHost.available) {
-    console.log(
-      `[LiveDesk] Independent Update Host ready pid=${updateHost.host?.pid || 'unknown'} `
-      + `source=${updateHost.host?.sourceVersion || readVersion()}.`
-    );
-  } else if (!updateHost.disabled) {
-    console.warn(
-      `[LiveDesk] Independent Update Host is unavailable; updates are disabled for this run: `
-      + `${updateHost.error || 'unknown error'}`
-    );
-  }
+  if (!lock.acquired) {
+    reportExistingRuntime(lock.existing || { role: resolvedRole.role, pid: 'unknown' });
+    return;
+  }
+  process.once('exit', lock.release);
+
+  const updateHost = await ensureUpdateHost({
+    stateDir: MANAGER_STATE_DIR,
+    entryPath: resolve(packageRoot, 'bootstrap', 'update-host.mjs'),
+    sourceVersion: readVersion(),
+    env: process.env
+  });
+  Object.assign(process.env, updateHostEnvironment(updateHost));
+  if (updateHost.available) {
+    console.log(
+      `[LiveDesk] Independent Update Host ready pid=${updateHost.host?.pid || 'unknown'} `
+      + `source=${updateHost.host?.sourceVersion || readVersion()}.`
+    );
+  } else if (!updateHost.disabled) {
+    console.warn(
+      `[LiveDesk] Independent Update Host is unavailable; updates are disabled for this run: `
+      + `${updateHost.error || 'unknown error'}`
+    );
+  }
 
   // Only the contender that won the replacement lock may clean residual
   // listener ports. A simultaneous losing launcher must never kill the newly
@@ -3352,16 +3355,16 @@ async function main() {
     await runClient(runtimeArgs, resolvedRole, lock);
     return;
   }
-  if (command === 'hub' || command === 'manager') {
-    await runManager(runtimeArgs, resolvedRole, lock, updateHost);
+  if (command === 'hub' || command === 'manager') {
+    await runManager(runtimeArgs, resolvedRole, lock, updateHost);
     return;
   }
   if (resolvedRole.role === 'client') {
     await runClient(runtimeArgs, resolvedRole, lock);
     return;
   }
-  await runManager(runtimeArgs, resolvedRole, lock, updateHost);
-}
+  await runManager(runtimeArgs, resolvedRole, lock, updateHost);
+}
 
 main().catch(error => {
   console.error(error?.message || error);

package/bootstrap/client-process-identity.js

@@ -1,74 +1,74 @@
-function firstCommandArgument(commandLine) {
-  const value = String(commandLine || '').trim();
-  if (!value) return '';
-  const quote = value[0] === '"' || value[0] === "'" ? value[0] : '';
-  if (!quote) return value.split(/\s+/, 1)[0] || '';
-  const end = value.indexOf(quote, 1);
-  return end > 0 ? value.slice(1, end) : '';
-}
-
-function normalizeExecutablePath(value) {
-  return String(value || '').trim().replaceAll('\\', '/').replace(/\s+\(deleted\)$/i, '');
-}
-
-const BUNDLED_FAST_ROOT = '(?:node_modules/(?:livedesk/client|@livedesk/client)|packages/(?:livedesk/client|client))/fast/[^/\\s]+';
-const OPTIONAL_FAST_ROOT = 'node_modules/@livedesk/fast-(?:linux-x64|osx-arm64|osx-x64|win-x64)/fast';
-const FAST_ROOT = `(?:${BUNDLED_FAST_ROOT}|${OPTIONAL_FAST_ROOT})`;
-const KNOWN_FAST_EXECUTABLE_PATH = new RegExp(`${FAST_ROOT}/livedesk-client-fast(?:\\.exe)?$`, 'i');
-
-export function isKnownLiveDeskClientAgentProcess(processName, commandLine, executablePath = '') {
-  const normalizedName = String(processName || '').trim().replaceAll('\\', '/').split('/').pop() || '';
-  const normalizedCommandLine = String(commandLine || '').replaceAll('\\', '/');
-  const isNode = /^(?:node|node\.exe)$/i.test(normalizedName);
-  const isDotnet = /^(?:dotnet|dotnet\.exe)$/i.test(normalizedName);
-  const isFast = /^livedesk-client-fast(?:\.exe)?$/i.test(normalizedName);
-  // Linux TASK_COMM_LEN exposes a 15-character `comm`, so the native apphost
-  // appears as `livedesk-client`. Accept that truncated name only when an
-  // independently resolved executable path, or argv[0], proves the canonical
-  // packaged LiveDesk Fast binary. A matching path elsewhere in argv is not
-  // sufficient.
-  const isTruncatedLinuxFast = /^livedesk-client$/i.test(normalizedName);
-  const isKnownNodeAgent = /(?:node_modules\/(?:livedesk\/client|@livedesk\/client)|packages\/(?:livedesk\/client|client))\/bin\/livedesk-client-node\.js(?:\s|["']|$)/i.test(normalizedCommandLine);
-  const isKnownFastExecutable = new RegExp(
-    `${FAST_ROOT}/livedesk-client-fast(?:\\.exe)?(?:\\s|["']|$)`,
-    'i'
-  ).test(normalizedCommandLine);
-  const isKnownFastDll = new RegExp(
-    `${FAST_ROOT}/livedesk-client-fast\\.dll(?:\\s|["']|$)`,
-    'i'
-  ).test(normalizedCommandLine);
-  const resolvedExecutable = normalizeExecutablePath(executablePath);
-  const argvExecutable = normalizeExecutablePath(firstCommandArgument(normalizedCommandLine));
-  const hasStrictFastExecutableProof = KNOWN_FAST_EXECUTABLE_PATH.test(resolvedExecutable)
-    || KNOWN_FAST_EXECUTABLE_PATH.test(argvExecutable);
-  return (isNode && isKnownNodeAgent)
-    || (isFast && isKnownFastExecutable)
-    || (isTruncatedLinuxFast && hasStrictFastExecutableProof)
-    || (isDotnet && isKnownFastDll);
-}
-
-export function isKnownLiveDeskCaptureHelperProcess(processName, commandLine, executablePath = '') {
-  const normalizedName = String(processName || '').trim().replaceAll('\\', '/').split('/').pop() || '';
-  const normalizedCommandLine = String(commandLine || '').replaceAll('\\', '/');
-  const normalizedExecutablePath = normalizeExecutablePath(executablePath);
-  const argvExecutable = normalizeExecutablePath(firstCommandArgument(normalizedCommandLine));
-  const videoHelperPath = /(?:^|\/)\.livedesk\/helpers\/macos-sck-h264\/livedesk-sck-h264$/i;
-  const audioHelperPath = /(?:^|\/)\.livedesk\/helpers\/macos-sck-audio\/livedesk-sck-audio$/i;
-  const knownVideoCommand = /(?:^|\/)\.livedesk\/helpers\/macos-sck-h264\/livedesk-sck-h264(?:\s|["']|$)/i
-    .test(normalizedCommandLine);
-  const knownAudioCommand = /(?:^|\/)\.livedesk\/helpers\/macos-sck-audio\/livedesk-sck-audio(?:\s|["']|$)/i
-    .test(normalizedCommandLine);
-  const strictVideoExecutableProof = videoHelperPath.test(normalizedExecutablePath)
-    || videoHelperPath.test(argvExecutable);
-  const strictAudioExecutableProof = audioHelperPath.test(normalizedExecutablePath)
-    || audioHelperPath.test(argvExecutable);
-  const knownRawCaptureCommand = new RegExp(
-    `^(?:"[^"]*"|'[^']*'|\\S+)\\s+["']?\\S*${FAST_ROOT}/livedesk-raw-capture-helper\\.mjs(?:["']|\\s|$)`,
-    'i'
-  ).test(normalizedCommandLine);
-  return (/^livedesk-sck-h264$/i.test(normalizedName) && knownVideoCommand)
-    || (/^livedesk-sck-h2$/i.test(normalizedName) && strictVideoExecutableProof)
-    || (/^livedesk-sck-audio$/i.test(normalizedName) && knownAudioCommand)
-    || (/^livedesk-sck-aud$/i.test(normalizedName) && strictAudioExecutableProof)
-    || (/^(?:node|node\.exe)$/i.test(normalizedName) && knownRawCaptureCommand);
-}
+function firstCommandArgument(commandLine) {
+  const value = String(commandLine || '').trim();
+  if (!value) return '';
+  const quote = value[0] === '"' || value[0] === "'" ? value[0] : '';
+  if (!quote) return value.split(/\s+/, 1)[0] || '';
+  const end = value.indexOf(quote, 1);
+  return end > 0 ? value.slice(1, end) : '';
+}
+
+function normalizeExecutablePath(value) {
+  return String(value || '').trim().replaceAll('\\', '/').replace(/\s+\(deleted\)$/i, '');
+}
+
+const BUNDLED_FAST_ROOT = '(?:node_modules/(?:livedesk/client|@livedesk/client)|packages/(?:livedesk/client|client))/fast/[^/\\s]+';
+const OPTIONAL_FAST_ROOT = 'node_modules/@livedesk/fast-(?:linux-x64|osx-arm64|osx-x64|win-x64)/fast';
+const FAST_ROOT = `(?:${BUNDLED_FAST_ROOT}|${OPTIONAL_FAST_ROOT})`;
+const KNOWN_FAST_EXECUTABLE_PATH = new RegExp(`${FAST_ROOT}/livedesk-client-fast(?:\\.exe)?$`, 'i');
+
+export function isKnownLiveDeskClientAgentProcess(processName, commandLine, executablePath = '') {
+  const normalizedName = String(processName || '').trim().replaceAll('\\', '/').split('/').pop() || '';
+  const normalizedCommandLine = String(commandLine || '').replaceAll('\\', '/');
+  const isNode = /^(?:node|node\.exe)$/i.test(normalizedName);
+  const isDotnet = /^(?:dotnet|dotnet\.exe)$/i.test(normalizedName);
+  const isFast = /^livedesk-client-fast(?:\.exe)?$/i.test(normalizedName);
+  // Linux TASK_COMM_LEN exposes a 15-character `comm`, so the native apphost
+  // appears as `livedesk-client`. Accept that truncated name only when an
+  // independently resolved executable path, or argv[0], proves the canonical
+  // packaged LiveDesk Fast binary. A matching path elsewhere in argv is not
+  // sufficient.
+  const isTruncatedLinuxFast = /^livedesk-client$/i.test(normalizedName);
+  const isKnownNodeAgent = /(?:node_modules\/(?:livedesk\/client|@livedesk\/client)|packages\/(?:livedesk\/client|client))\/bin\/livedesk-client-node\.js(?:\s|["']|$)/i.test(normalizedCommandLine);
+  const isKnownFastExecutable = new RegExp(
+    `${FAST_ROOT}/livedesk-client-fast(?:\\.exe)?(?:\\s|["']|$)`,
+    'i'
+  ).test(normalizedCommandLine);
+  const isKnownFastDll = new RegExp(
+    `${FAST_ROOT}/livedesk-client-fast\\.dll(?:\\s|["']|$)`,
+    'i'
+  ).test(normalizedCommandLine);
+  const resolvedExecutable = normalizeExecutablePath(executablePath);
+  const argvExecutable = normalizeExecutablePath(firstCommandArgument(normalizedCommandLine));
+  const hasStrictFastExecutableProof = KNOWN_FAST_EXECUTABLE_PATH.test(resolvedExecutable)
+    || KNOWN_FAST_EXECUTABLE_PATH.test(argvExecutable);
+  return (isNode && isKnownNodeAgent)
+    || (isFast && isKnownFastExecutable)
+    || (isTruncatedLinuxFast && hasStrictFastExecutableProof)
+    || (isDotnet && isKnownFastDll);
+}
+
+export function isKnownLiveDeskCaptureHelperProcess(processName, commandLine, executablePath = '') {
+  const normalizedName = String(processName || '').trim().replaceAll('\\', '/').split('/').pop() || '';
+  const normalizedCommandLine = String(commandLine || '').replaceAll('\\', '/');
+  const normalizedExecutablePath = normalizeExecutablePath(executablePath);
+  const argvExecutable = normalizeExecutablePath(firstCommandArgument(normalizedCommandLine));
+  const videoHelperPath = /(?:^|\/)\.livedesk\/helpers\/macos-sck-h264\/livedesk-sck-h264$/i;
+  const audioHelperPath = /(?:^|\/)\.livedesk\/helpers\/macos-sck-audio\/livedesk-sck-audio$/i;
+  const knownVideoCommand = /(?:^|\/)\.livedesk\/helpers\/macos-sck-h264\/livedesk-sck-h264(?:\s|["']|$)/i
+    .test(normalizedCommandLine);
+  const knownAudioCommand = /(?:^|\/)\.livedesk\/helpers\/macos-sck-audio\/livedesk-sck-audio(?:\s|["']|$)/i
+    .test(normalizedCommandLine);
+  const strictVideoExecutableProof = videoHelperPath.test(normalizedExecutablePath)
+    || videoHelperPath.test(argvExecutable);
+  const strictAudioExecutableProof = audioHelperPath.test(normalizedExecutablePath)
+    || audioHelperPath.test(argvExecutable);
+  const knownRawCaptureCommand = new RegExp(
+    `^(?:"[^"]*"|'[^']*'|\\S+)\\s+["']?\\S*${FAST_ROOT}/livedesk-raw-capture-helper\\.mjs(?:["']|\\s|$)`,
+    'i'
+  ).test(normalizedCommandLine);
+  return (/^livedesk-sck-h264$/i.test(normalizedName) && knownVideoCommand)
+    || (/^livedesk-sck-h2$/i.test(normalizedName) && strictVideoExecutableProof)
+    || (/^livedesk-sck-audio$/i.test(normalizedName) && knownAudioCommand)
+    || (/^livedesk-sck-aud$/i.test(normalizedName) && strictAudioExecutableProof)
+    || (/^(?:node|node\.exe)$/i.test(normalizedName) && knownRawCaptureCommand);
+}