@jals1212/pi-spaces-cli 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -6,6 +6,20 @@ commands and options and a patch version fixes.
 
 ## Unreleased
 
+## 0.3.1
+
+### Fixed
+
+- On Windows the program is started through `cross-spawn`. npm shims such as
+  `pi.cmd`, paths with spaces, a trailing backslash, `%` and other `cmd.exe`
+  characters in the command or in Pi's arguments are passed as written.
+- The picker reports a bad command (an unclosed quote) before it lists the
+  spaces, not after you have chosen one.
+
+### Changed
+
+- Depends on `cross-spawn`.
+
 ## 0.3.0
 
 ### Added

package/dist/cli.js

@@ -1,11 +1,11 @@
 // The optional `pi-space` command: pick a space and start Pi in it.
 // It only passes `--space <name>`; the extension does the switch, so it never sets PI_CODING_AGENT_DIR.
-import { spawn as nodeSpawn } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { createInterface } from "node:readline";
 import { fileURLToPath } from "node:url";
+import crossSpawn from "cross-spawn";
 import {
 	BACKUPS,
 	BASE,
@@ -139,15 +139,6 @@ export function splitCommand(text        )           {
 	return words;
 }
 
-/**
- * One word for the single command line cmd.exe gets when the child runs with shell: true on Windows:
- * wrapped in double quotes unless it is plain, with inner double quotes doubled.
- */
-export function quoteForCmd(word        )         {
-	if (word !== "" && !/[\s"&|<>^()%!,;=]/.test(word)) return word;
-	return `"${word.replaceAll('"', '""')}"`;
-}
-
 const EXTENSION = "@jals1212/pi-spaces";
 
 /**
@@ -172,7 +163,6 @@ function agentHome(env     , home        )         {
 
                                
 	                 
-	               
 	                                                                                              
 	          
  
@@ -190,19 +180,20 @@ function agentHome(env     , home        )         {
 	                                                                                                    
 	               
 	             
-	                                                                
-	                           
 	                                                                                    
 	                         
  
 
-/** The real child process: stdio inherited, the environment unchanged, a shell on Windows so .cmd shims work. */
+/**
+ * The real child process: stdio inherited, the environment unchanged. cross-spawn is plain child_process.spawn
+ * except on Windows, where it finds .cmd and .bat shims such as pi.cmd and escapes the arguments for them.
+ */
 export function spawnChild(program        , args          , options              )                       {
 	// Ctrl-C belongs to Pi while it runs; this process waits for it instead of dying first.
 	const ignore = () => {};
 	process.on("SIGINT", ignore);
 	return new Promise             ((resolve) => {
-		const child = nodeSpawn(program, args, options);
+		const child = crossSpawn(program, args, options);
 		child.once("error", (error) => resolve({ status: null, error }));
 		child.once("close", (status) => resolve({ status }));
 	}).finally(() => process.off("SIGINT", ignore));
@@ -216,7 +207,6 @@ export function processIo(proc                 = process)        {
 		stderr: proc.stderr,
 		env: proc.env,
 		home: homedir(),
-		platform: process.platform,
 		spawn: spawnChild,
 		exit: (code) => proc.exit(code),
 	};
@@ -376,13 +366,9 @@ async function launch(name        , args          , dir        , io       , comm
 		return io.exit(2);
 	}
 	const { program, args: programArgs } = launched;
-	const windows = (io.platform ?? process.platform) === "win32";
-	const options               = { stdio: "inherit", shell: windows };
+	const options               = { stdio: "inherit" };
 	if (io.childEnv) options.env = io.childEnv;
-	// With a shell, Node joins the program and arguments into one line without quoting them.
-	const result = windows
-		? await io.spawn(quoteForCmd(program), programArgs.map(quoteForCmd), options)
-		: await io.spawn(program, programArgs, options);
+	const result = await io.spawn(program, programArgs, options);
 	if (result.error) {
 		io.stderr.write(`pi-space: could not start ${program}: ${result.error.message}\n`);
 		return io.exit(1);
@@ -395,6 +381,13 @@ async function pick(dir        , io       , commandSource        )
 		io.stderr.write(USAGE);
 		return io.exit(2);
 	}
+	// A bad command is reported before the list, not after the user has chosen.
+	try {
+		splitCommand(io.env.PI_SPACES_COMMAND ?? "");
+	} catch (error) {
+		io.stderr.write(`pi-space: ${commandSource}: ${(error         ).message}.\n`);
+		return io.exit(2);
+	}
 	const names = [BASE, ...listSpaces(dir)];
 	io.stdout.write(`${[`Spaces in ${dir}:`, ...names.map((name, index) => `${index + 1}) ${name}`)].join("\n")}\nSpace number: `);
 	const line = await readLine(io.stdin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jals1212/pi-spaces-cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "The pi-space command: pick a space and start Pi in it. Companion to the Pi extension @jals1212/pi-spaces.",
   "license": "MIT",
   "author": "jals1212",
@@ -35,9 +35,10 @@
   "scripts": {
     "build": "node --disable-warning=ExperimentalWarning scripts/build.mjs",
     "prepack": "npm run build",
-    "test": "node ../scripts/link-self.mjs && npm run build --prefix .. && npm run build && node --test 'test/*.test.ts'"
+    "test": "node ../scripts/link-self.mjs && npm run build --prefix .. && npm run build && node --test \"test/*.test.ts\""
   },
   "dependencies": {
+    "cross-spawn": "^7.0.6",
     "@jals1212/pi-spaces": "^0.2.0"
   },
   "publishConfig": {