upstream merge 2026-05-08 PR 13: host-service shell env probe + typo

packages/host-service/src/terminal/clean-shell-env.ts

@@ -1,8 +1,10 @@
 import { type ChildProcess, spawn } from "node:child_process";
+import * as os from "node:os";
 
 const SHELL_ENV_TIMEOUT_MS = 8_000;
 const CACHE_TTL_MS = 60_000;
 const DELIMITER = "__SUPERSET_SHELL_ENV__";
+const DIAGNOSTIC_OUTPUT_LIMIT = 200;
 
 const SHELL_BOOTSTRAP_KEYS = [
 	"HOME",
@@ -29,7 +31,7 @@ const COMMON_MACOS_PATHS = [
 	"/usr/local/sbin",
 ];
 
-function augmentPathForMacOS(
+export function augmentPathForMacOS(
 	env: Record<string, string>,
 	platform: NodeJS.Platform = process.platform,
 ): void {
@@ -90,18 +92,32 @@ function parseEnvOutput(stdout: string): Record<string, string> {
 	return result;
 }
 
+function truncateForDiagnostics(value: string): string {
+	const trimmed = value.trim();
+	if (trimmed.length <= DIAGNOSTIC_OUTPUT_LIMIT) return trimmed;
+	return `${trimmed.slice(0, DIAGNOSTIC_OUTPUT_LIMIT)}…`;
+}
+
 function spawnCleanShellEnv(): Promise<Record<string, string>> {
 	return new Promise((resolve, reject) => {
 		const shell = resolveShellForEnv();
 		const env = buildMinimalEnv();
 		const command = `echo -n "${DELIMITER}"; command env; echo -n "${DELIMITER}"; exit`;
 
+		// Anchor at $HOME so the snapshot shell doesn't inherit a cwd
+		// host-service has no control over. Tools called from interactive
+		// rc files — brew is the recurring offender (#4025) — abort when
+		// pwd isn't readable to the invoking user, and Electron helpers
+		// can land at /private/var/... or similar at launch.
+		const cwd = env.HOME || os.homedir();
+
 		let child: ChildProcess;
 		try {
 			child = spawn(shell, ["-i", "-l", "-c", command], {
 				detached: true,
 				stdio: ["ignore", "pipe", "pipe"],
 				env,
+				cwd,
 			});
 		} catch (error) {
 			return reject(
@@ -139,6 +155,7 @@ function spawnCleanShellEnv(): Promise<Record<string, string>> {
 		child.on("close", (code, signal) => {
 			clearTimeout(timeout);
 
+			const stdout = Buffer.concat(stdoutBuffers).toString("utf8");
 			const stderr = Buffer.concat(stderrBuffers).toString("utf8").trim();
 			if (stderr) {
 				console.debug("[terminal-clean-shell-env] stderr:", stderr);
@@ -147,15 +164,25 @@ function spawnCleanShellEnv(): Promise<Record<string, string>> {
 			if (code !== 0 && code !== null) {
 				return reject(
 					new Error(
-						`Shell ${shell} exited with code ${code}${signal ? `, signal ${signal}` : ""}`,
+						`Shell ${shell} exited with code ${code}${signal ? `, signal ${signal}` : ""}` +
+							(stderr ? ` stderr=${truncateForDiagnostics(stderr)}` : "") +
+							(stdout ? ` stdout=${truncateForDiagnostics(stdout)}` : ""),
 					),
 				);
 			}
 
 			try {
-				resolve(parseEnvOutput(Buffer.concat(stdoutBuffers).toString("utf8")));
+				resolve(parseEnvOutput(stdout));
 			} catch (error) {
-				reject(error);
+				const detail = error instanceof Error ? error.message : String(error);
+				reject(
+					new Error(
+						`${detail} (shell=${shell}` +
+							` stdout=${truncateForDiagnostics(stdout)}` +
+							(stderr ? ` stderr=${truncateForDiagnostics(stderr)}` : "") +
+							")",
+					),
+				);
 			}
 		});
 

packages/host-service/src/terminal/env.ts

@@ -17,6 +17,7 @@ export {
 import fs from "node:fs";
 import os from "node:os";
 import {
+	augmentPathForMacOS,
 	clearStrictShellEnvCache,
 	getStrictShellEnvironment,
 } from "./clean-shell-env";
@@ -53,11 +54,25 @@ function snapshotStringEnv(
 /**
  * Resolve the shell-derived terminal base env inside the host-service process.
  * Desktop main should not construct or own this snapshot.
+ *
+ * Falls back to a process.env snapshot if the user's login shell can't be
+ * probed — crashing host-service startup over a degraded PTY env strands
+ * users on v2. v1 desktop main does the same in apps/desktop shell-env.ts.
  */
 export async function resolveTerminalBaseEnv(): Promise<
 	Record<string, string>
 > {
-	return getStrictShellEnvironment();
+	try {
+		return await getStrictShellEnvironment();
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		console.warn(
+			`[host-service] Shell env snapshot failed, falling back to process.env: ${message}`,
+		);
+		const fallback = snapshotStringEnv(process.env);
+		augmentPathForMacOS(fallback);
+		return fallback;
+	}
 }
 
 /**

packages/shared/src/terminal-link-parsing/link-parsing.ts

@@ -440,7 +440,7 @@ enum RegexPathConstants {
 	PathPrefix = "(?:\\.\\.?|\\~|file:\\/\\/)",
 	PathSeparatorClause = "\\/",
 	// '":; are allowed in paths but they are often separators so ignore them
-	// Also disallow \\ to prevent a catastropic backtracking case #24795
+	// Also disallow \\ to prevent a catastrophic backtracking case #24795
 	ExcludedPathCharactersClause = "[^\\0<>\\?\\s!`&*()'\";:\\\\]",
 	ExcludedStartPathCharactersClause = "[^\\0<>\\?\\s!`&*()\\[\\]'\";:\\\\]",