@openspecui/core 2.3.0 → 2.3.3

package/dist/index.mjs

@@ -1919,6 +1919,101 @@ function createFileChangeObservable(watcher) {
 	} };
 }
 
+//#endregion
+//#region src/spawn-safe.ts
+function getSpawnErrorCode(err) {
+	if (typeof err !== "object" || err === null || !("code" in err)) return;
+	const code = err.code;
+	return typeof code === "string" ? code : void 0;
+}
+function formatSpawnError(err) {
+	const message = err instanceof Error ? err.message : String(err);
+	const code = getSpawnErrorCode(err);
+	return {
+		code,
+		message: `${message}${code ? ` (${code})` : ""}`
+	};
+}
+function spawnSafe(command, args, options) {
+	try {
+		return {
+			ok: true,
+			child: spawn(command, [...args], options)
+		};
+	} catch (err) {
+		return {
+			ok: false,
+			error: formatSpawnError(err)
+		};
+	}
+}
+function killChild(child) {
+	try {
+		child.kill();
+	} catch {}
+}
+function runBufferedCommand(options) {
+	return new Promise((resolve$1) => {
+		const started = spawnSafe(options.command, options.args, {
+			cwd: options.cwd,
+			shell: false,
+			env: options.env
+		});
+		if (!started.ok) {
+			resolve$1({
+				stdout: "",
+				stderr: "",
+				exitCode: null,
+				timedOut: false,
+				spawnError: started.error
+			});
+			return;
+		}
+		const { child } = started;
+		let stdout = "";
+		let stderr = "";
+		let timedOut = false;
+		let settled = false;
+		let clearTimer = () => {};
+		if (options.timeoutMs !== void 0) {
+			const timer = setTimeout(() => {
+				timedOut = true;
+				killChild(child);
+			}, options.timeoutMs);
+			clearTimer = () => clearTimeout(timer);
+		}
+		const finish = (result) => {
+			if (settled) return;
+			settled = true;
+			clearTimer();
+			resolve$1(result);
+		};
+		child.stdout?.on("data", (data) => {
+			stdout += data.toString();
+		});
+		child.stderr?.on("data", (data) => {
+			stderr += data.toString();
+		});
+		child.on("error", (err) => {
+			finish({
+				stdout,
+				stderr,
+				exitCode: null,
+				timedOut,
+				spawnError: formatSpawnError(err)
+			});
+		});
+		child.on("close", (exitCode) => {
+			finish({
+				stdout,
+				stderr,
+				exitCode,
+				timedOut
+			});
+		});
+	});
+}
+
 //#endregion
 //#region src/config.ts
 const execAsync = promisify(exec);
@@ -2172,69 +2267,44 @@ function createCleanCliEnv(baseEnv = process.env) {
 }
 async function probeCliRunner(candidate, cwd, env) {
 	const [cmd, ...cmdArgs] = candidate.commandParts;
-	return new Promise((resolve$1) => {
-		let stdout = "";
-		let stderr = "";
-		let timedOut = false;
-		const timer = setTimeout(() => {
-			timedOut = true;
-			child.kill();
-		}, CLI_PROBE_TIMEOUT_MS);
-		const child = spawn(cmd, [...cmdArgs, "--version"], {
-			cwd,
-			shell: false,
-			env
-		});
-		child.stdout?.on("data", (data) => {
-			stdout += data.toString();
-		});
-		child.stderr?.on("data", (data) => {
-			stderr += data.toString();
-		});
-		child.on("error", (err) => {
-			clearTimeout(timer);
-			const code = err.code;
-			const suffix = code ? ` (${code})` : "";
-			resolve$1({
-				source: candidate.source,
-				command: commandToString(candidate.commandParts),
-				success: false,
-				error: `${err.message}${suffix}`,
-				exitCode: null
-			});
-		});
-		child.on("close", (exitCode) => {
-			clearTimeout(timer);
-			if (timedOut) {
-				resolve$1({
-					source: candidate.source,
-					command: commandToString(candidate.commandParts),
-					success: false,
-					error: "CLI probe timed out",
-					exitCode
-				});
-				return;
-			}
-			if (exitCode === 0) {
-				const version = stdout.trim().split("\n")[0] || void 0;
-				resolve$1({
-					source: candidate.source,
-					command: commandToString(candidate.commandParts),
-					success: true,
-					version,
-					exitCode
-				});
-				return;
-			}
-			resolve$1({
-				source: candidate.source,
-				command: commandToString(candidate.commandParts),
-				success: false,
-				error: stderr.trim() || `Exit code ${exitCode ?? "null"}`,
-				exitCode
-			});
-		});
+	const result = await runBufferedCommand({
+		command: cmd,
+		args: [...cmdArgs, "--version"],
+		cwd,
+		env,
+		timeoutMs: CLI_PROBE_TIMEOUT_MS
 	});
+	if (result.timedOut) return {
+		source: candidate.source,
+		command: commandToString(candidate.commandParts),
+		success: false,
+		error: "CLI probe timed out",
+		exitCode: result.exitCode
+	};
+	if (result.spawnError) return {
+		source: candidate.source,
+		command: commandToString(candidate.commandParts),
+		success: false,
+		error: result.spawnError.message,
+		exitCode: null
+	};
+	if (result.exitCode === 0) {
+		const version = result.stdout.trim().split("\n")[0] || void 0;
+		return {
+			source: candidate.source,
+			command: commandToString(candidate.commandParts),
+			success: true,
+			version,
+			exitCode: result.exitCode
+		};
+	}
+	return {
+		source: candidate.source,
+		command: commandToString(candidate.commandParts),
+		success: false,
+		error: result.stderr.trim() || `Exit code ${result.exitCode ?? "null"}`,
+		exitCode: result.exitCode
+	};
 }
 async function resolveCliRunner(candidates, cwd, env) {
 	const expandedCandidates = await expandCliRunnerCandidates(candidates, cwd, env);
@@ -2656,42 +2726,27 @@ var CliExecutor = class {
 	async buildCommandArray(args) {
 		return [...await this.configManager.getCliCommand(), ...args];
 	}
-	runCommandOnce(fullCommand) {
+	async runCommandOnce(fullCommand) {
 		const [cmd, ...cmdArgs] = fullCommand;
-		return new Promise((resolve$1) => {
-			const child = spawn(cmd, cmdArgs, {
-				cwd: this.projectDir,
-				shell: false,
-				env: createCleanCliEnv()
-			});
-			let stdout = "";
-			let stderr = "";
-			child.stdout?.on("data", (data) => {
-				stdout += data.toString();
-			});
-			child.stderr?.on("data", (data) => {
-				stderr += data.toString();
-			});
-			child.on("close", (exitCode) => {
-				resolve$1({
-					success: exitCode === 0,
-					stdout,
-					stderr,
-					exitCode
-				});
-			});
-			child.on("error", (err) => {
-				const errorCode = err.code;
-				const errorMessage = err.message + (errorCode ? ` (${errorCode})` : "");
-				resolve$1({
-					success: false,
-					stdout,
-					stderr: stderr ? `${stderr}\n${errorMessage}` : errorMessage,
-					exitCode: null,
-					errorCode
-				});
-			});
+		const result = await runBufferedCommand({
+			command: cmd,
+			args: cmdArgs,
+			cwd: this.projectDir,
+			env: createCleanCliEnv()
 		});
+		if (result.spawnError) return {
+			success: false,
+			stdout: result.stdout,
+			stderr: result.stderr ? `${result.stderr}\n${result.spawnError.message}` : result.spawnError.message,
+			exitCode: null,
+			errorCode: result.spawnError.code
+		};
+		return {
+			success: result.exitCode === 0,
+			stdout: result.stdout,
+			stderr: result.stderr,
+			exitCode: result.exitCode
+		};
 	}
 	async executeInternal(args, allowRetry) {
 		let fullCommand;
@@ -2845,11 +2900,29 @@ var CliExecutor = class {
 				data: fullCommand.join(" ")
 			});
 			const [cmd, ...cmdArgs] = fullCommand;
-			const child = spawn(cmd, cmdArgs, {
+			const started = spawnSafe(cmd, cmdArgs, {
 				cwd: this.projectDir,
 				shell: false,
 				env: createCleanCliEnv()
 			});
+			if (!started.ok) {
+				const { code, message } = started.error;
+				if (allowRetry && code === "ENOENT" && !cancelled) {
+					this.configManager.invalidateResolvedCliRunner();
+					start(false);
+					return;
+				}
+				onEvent({
+					type: "stderr",
+					data: message
+				});
+				onEvent({
+					type: "exit",
+					exitCode: null
+				});
+				return;
+			}
+			const child = started.child;
 			activeChild = child;
 			child.stdout?.on("data", (data) => {
 				onEvent({
@@ -2874,8 +2947,7 @@ var CliExecutor = class {
 			child.on("error", (err) => {
 				if (activeChild !== child) return;
 				activeChild = null;
-				const code = err.code;
-				const message = err.message + (code ? ` (${code})` : "");
+				const { code, message } = formatSpawnError(err);
 				if (allowRetry && code === "ENOENT" && !cancelled) {
 					this.configManager.invalidateResolvedCliRunner();
 					start(false);
@@ -2960,11 +3032,23 @@ var CliExecutor = class {
 			type: "command",
 			data: command.join(" ")
 		});
-		const child = spawn(cmd, cmdArgs, {
+		const started = spawnSafe(cmd, cmdArgs, {
 			cwd: this.projectDir,
 			shell: false,
 			env: createCleanCliEnv()
 		});
+		if (!started.ok) {
+			onEvent({
+				type: "stderr",
+				data: started.error.message
+			});
+			onEvent({
+				type: "exit",
+				exitCode: null
+			});
+			return () => {};
+		}
+		const child = started.child;
 		child.stdout?.on("data", (data) => {
 			onEvent({
 				type: "stdout",
@@ -2984,10 +3068,10 @@ var CliExecutor = class {
 			});
 		});
 		child.on("error", (err) => {
-			const code = err.code;
+			const { message } = formatSpawnError(err);
 			onEvent({
 				type: "stderr",
-				data: err.message + (code ? ` (${code})` : "")
+				data: message
 			});
 			onEvent({
 				type: "exit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openspecui/core",
-  "version": "2.3.0",
+  "version": "2.3.3",
   "description": "Core OpenSpec adapter and parser",
   "type": "module",
   "main": "./dist/index.mjs",