@agentfield/sdk 0.1.142-rc.7 → 0.1.142-rc.8

package/dist/index.js

@@ -218,8 +218,9 @@ function batchProbeInvocation(command) {
   });
   return {
     file: process.env.ComSpec ?? "cmd.exe",
-    // /s strips only the outermost quote pair, leaving each "%VAR%" quoted.
-    // /v:off keeps ! in a path literal even if delayed expansion is enabled.
+    // /s removes the outer quote pair of the fixed template, so each "%VAR%"
+    // expansion stays quoted.
+    // /v:off disables delayed ! expansion; /d disables AutoRun.
     args: ["/d", "/v:off", "/s", "/c", `"${tokens.join(" ")}"`],
     env
   };
@@ -227,20 +228,40 @@ function batchProbeInvocation(command) {
 async function defaultVersionProbe(command) {
   const { execFile } = await import('child_process');
   return new Promise((resolve3, reject) => {
-    const batch = isWindowsBatchFile(command[0]);
-    const { file, args, env } = batch ? batchProbeInvocation(command) : { file: command[0], args: command.slice(1), env: process.env };
-    execFile(
-      file,
-      args,
-      { timeout: 2e3, windowsHide: true, windowsVerbatimArguments: batch, env },
-      (error, stdout, stderr) => {
-        if (error) {
-          reject(error);
-          return;
+    const onProbeOutput = (error, stdout, stderr) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      const output = String(stdout || stderr).trim();
+      resolve3(output ? output.split(/\r?\n/, 1)[0] : "unknown");
+    };
+    if (isWindowsBatchFile(command[0])) {
+      for (const value of command) {
+        for (let index = 0; index < value.length; index += 1) {
+          const codePoint = value.charCodeAt(index);
+          if (codePoint === 34 || codePoint < 32) {
+            reject(new TypeError(
+              `Windows batch probe values must not contain double quotes or control characters; offending code point ${codePoint} in ${JSON.stringify(value)}`
+            ));
+            return;
+          }
         }
-        const output = String(stdout || stderr).trim();
-        resolve3(output ? output.split(/\r?\n/, 1)[0] : "unknown");
       }
+      const { file, args, env } = batchProbeInvocation(command);
+      execFile(
+        file,
+        args,
+        { timeout: 2e3, windowsHide: true, windowsVerbatimArguments: true, env },
+        onProbeOutput
+      );
+      return;
+    }
+    execFile(
+      command[0],
+      command.slice(1),
+      { timeout: 2e3, windowsHide: true, windowsVerbatimArguments: false },
+      onProbeOutput
     );
   });
 }