@remcp/runtime 0.2.218 → 0.2.221

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remcp/runtime",
-  "version": "0.2.218",
+  "version": "0.2.221",
   "description": "First-party ReMCP local device runtime: filesystem, terminal, computer-use, browser, diagnostics and document tools over MCP.",
   "type": "module",
   "license": "MIT",
@@ -25,7 +25,8 @@
   },
   "dependencies": {
     "@jellybrick/dbus-next": "^0.11.3",
-    "@modelcontextprotocol/server": "^2.3.0"
+    "@modelcontextprotocol/server": "^2.3.0",
+    "pdf-lib": "^1.17.1"
   },
   "optionalDependencies": {
     "macos-temperature-sensor": "2.1.1"

package/src/extended/desktop-core.mjs

@@ -405,6 +405,11 @@ export async function screenshotRegion(args = {}) {
       }
       if (!row) throw new Error('No matching window found for screenshot_region');
       x = Number(row.x); y = Number(row.y); width = Number(row.width); height = Number(row.height);
+    } else if (process.platform === 'win32' && optionalString(args.monitor)?.toLowerCase() === 'primary'
+      && args.monitor_index == null && clamp(args.padding, 0, 0, 200) === 0) {
+      // Windows GDI capture resolves primary geometry in the same PowerShell
+      // invocation. Avoid a second, expensive process on loaded Windows VMs.
+      return adapter.screenshotRegion({ monitor:'primary' });
     } else if (args.monitor != null || args.monitor_index != null) {
       const displays = resultValue(await displayInventory());
       if (!Array.isArray(displays)) throw new Error('This platform does not expose normalized monitor geometry for screenshot_region');

package/src/extended/desktop-windows.mjs

@@ -409,16 +409,30 @@ public static class RMDisplay{
   return jsonResult(Array.isArray(parsed)?parsed:[parsed]);
 }
 
+export function windowsRegionCaptureScript({primary=false,x=0,y=0,width=0,height=0} = {}, target='') {
+  const safe=escapePowerShellSingle(target);
+  const bounds=primary
+    ? 'Add-Type -AssemblyName System.Windows.Forms,System.Drawing;$r=[System.Windows.Forms.Screen]::PrimaryScreen.Bounds;'
+    : `Add-Type -AssemblyName System.Drawing;$r=[pscustomobject]@{X=${x};Y=${y};Width=${width};Height=${height}};`;
+  return `$ErrorActionPreference='Stop';${bounds}if($r.Width -le 0 -or $r.Height -le 0 -or $r.Width -gt 8192 -or $r.Height -gt 8192 -or ($r.Width*$r.Height) -gt 16777216){throw 'Invalid or oversized display bounds'};$b=New-Object System.Drawing.Bitmap $r.Width,$r.Height;$g=$null;try{$g=[System.Drawing.Graphics]::FromImage($b);$g.CopyFromScreen($r.X,$r.Y,0,0,$b.Size);$b.Save('${safe}',[System.Drawing.Imaging.ImageFormat]::Png)}finally{if($g){$g.Dispose()};$b.Dispose()}`;
+}
+
 export async function screenshotRegion(args = {}) {
+  const primary=args.monitor==='primary' && args.x==null && args.y==null
+    && args.width==null && args.height==null;
   const x=Math.trunc(Number(args.x)),y=Math.trunc(Number(args.y)),width=Math.trunc(Number(args.width)),height=Math.trunc(Number(args.height));
-  if(![x,y,width,height].every(Number.isFinite)||width<=0||height<=0)throw new Error('x, y, width and height are required; width/height must be positive');
-  if(width>8192||height>8192||width*height>16_777_216)throw new Error('screenshot region is too large; width/height must be <= 8192 and area <= 16 megapixels');
+  if(!primary && (![x,y,width,height].every(Number.isFinite)||width<=0||height<=0))
+    throw new Error('x, y, width and height are required; width/height must be positive');
+  if(!primary && (width>8192||height>8192||width*height>16_777_216))
+    throw new Error('screenshot region is too large; width/height must be <= 8192 and area <= 16 megapixels');
   const dir=await tempDir('remcp-region-'),target=path.join(dir,'region.png');
   try{
-    const safe=escapePowerShellSingle(target);
-    await runPowerShell(`Add-Type -AssemblyName System.Drawing;$b=New-Object System.Drawing.Bitmap(${width},${height});$g=[System.Drawing.Graphics]::FromImage($b);$g.CopyFromScreen(${x},${y},0,0,$b.Size);$b.Save('${safe}',[System.Drawing.Imaging.ImageFormat]::Png);$g.Dispose();$b.Dispose()`,{label:'screenshot region'});
+    const script=windowsRegionCaptureScript({primary,x,y,width,height},target);
+    await runPowerShell(script,{label:'screenshot region',timeout:30_000});
     const {data}=await readPrivateTempFile(target,4*1024*1024);
-    return multi([{type:'text',text:`Captured ${width}x${height} at ${x},${y}.`},image(data.toString('base64'),'image/png')]);
+    const description=primary ? `Captured primary display ${data.readUInt32BE(16)}x${data.readUInt32BE(20)}.`
+      : `Captured ${width}x${height} at ${x},${y}.`;
+    return multi([{type:'text',text:description},image(data.toString('base64'),'image/png')]);
   }finally{await removeTemp(dir);}
 }
 

package/src/extended/documents.mjs

@@ -275,6 +275,11 @@ function pdfAnnotations(buffer) {
   return rows;
 }
 
+async function loadPdfLibrary() {
+  const { PDFDocument } = await import('pdf-lib');
+  return PDFDocument;
+}
+
 export async function pdfAction(args) {
   const action = requireEnum(args.action,'action',['merge','split','extract_pages','annotations','info']);
   if (action === 'annotations') {
@@ -289,7 +294,9 @@ export async function pdfAction(args) {
       finally { await removeTemp(snapshot.dir); }
     }
     const data = await readDocumentFile(source);
-    return jsonResult({ path:source, bytes:data.length, annotation_count:pdfAnnotations(data).length });
+    let pageCount = null;
+    try { const PDFDocument = await loadPdfLibrary(); pageCount = (await PDFDocument.load(data, { updateMetadata:false })).getPageCount(); } catch {}
+    return jsonResult({ path:source, bytes:data.length, ...(pageCount === null ? {} : { page_count:pageCount }), annotation_count:pdfAnnotations(data).length });
   }
   if (action === 'merge') {
     const requested = Array.isArray(args.paths) ? args.paths : [];
@@ -310,7 +317,15 @@ export async function pdfAction(args) {
       }
       if(commandExists('pdfunite')) await runFile('pdfunite',[...snapshots,staged],{label:'PDF merge',timeout:60_000});
       else if(commandExists('qpdf')) await runFile('qpdf',['--empty','--pages',...snapshots,'--',staged],{label:'PDF merge',timeout:60_000});
-      else unavailable('PDF merge','install poppler-utils (pdfunite) or qpdf');
+      else {
+        const PDFDocument=await loadPdfLibrary();
+        const merged=await PDFDocument.create();
+        for(const snapshot of snapshots){
+          const sourceDoc=await PDFDocument.load(await readFile(snapshot),{updateMetadata:false});
+          for(const page of await merged.copyPages(sourceDoc,sourceDoc.getPageIndices())) merged.addPage(page);
+        }
+        await writeFile(staged,await merged.save());
+      }
       await commitDocumentOutput(staged,output);
       return jsonResult({action,output,inputs:sources.length,bytes:(await stat(output)).size});
     } finally {
@@ -331,7 +346,20 @@ export async function pdfAction(args) {
     try {
       const pattern=path.join(work,patternName);
       if(commandExists('pdfseparate')) await runFile('pdfseparate',[snapshot.path,pattern],{label:'PDF split',timeout:60_000});
-      else unavailable('PDF split','install poppler-utils (pdfseparate)');
+      else {
+        const PDFDocument=await loadPdfLibrary();
+        const sourceDoc=await PDFDocument.load(await readFile(snapshot.path),{updateMetadata:false});
+        const total=sourceDoc.getPageCount();
+        for(let page=1;page<=total;page+=1){
+          const single=await PDFDocument.create();
+          const [copied]=await single.copyPages(sourceDoc,[page-1]);
+          single.addPage(copied);
+          const name=patternName.includes('%d')
+            ? patternName.replace(/%d/g,String(page))
+            : patternName.toLowerCase().endsWith('.pdf') ? `${patternName.slice(0,-4)}-${page}.pdf` : `${patternName}-${page}.pdf`;
+          await writeFile(path.join(work,name),await single.save());
+        }
+      }
       for(const name of await readdir(work)){
         if(!name.toLowerCase().endsWith('.pdf')) continue;
         const staged=path.join(stageDir,name);
@@ -378,7 +406,14 @@ export async function pdfAction(args) {
         }
       } finally { await removeTemp(work); }
     } else {
-      unavailable('PDF page extraction','install qpdf, pdftk, or poppler-utils (pdfseparate; pdfunite for multiple pages)');
+      const PDFDocument=await loadPdfLibrary();
+      const sourceDoc=await PDFDocument.load(await readFile(snapshot.path),{updateMetadata:false});
+      const total=sourceDoc.getPageCount();
+      const indices=selectedPages.map(page=>page-1);
+      if(indices.some(index=>index>=total)) throw new Error(`Page selection exceeds ${total} pages`);
+      const extracted=await PDFDocument.create();
+      for(const page of await extracted.copyPages(sourceDoc,indices)) extracted.addPage(page);
+      await writeFile(staged,await extracted.save());
     }
     await commitDocumentOutput(staged,output);
     return jsonResult({action,source,pages:normalizedPages,output,bytes:(await stat(output)).size});

package/src/privilege-boundary.mjs

@@ -15,7 +15,7 @@ export function privilegeBoundary({
     if (output === undefined) {
       try {
         const result = spawnSync('whoami.exe', ['/groups'], {
-          encoding: 'utf8', windowsHide: true, timeout: 3000, maxBuffer: 64 * 1024,
+          encoding: 'utf8', windowsHide: true, timeout: 5000, maxBuffer: 64 * 1024,
         });
         output = result.status === 0 && !result.error ? result.stdout : '';
       } catch { output = ''; }

package/src/tools/files-screenshots.mjs

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import os from 'node:os';
-import { spawnSync } from 'node:child_process';
+import { execFile, spawnSync } from 'node:child_process';
+import { promisify } from 'node:util';
 import { createHash, randomUUID } from 'node:crypto';
 import { constants, createReadStream } from 'node:fs';
 import { access, chmod, chown, copyFile, cp, lstat, mkdir, mkdtemp, open, readFile, readdir, rename, rm, stat, unlink } from 'node:fs/promises';
@@ -21,6 +22,9 @@ import { diffFilesTool, editBlockTool, moveToTrashTool, readBinaryTool, replaceI
 import { applyPatchTool, copyFileTool, copyPathsTool, createDirectoryTool, deletePathTool, deletePathsTool, moveFileTool, movePathsTool, pathExists, readFilesTool, setPermissionsTool, writeFilesTool } from './files-bulk-operations.mjs';
 import { createArchiveTool, extractArchiveTool } from './files-archive-actions.mjs';
 
+const execFileAsync = promisify(execFile);
+let windowsScreenshotInFlight = false;
+
 export const SCREENSHOT_COMMANDS = [
   { command: 'grim', args: file => [file] },
   { command: 'gnome-screenshot', args: file => ['-f', file] },
@@ -38,6 +42,9 @@ export function screenshotAdvice(attempts, { platform = process.platform, env =
     return `macOS refused the screen capture (${attempts.join('; ') || 'no capture command ran'}). Grant Screen Recording to the binary that runs the tools — System Settings → Privacy & Security → Screen Recording → + → ${execPath} — then restart the agent with \`remcp start\`. macOS requires it for screencapture even when the file itself is writable.`;
   }
   if (platform === 'win32') {
+    if (attempts.some(attempt => attempt.includes('A Windows screen capture is already in progress'))) {
+      return 'A Windows screen capture is already in progress. Retry after it finishes.';
+    }
     return `Windows refused the screen capture (${attempts.join('; ') || 'no capture command ran'}). Screen capture needs an interactive desktop session: a machine where nobody is signed in, or a locked session, cannot be captured. Sign in on that computer and try again.`;
   }
   const wayland = /wayland/i.test(String(env.XDG_SESSION_TYPE || '')) || Boolean(env.WAYLAND_DISPLAY);
@@ -58,13 +65,36 @@ export function screenshotAdvice(attempts, { platform = process.platform, env =
 
 export function windowsScreenshotScript(file) {
   return [
+    "$ErrorActionPreference = 'Stop'",
     'Add-Type -AssemblyName System.Windows.Forms,System.Drawing',
     '$b = [System.Windows.Forms.SystemInformation]::VirtualScreen',
-    '$bmp = New-Object System.Drawing.Bitmap $b.Width, $b.Height',
-    '$g = [System.Drawing.Graphics]::FromImage($bmp)',
-    '$g.CopyFromScreen($b.Left, $b.Top, 0, 0, $bmp.Size)',
+    "if ($b.Width -le 0 -or $b.Height -le 0) { throw 'No valid desktop geometry for screenshot' }",
+    '$bmp = $null',
+    '$g = $null',
+    'try {',
+    '  $bmp = New-Object System.Drawing.Bitmap $b.Width, $b.Height',
+    '  $g = [System.Drawing.Graphics]::FromImage($bmp)',
+    '  $g.CopyFromScreen($b.Left, $b.Top, 0, 0, $bmp.Size)',
     `$bmp.Save('${file.replace(/'/g, "''")}', [System.Drawing.Imaging.ImageFormat]::Png)`,
-  ].join('; ');
+    '} finally {',
+    '  if ($null -ne $g) { $g.Dispose() }',
+    '  if ($null -ne $bmp) { $bmp.Dispose() }',
+    '}',
+  ].join('\n');
+}
+
+// Never block the runtime event loop while Windows initializes GDI/PowerShell.
+// A slow or inaccessible interactive desktop must not starve ping or relay RPC.
+export async function runWindowsScreenshot(file, runProcess = execFileAsync) {
+  if (windowsScreenshotInFlight) throw new Error('A Windows screen capture is already in progress; retry after it finishes');
+  windowsScreenshotInFlight = true;
+  try {
+    return await runProcess('powershell.exe', ['-NoLogo', '-NoProfile', '-NonInteractive', '-Command', windowsScreenshotScript(file)], {
+      encoding:'utf8', timeout:30_000, windowsHide:true, maxBuffer:64*1024,
+    });
+  } finally {
+    windowsScreenshotInFlight = false;
+  }
 }
 
 export async function takeScreenshotTool(args) {
@@ -86,8 +116,11 @@ export async function takeScreenshotTool(args) {
   let preserveCapture = false;
   try {
     if (process.platform === 'win32') {
-      const result = spawnSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', windowsScreenshotScript(file)], { encoding: 'utf8', timeout: 30000 });
-      attempts.push(`powershell: ${(result.stderr || '').trim() || ('exit ' + result.status)}`);
+      try {
+        await runWindowsScreenshot(file);
+      } catch (error) {
+        attempts.push(`powershell: ${String(error?.stderr || error?.message || error).trim().slice(0, 512)}`);
+      }
     } else {
       if (process.platform === 'linux' && isWaylandSession()) {
         try {

package/src/tools/system-telemetry.mjs

@@ -1,6 +1,6 @@
 // Best-effort host measurements. Keep interface names, mount paths and sensor labels bounded;
 // never expose raw process arguments or arbitrary kernel sensor metadata.
-import { readFile, readdir } from 'node:fs/promises';
+import { readFile, readdir, statfs } from 'node:fs/promises';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import os from 'node:os';
@@ -75,6 +75,25 @@ export function parseWindowsNetworkCounters(input, activeNames = null) {
   return [...found.values()];
 }
 
+// netsh exposes cumulative interface bytes even on Windows hosts where the
+// NetAdapterStatistics PowerShell provider returns no entries. Match columns
+// rather than localized header words; reject unsafe aliases and fake rates.
+export function parseWindowsNetshCounters(input, activeNames = null) {
+  const found = new Map();
+  for (const line of String(input).split(/\r?\n/).slice(0, 130)) {
+    const match = line.match(/^\s*\d{1,10}\s+1\s+(\d{1,16})\s+(\d{1,16})\s+(.+?)\s*$/u);
+    if (!match) continue;
+    const name = match[3];
+    if (!/^[\p{L}\p{N} _().:#-]{1,64}$/u.test(name) ||
+        (activeNames && !activeNames.has(name))) continue;
+    const rx = Number(match[1]), tx = Number(match[2]);
+    if (!numeric(rx) || !numeric(tx)) continue;
+    found.set(name, { name, rx, tx });
+    if (found.size >= 24) break;
+  }
+  return [...found.values()];
+}
+
 export function calculateNetworkRates(current, previous, elapsedSeconds) {
   if (!Array.isArray(current) || !Array.isArray(previous) || !Number.isFinite(elapsedSeconds) ||
       elapsedSeconds < 1 || elapsedSeconds > 300) return null;
@@ -114,13 +133,21 @@ async function readNetworkCounters() {
     return parseDarwinNetworkCounters(stdout, active);
   }
   if (process.platform === 'win32') {
-    const script = 'Get-NetAdapterStatistics | Select-Object Name,ReceivedBytes,SentBytes | ConvertTo-Json -Compress';
-    const { stdout } = await run('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script],
-      { windowsHide: true, timeout: 5000, maxBuffer: 128 * 1024 });
     const active = new Set(Object.entries(os.networkInterfaces())
       .filter(([, addresses]) => addresses?.some(address => !address.internal))
       .map(([name]) => name));
-    return parseWindowsNetworkCounters(stdout, active);
+    try {
+      const { stdout } = await run('netsh', ['interface', 'ipv4', 'show', 'subinterfaces'],
+        { windowsHide: true, timeout: 2500, maxBuffer: 128 * 1024 });
+      const counters = parseWindowsNetshCounters(stdout, active);
+      if (counters.length) return counters;
+    } catch { /* Fall through to the existing adapter provider. */ }
+    try {
+      const script = 'Get-NetAdapterStatistics | Select-Object Name,ReceivedBytes,SentBytes | ConvertTo-Json -Compress';
+      const { stdout } = await run('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script],
+        { windowsHide: true, timeout: 5000, maxBuffer: 128 * 1024 });
+      return parseWindowsNetworkCounters(stdout, active);
+    } catch { return []; }
   }
   return [];
 }
@@ -185,8 +212,36 @@ export function parseDiskVolumes(input) {
   return volumes;
 }
 
+async function windowsDiskVolumes() {
+  const volumes = [];
+  for (const letter of 'CDEFGHIJKLMNOPQRSTUVWXYZ') {
+    const mount = `${letter}:\\`;
+    let timer;
+    try {
+      const info = await Promise.race([
+        statfs(mount),
+        new Promise((_, reject) => { timer = setTimeout(() => reject(new Error('volume probe timeout')), 250); }),
+      ]);
+      const totalBytes = Number(info.blocks) * Number(info.bsize);
+      const freeBytes = Number(info.bfree) * Number(info.bsize);
+      const availableBytes = Number(info.bavail) * Number(info.bsize);
+      if (!Number.isFinite(totalBytes) || totalBytes <= 0) continue;
+      const usedBytes = Math.max(0, totalBytes - freeBytes);
+      volumes.push({
+        mount,
+        totalBytes,
+        usedBytes,
+        availableBytes,
+        usedRatio: Number((usedBytes / totalBytes).toFixed(3)),
+      });
+    } catch {}
+    finally { clearTimeout(timer); }
+  }
+  return volumes;
+}
+
 export async function diskVolumes() {
-  if (process.platform === 'win32') return [];
+  if (process.platform === 'win32') return windowsDiskVolumes();
   try {
     const { stdout } = await run('df', ['-kP'], { timeout: 2000, maxBuffer: 256 * 1024 });
     return parseDiskVolumes(stdout);

package/src/tools/system.mjs

@@ -1,6 +1,8 @@
 import os from 'node:os';
+import path from 'node:path';
 import process from 'node:process';
 import { execFile } from 'node:child_process';
+import { statfs } from 'node:fs/promises';
 import { promisify } from 'node:util';
 import { runtimeConfig } from '../config.mjs';
 import { clampInteger, fail, requireInteger, text } from '../util.mjs';
@@ -18,7 +20,23 @@ export function redactSecrets(command) {
 }
 
 async function diskUsage() {
-  if (process.platform === 'win32') return null;
+  if (process.platform === 'win32') {
+    const mount = path.parse(process.cwd()).root || 'C:\\';
+    let timer;
+    try {
+      const info = await Promise.race([
+        statfs(mount),
+        new Promise((_, reject) => { timer = setTimeout(() => reject(new Error('disk probe timeout')), 500); }),
+      ]);
+      const totalBytes = Number(info.blocks) * Number(info.bsize);
+      const freeBytes = Number(info.bfree) * Number(info.bsize);
+      const availableBytes = Number(info.bavail) * Number(info.bsize);
+      if (!Number.isFinite(totalBytes) || totalBytes <= 0) return null;
+      const usedBytes = Math.max(0, totalBytes - freeBytes);
+      return { mount, totalBytes, usedBytes, availableBytes, usedRatio: Number((usedBytes / totalBytes).toFixed(3)) };
+    } catch { return null; }
+    finally { clearTimeout(timer); }
+  }
   try {
     const { stdout } = await run('df', ['-kP', process.cwd()], { maxBuffer: 1024 * 1024 });
     const line = stdout.trim().split('\n')[1];