bx-mac 1.0.0 → 1.0.1

package/dist/bx.js

@@ -3,8 +3,8 @@ import { accessSync, constants, cpSync, existsSync, globSync, mkdirSync, mkdtemp
 import { basename, dirname, join, resolve } from "node:path";
 import { execFileSync, spawn } from "node:child_process";
 import { createInterface } from "node:readline";
-import { fileURLToPath } from "node:url";
 import process$1 from "node:process";
+import { fileURLToPath } from "node:url";
 //#region node_modules/.pnpm/smol-toml@1.6.1/node_modules/smol-toml/dist/error.js
 /*!
 * Copyright (c) Squirrel Chat et al., All rights reserved.
@@ -1219,17 +1219,22 @@ async function checkAppAlreadyRunning(mode, apps) {
 	if (BUILTIN_MODES.includes(mode)) return;
 	const app = apps[mode];
 	if (!app?.bundle) return;
-	let running = false;
+	let appName = mode;
 	try {
-		running = execFileSync("lsappinfo", ["list"], {
+		const list = execFileSync("lsappinfo", ["list"], {
 			encoding: "utf-8",
 			timeout: 3e3
-		}).includes(`bundleID="${app.bundle}"`);
+		});
+		if (!list.includes(`bundleID="${app.bundle}"`)) return;
+		const idx = list.indexOf(`bundleID="${app.bundle}"`);
+		const bundleLine = list.lastIndexOf("\n", idx);
+		const prevLine = list.lastIndexOf("\n", bundleLine - 1);
+		const nameMatch = list.slice(prevLine === -1 ? 0 : prevLine, bundleLine).match(/"([^"]+)"/);
+		if (nameMatch) appName = nameMatch[1];
 	} catch {
 		return;
 	}
-	if (!running) return;
-	console.error(`\n${fmt.warn(`"${mode}" is already running`)}`);
+	console.error(`\n${fmt.warn(`"${appName}" is already running`)}`);
 	console.error(fmt.detail("the workspace will open in the EXISTING instance — sandbox will NOT apply"));
 	if (mode === "code") console.error(fmt.detail("quit the app first, or use --profile-sandbox for an isolated instance"));
 	else console.error(fmt.detail("quit the app first to ensure sandbox protection"));
@@ -1238,7 +1243,7 @@ async function checkAppAlreadyRunning(mode, apps) {
 		output: process$1.stderr
 	});
 	const answer = await new Promise((res) => {
-		rl.question(`   continue without sandbox? [y/N] `, res);
+		rl.question(`   continue with existing instance? [y/N]`, res);
 	});
 	rl.close();
 	if (!answer.match(/^y(es)?$/i)) process$1.exit(0);
@@ -1573,12 +1578,9 @@ function printDryRunTree({ home, blockedDirs, ignoredPaths, readOnlyDirs, workDi
 	console.log(`\n${RED}✖${RESET} = denied  ${YELLOW}◉${RESET} = read-only  ${GREEN}✔${RESET} = read-write\n`);
 }
 //#endregion
-//#region package.json
-var version = "1.0.0";
-//#endregion
 //#region src/index.ts
+const VERSION = "1.0.1";
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const VERSION = version;
 if (process$1.argv.includes("--version") || process$1.argv.includes("-v")) {
 	console.log(`bx ${VERSION}`);
 	process$1.exit(0);
@@ -1593,6 +1595,8 @@ if (!process$1.env.HOME) {
 }
 const HOME = process$1.env.HOME;
 async function main() {
+	checkOwnSandbox();
+	checkExternalSandbox();
 	const apps = getAvailableApps(loadConfig(HOME));
 	const { mode, workArgs, verbose, dry, profileSandbox, background: backgroundFlag, appArgs, implicit } = parseArgs(getValidModes(apps));
 	const app = apps[mode];
@@ -1608,11 +1612,7 @@ async function main() {
 		}
 		if (!dry) await confirmLaunch(workDirs[0], mode);
 	}
-	if (!dry) {
-		checkOwnSandbox();
-		checkVSCodeTerminal();
-		checkExternalSandbox();
-	}
+	if (!dry) checkVSCodeTerminal();
 	checkWorkDirs(workDirs, HOME);
 	await checkAppAlreadyRunning(mode, apps);
 	if (mode === "code" && profileSandbox) setupVSCodeProfile(HOME);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bx-mac",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Sandbox any macOS app — only your project directory stays accessible",
   "type": "module",
   "bin": {