@whyvix/remote 0.3.14 → 0.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyvix/remote",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "private": false,
   "type": "module",
   "files": [
@@ -25,7 +25,7 @@
     "test:r3-r5": "node scripts/r3-r5-test.js",
     "test:r10-gui-window-focus": "node scripts/r10-gui-window-action-contract-test.js && node scripts/r10-gui-window-action-source-test.js && node scripts/r10-gui-window-action-agent-capability-test.js && node scripts/r10-gui-window-action-authorization-test.js && node scripts/r10-gui-window-action-loader-test.js && node scripts/r10-gui-window-action-mcp-schema-test.js && node scripts/r10-gui-window-action-cli-wiring-test.js && node scripts/r10-deployment-certify-authorization-test.js && node scripts/r10-deployment-certify-protocol-test.js && node scripts/r10-deployment-activation-response-test.js",
     "test:r10-documents": "node scripts/r10-precision-document-inspect-test.js && node scripts/r10-precision-document-compare-test.js && node scripts/r10-precision-docx-mutation-test.js && node scripts/r10-precision-xlsx-mutation-test.js && node scripts/r10-precision-pptx-mutation-test.js",
-    "test:r10-observability": "node scripts/r10-write-preview-test.js && node scripts/r10-cli-presentation-test.js"
+    "test:r10-observability": "node scripts/r10-write-preview-test.js && node scripts/r10-cli-presentation-test.js && node scripts/r10-usage-metering-test.js"
   },
   "dependencies": {
     "@modelcontextprotocol/ext-apps": "^2.0.0",

package/packages/agent/src/process-manager.js

@@ -3,6 +3,13 @@ import fs from "node:fs";
 import path from "node:path";
 
 const DEFAULT_EXECUTABLES = null;
+const WINDOWS_TOOLCHAIN_PATTERNS = [
+  "C:/wamp64/bin/mysql/*/bin",
+  "C:/wamp/bin/mysql/*/bin",
+  "C:/xampp/mysql/bin",
+  "C:/Program Files/MySQL/*/bin",
+  "C:/Program Files/MariaDB */bin"
+];
 const BLOCKED_SHELL_EXECUTABLES = new Set([
   "cmd", "command", "powershell", "pwsh", "sh", "bash", "dash", "zsh", "fish", "wsl"
 ]);
@@ -23,6 +30,24 @@ function normalizeRegistry(value) {
   return new Map(Object.entries(value || {}).map(([name, command]) => [String(name).toLowerCase().replace(/\.exe$/, ""), String(command)]));
 }
 
+function expandWindowsRoots(patterns) {
+  const roots=[];
+  for(const pattern of patterns){
+    if(!pattern.includes("*")){roots.push(pattern);continue;}
+    const before=pattern.slice(0,pattern.indexOf("*")),after=pattern.slice(pattern.indexOf("*")+1),base=before.replace(/[\\/]$/,"");
+    try{for(const entry of fs.readdirSync(base,{withFileTypes:true}))if(entry.isDirectory())roots.push(path.join(base,entry.name,after));}catch{}
+  }
+  return roots;
+}
+function executableMatches(executable,{platform,pathValue,pathExtValue,toolchainPatterns=WINDOWS_TOOLCHAIN_PATTERNS}={}){
+  const dirs=String(pathValue??process.env.PATH??"").split(path.delimiter).filter(Boolean);
+  if(platform==="win32")dirs.push(...expandWindowsRoots(toolchainPatterns));
+  const extensions=platform==="win32"?(path.extname(executable.command)?[""]:String(pathExtValue??process.env.PATHEXT??".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean)):[""];
+  const matches=[];
+  for(const dir of dirs)for(const ext of extensions){const candidate=path.resolve(dir,executable.command+ext);try{const stat=fs.statSync(candidate);if(stat.isFile()&&!matches.some(x=>x.toLowerCase()===candidate.toLowerCase()))matches.push(candidate);}catch{}}
+  return matches.slice(0,16);
+}
+
 function resolveExecutable(registry, requested) {
   const raw = String(requested || "").trim();
   if (!raw) fail("INVALID_ARGUMENT", "command is required");
@@ -40,8 +65,8 @@ function resolveExecutable(registry, requested) {
 }
 
 export class ProcessManager {
-  constructor({ audit=()=>{}, spawnFn=spawn, allowedExecutables=DEFAULT_EXECUTABLES, platform=process.platform, nodeExecPath=process.execPath, maxOutputBytes=262144, maxRetainedJobs=100, maxRunningJobs=16, jobRetentionMs=300000, now=()=>Date.now() }={}) {
-    this.audit=audit; this.spawnFn=spawnFn; this.executableRegistry=normalizeRegistry(allowedExecutables); this.platform=platform; this.nodeExecPath=nodeExecPath;
+  constructor({ audit=()=>{}, spawnFn=spawn, allowedExecutables=DEFAULT_EXECUTABLES, platform=process.platform, nodeExecPath=process.execPath, toolchainPatterns=WINDOWS_TOOLCHAIN_PATTERNS, maxOutputBytes=262144, maxRetainedJobs=100, maxRunningJobs=16, jobRetentionMs=300000, now=()=>Date.now() }={}) {
+    this.audit=audit; this.spawnFn=spawnFn; this.executableRegistry=normalizeRegistry(allowedExecutables); this.platform=platform; this.nodeExecPath=nodeExecPath; this.toolchainPatterns=toolchainPatterns;
     this.maxOutputBytes=Math.max(1024,Math.min(Number(maxOutputBytes)||262144,1048576));
     this.maxRetainedJobs=Math.max(1,Math.min(Number(maxRetainedJobs)||100,1000));
     this.maxRunningJobs=Math.max(1,Math.min(Number(maxRunningJobs)||16,128));
@@ -58,14 +83,11 @@ export class ProcessManager {
 
   discover({command,pathValue=process.env.PATH||"",pathExtValue=process.env.PATHEXT||".COM;.EXE;.BAT;.CMD"}={}) {
     const executable=resolveExecutable(this.executableRegistry,command);
-    const dirs=String(pathValue).split(path.delimiter).filter(Boolean);
-    const extensions=this.platform==="win32"?(path.extname(executable.command)?[""]:String(pathExtValue).split(";").filter(Boolean)):[""];
-    const matches=[];
-    for(const dir of dirs)for(const ext of extensions){const candidate=path.resolve(dir,executable.command+ext);try{const stat=fs.statSync(candidate);if(stat.isFile()&&!matches.includes(candidate))matches.push(candidate);}catch{}}
-    return{command:executable.name,available:matches.length>0,matches:matches.slice(0,16)};
+    const matches=executableMatches(executable,{platform:this.platform,pathValue,pathExtValue,toolchainPatterns:this.toolchainPatterns});
+    return{command:executable.name,available:matches.length>0,matches};
   }
 
-  start({command,args=[],cwd,timeoutMs=30000,ownerId}={}) {
+  start({command,args=[],cwd,timeoutMs=30000,ownerId,executableMatch}={}) {
     this.#cleanup();
     const executable=resolveExecutable(this.executableRegistry,command);
     if(!Array.isArray(args)||args.some(x=>typeof x!=="string"))fail("INVALID_ARGUMENT","args must be an array of strings");
@@ -74,6 +96,13 @@ export class ProcessManager {
       args=["--no-install",...args];
     }
     let spawnCommand=executable.command;
+    if(executableMatch!=null){
+      const requested=path.resolve(String(executableMatch));
+      const matches=executableMatches(executable,{platform:this.platform,toolchainPatterns:this.toolchainPatterns});
+      const selected=matches.find(x=>path.resolve(x).toLowerCase()===requested.toLowerCase());
+      if(!selected)fail("LOCAL_EXEC_NOT_ALLOWED","Selected executable is not an approved discovery match");
+      spawnCommand=selected;
+    }
     if(this.platform==="win32"&&(executable.name==="npm"||executable.name==="npx")) {
       const cli=path.join(path.dirname(this.nodeExecPath),"node_modules","npm","bin",executable.name==="npm"?"npm-cli.js":"npx-cli.js");
       spawnCommand=this.nodeExecPath; args=[cli,...args];