livedesk 0.1.461 → 0.1.463

package/diagnostics/livedesk-mac-physical-isolation.mjs

@@ -68,15 +68,56 @@ export function buildMacDiagnosticTeardownPlan({
   agentStopped = false,
   hubStopped = false,
   decodersStopped = false,
-  helperFinalCount = -1
+  helperFinalCount = -1,
+  afterCleanupResources
 } = {}) {
   const reasons = [];
-  if (agentStopped !== true) reasons.push('owned RemoteFast did not confirm exit');
-  if (hubStopped !== true) reasons.push('owned Hub did not confirm exit');
+  if (agentStopped !== true) reasons.push('owned unified Client tree did not confirm exit');
+  if (hubStopped !== true) reasons.push('owned unified Hub tree did not confirm exit');
   if (decodersStopped !== true) reasons.push('owned decoder did not confirm exit');
   if (Number(helperFinalCount) !== 0) {
     reasons.push(`capture helper drain ended at ${Number(helperFinalCount)}`);
   }
+  const resourceEvidenceAvailable = afterCleanupResources
+    && typeof afterCleanupResources === 'object'
+    && afterCleanupResources.ownershipModel === 'unified-production-v1'
+    && Number(afterCleanupResources.sampleCount) >= 1;
+  if (!resourceEvidenceAvailable) {
+    reasons.push('post-cleanup process tree evidence is unavailable');
+  } else {
+    const remainingProcesses = Array.isArray(afterCleanupResources.processes)
+      ? afterCleanupResources.processes
+      : [];
+    const unownedPids = Array.isArray(afterCleanupResources.unownedLiveDeskPids)
+      ? afterCleanupResources.unownedLiveDeskPids
+        .map(Number)
+        .filter(pid => Number.isInteger(pid) && pid > 1)
+      : [];
+    const remainingPids = [...new Set([
+      ...remainingProcesses.map(record => Number(record?.pid)),
+      ...unownedPids
+    ].filter(pid => Number.isInteger(pid) && pid > 1))].sort((left, right) => left - right);
+    const processTreeTerminal =
+      Number(afterCleanupResources.totalLiveDeskProcessCount) === 0
+      && Number(afterCleanupResources.totalLiveDeskProcessCountPeak) === 0
+      && Number(afterCleanupResources.captureHelperCountPeak) === 0
+      && Number(afterCleanupResources.ownedProcessCountPeak) === 0
+      && Number(afterCleanupResources.ownedChildProcessCountPeak) === 0
+      && Number(afterCleanupResources.ownedRssBytesPeak) === 0
+      && remainingProcesses.length === 0
+      && unownedPids.length === 0;
+    if (!processTreeTerminal) {
+      reasons.push(
+        'post-cleanup process tree did not reach terminal zero '
+        + `(live=${Number(afterCleanupResources.totalLiveDeskProcessCount)} `
+        + `owned=${Number(afterCleanupResources.ownedProcessCountPeak)} `
+        + `children=${Number(afterCleanupResources.ownedChildProcessCountPeak)} `
+        + `helpers=${Number(afterCleanupResources.captureHelperCountPeak)} `
+        + `rss=${Number(afterCleanupResources.ownedRssBytesPeak)} `
+        + `pids=${remainingPids.join(',') || '-'})`
+      );
+    }
+  }
   return Object.freeze({
     canRemoveState: reasons.length === 0,
     reasons: Object.freeze(reasons)
@@ -195,7 +236,8 @@ export function isProcessAlive(pid) {
 
 export async function inspectMacDiagnosticLease({
   directory = path.join(homedir(), '.livedesk', 'diagnostics'),
-  pidAlive = isProcessAlive
+  pidAlive = isProcessAlive,
+  includeOwnerToken = false
 } = {}) {
   const lockPath = path.join(path.resolve(directory), 'mac-physical-gate.lock');
   let owner;
@@ -236,7 +278,8 @@ export async function inspectMacDiagnosticLease({
   return Object.freeze({
     status: active ? 'active' : 'stale',
     path: lockPath,
-    pid: ownerPid
+    pid: ownerPid,
+    ...(includeOwnerToken ? { ownerToken } : {})
   });
 }