@whyvix/remote 0.3.15 → 0.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyvix/remote",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "private": false,
   "type": "module",
   "files": [

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

@@ -104,8 +104,14 @@ export class ProcessManager {
       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];
+      const selectedDir=executableMatch!=null?path.dirname(spawnCommand):path.dirname(this.nodeExecPath);
+      const selectedNode=path.join(selectedDir,"node.exe");
+      const selectedCli=path.join(selectedDir,"node_modules","npm","bin",executable.name==="npm"?"npm-cli.js":"npx-cli.js");
+      const fallbackCli=path.join(path.dirname(this.nodeExecPath),"node_modules","npm","bin",executable.name==="npm"?"npm-cli.js":"npx-cli.js");
+      if(executableMatch!=null){
+        try{if(!fs.statSync(selectedNode).isFile()||!fs.statSync(selectedCli).isFile())fail("LOCAL_EXEC_NOT_ALLOWED","Selected Windows command shim does not have an approved adjacent Node launcher");}catch(error){if(error?.code==="LOCAL_EXEC_NOT_ALLOWED")throw error;fail("LOCAL_EXEC_NOT_ALLOWED","Selected Windows command shim does not have an approved adjacent Node launcher");}
+        spawnCommand=selectedNode;args=[selectedCli,...args];
+      }else{spawnCommand=this.nodeExecPath;args=[fallbackCli,...args];}
     }
     if([...this.processes.values()].filter(x=>x.running).length>=this.maxRunningJobs)fail("LOCAL_JOB_LIMIT","Local running job limit reached");
     const id=String(this.nextId++);let child;
@@ -122,6 +128,7 @@ export class ProcessManager {
 
   #owned(id,ownerId){this.#cleanup();const s=this.processes.get(String(id));if(!s)fail("LOCAL_JOB_NOT_FOUND","Local job not found");if(s.ownerId!=null&&String(ownerId||"")!==s.ownerId)fail("LOCAL_JOB_NOT_FOUND","Local job not found");return s;}
   output({id,ownerId}={}){const s=this.#owned(id,ownerId);return{id:s.id,stdout:s.stdout,stderr:s.stderr,running:s.running,exitCode:s.exitCode,errorCode:s.errorCode,truncated:s.truncated,timedOut:s.timedOut};}
+  async wait({id,ownerId,waitMs=30000}={}){const s=this.#owned(id,ownerId),bounded=Math.max(0,Math.min(Number(waitMs)||0,30000));if(!s.running||bounded===0)return this.output({id,ownerId});await new Promise(resolve=>{let settled=false;const done=()=>{if(settled)return;settled=true;clearTimeout(timer);s.child.off?.("close",done);s.child.off?.("error",done);resolve();};const timer=setTimeout(done,bounded);s.child.once?.("close",done);s.child.once?.("error",done);if(!s.running)done();});return this.output({id,ownerId});}
   input({id,ownerId,data,end=false}={}){const s=this.#owned(id,ownerId);if(!s.running)fail("LOCAL_JOB_NOT_RUNNING","Local job is not running");if(typeof data!=="string")fail("INVALID_ARGUMENT","data must be a string");if(Buffer.byteLength(data,"utf8")>65536)fail("CONTENT_TOO_LARGE","stdin data exceeds 65536 UTF-8 bytes");if(!s.child.stdin||typeof s.child.stdin.write!=="function")fail("LOCAL_STDIN_UNAVAILABLE","Local process stdin is unavailable");if(data.length)s.child.stdin.write(data);if(end){if(typeof s.child.stdin.end!=="function")fail("LOCAL_STDIN_UNAVAILABLE","Local process stdin cannot be closed");s.child.stdin.end();}this.audit({event:"process.input",id,bytes:Buffer.byteLength(data,"utf8"),end:Boolean(end)});return{id:s.id,writtenBytes:Buffer.byteLength(data,"utf8"),ended:Boolean(end)};}
   stop({id,ownerId}={}){const s=this.#owned(id,ownerId);if(s.running)s.child.kill();return{id:s.id,stopping:s.running};}
 }

package/packages/agent/src/tools.js

@@ -129,7 +129,8 @@ export function createToolExecutor({ security, processManager, remoteExecutionMa
     if(tool==="remote.stop"){if(!remoteExecutionManager)throw Object.assign(new Error("Remote execution is not configured"),{code:"REMOTE_JOB_NOT_FOUND"});return remoteExecutionManager.stop(args);}
     if(tool==="process.discover")return processManager.discover(args);
     if(tool==="process.start"){const cwd=security.resolveFilesystemPath(args.cwd);return processManager.start({...args,cwd});}
-    if(tool==="process.output")return processManager.output(args);
+    if(tool==="process.output")return processManager.output(args);
+    if(tool==="process.wait")return processManager.wait(args);
     if(tool==="process.input")return processManager.input(args);
     if(tool==="process.stop")return processManager.stop(args);
     if(tool==="git.status"||tool==="git.diff"||tool==="git.log"){const cwd=security.resolveFilesystemPath(args.cwd);const gitArgs=tool==="git.status"?["status","--porcelain=v1","--branch"]:tool==="git.diff"?["diff","--",...(args.paths||[])]:["log","--oneline","-n",String(Math.min(Number(args.limit||10),50))];const {stdout,stderr}=await execFileAsync("git",gitArgs,{cwd,windowsHide:true,maxBuffer:1024*1024});return{stdout,stderr};}