@nubase/terminal 0.1.0 → 0.1.2

package/bin/nubase.js

@@ -1,11 +1,144 @@
 #!/usr/bin/env node
-import { spawn } from "node:child_process";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import { execFileSync, spawn } from "node:child_process";
+import { createHash } from "node:crypto";
+import {
+  copyFileSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  renameSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import electron from "electron";
 
 const appDir = resolve(dirname(fileURLToPath(import.meta.url)), "..");
-const child = spawn(electron, [appDir, ...process.argv.slice(2)], {
-  stdio: "inherit",
-});
-child.on("exit", (code) => process.exit(code ?? 0));
+const args = process.argv.slice(2);
+const env = { ...process.env, NUBASE_LAUNCHED_FROM_CLI: "1" };
+
+const run = (command, commandArgs) => {
+  const child = spawn(command, commandArgs, { stdio: "inherit", env });
+  child.on("exit", (code) => process.exit(code ?? 0));
+};
+
+/**
+ * Electron from npm is a generic "Electron.app": pinned to the Dock it opens
+ * Electron's default page, and macOS shows its name and icon. So on macOS
+ * Nubase runs from its own bundle, ~/Applications/Nubase.app — a clone of
+ * Electron.app with Nubase's name and icon, whose app is a stub that loads
+ * this package. It is rebuilt whenever this package or Electron changes.
+ */
+const ensureMacBundle = () => {
+  const pkg = JSON.parse(readFileSync(join(appDir, "package.json"), "utf8"));
+  const electronApp = resolve(electron, "../../..");
+  const electronVersion = JSON.parse(
+    readFileSync(
+      join(
+        dirname(fileURLToPath(import.meta.resolve("electron"))),
+        "package.json",
+      ),
+      "utf8",
+    ),
+  ).version;
+  const icon = join(appDir, "resources", "icon.icns");
+  const stamp = JSON.stringify({
+    appDir,
+    version: pkg.version,
+    electronVersion,
+    icon: existsSync(icon)
+      ? createHash("sha1").update(readFileSync(icon)).digest("hex")
+      : "",
+  });
+
+  const bundle = join(homedir(), "Applications", "Nubase.app");
+  const stampFile = join(bundle, "Contents", "Resources", "nubase-stamp.json");
+  const executable = join(bundle, "Contents", "MacOS", "Electron");
+  if (existsSync(stampFile) && readFileSync(stampFile, "utf8") === stamp) {
+    return executable;
+  }
+
+  // Built next to the old bundle and swapped in, so a running copy keeps working.
+  const staging = `${bundle}.staging`;
+  rmSync(staging, { recursive: true, force: true });
+  mkdirSync(dirname(bundle), { recursive: true });
+  try {
+    // APFS clone: instant and takes no extra disk space.
+    execFileSync("cp", ["-cR", electronApp, staging], { stdio: "ignore" });
+  } catch {
+    rmSync(staging, { recursive: true, force: true });
+    execFileSync("cp", ["-R", electronApp, staging]);
+  }
+
+  const contents = join(staging, "Contents");
+  const plist = join(contents, "Info.plist");
+  const setPlist = (key, value) =>
+    execFileSync("plutil", ["-replace", key, "-string", value, plist]);
+  setPlist("CFBundleName", "Nubase");
+  setPlist("CFBundleDisplayName", "Nubase");
+  setPlist("CFBundleIdentifier", "io.nubase.terminal");
+  if (existsSync(icon)) {
+    copyFileSync(icon, join(contents, "Resources", "nubase.icns"));
+    setPlist("CFBundleIconFile", "nubase.icns");
+  }
+
+  const stub = join(contents, "Resources", "app");
+  mkdirSync(stub, { recursive: true });
+  writeFileSync(
+    join(stub, "package.json"),
+    JSON.stringify(
+      {
+        name: pkg.name,
+        productName: pkg.productName,
+        version: pkg.version,
+        type: "module",
+        main: "main.js",
+      },
+      null,
+      2,
+    ),
+  );
+  writeFileSync(
+    join(stub, "main.js"),
+    `import ${JSON.stringify(pathToFileURL(join(appDir, pkg.main)).href)};\n`,
+  );
+  writeFileSync(join(contents, "Resources", "nubase-stamp.json"), stamp);
+
+  // Editing the bundle invalidates Electron's signature; Apple Silicon needs a valid one.
+  execFileSync("codesign", ["--force", "--deep", "--sign", "-", staging], {
+    stdio: "ignore",
+  });
+
+  const old = `${bundle}.old`;
+  rmSync(old, { recursive: true, force: true });
+  if (existsSync(bundle)) renameSync(bundle, old);
+  renameSync(staging, bundle);
+  rmSync(old, { recursive: true, force: true });
+
+  // Makes Finder and the Dock pick up the new name and icon.
+  try {
+    execFileSync(
+      "/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister",
+      ["-f", bundle],
+      { stdio: "ignore" },
+    );
+  } catch {}
+  return executable;
+};
+
+if (process.platform === "darwin") {
+  let executable;
+  try {
+    executable = ensureMacBundle();
+  } catch (error) {
+    console.error(
+      `Could not set up Nubase.app (${error.message}); running Electron directly.`,
+    );
+  }
+  if (executable) run(executable, args);
+  else run(electron, [appDir, ...args]);
+} else {
+  run(electron, [appDir, ...args]);
+}

package/out/main/index.js

@@ -1,12 +1,12 @@
 import { createRequire } from "node:module";
+import { accessSync, chmodSync, constants, createReadStream, existsSync, mkdirSync, statSync, watch } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve, sep } from "node:path";
 import { pathToFileURL } from "node:url";
 import { BaseWindow, BrowserWindow, Menu, WebContentsView, app, dialog, ipcMain, nativeImage, net, protocol, safeStorage, shell } from "electron";
 import { createHash, randomUUID } from "node:crypto";
 import { homedir } from "node:os";
-import { createReadStream, existsSync, mkdirSync, statSync, watch } from "node:fs";
 import { cp, mkdir, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
-import { execFile } from "node:child_process";
+import { execFile, execFileSync } from "node:child_process";
 import { promisify } from "node:util";
 import { Readable } from "node:stream";
 import * as sdkHost from "@nubase/sdk/host";
@@ -1157,12 +1157,34 @@ var BUILTIN_EXTENSIONS = [
 ];
 //#endregion
 //#region src/main/services/pty/PtyHost.ts
+var spawnHelperChecked = false;
+/**
+* npm installs node-pty's prebuilt macOS/Linux `spawn-helper` without its
+* execute bit, which makes every spawn fail with "posix_spawnp failed".
+*/
+var ensureSpawnHelperExecutable = () => {
+	if (spawnHelperChecked || process.platform === "win32") return;
+	spawnHelperChecked = true;
+	try {
+		const root = dirname(createRequire(import.meta.url).resolve("node-pty/package.json"));
+		const candidates = [join(root, "build", "Release", "spawn-helper"), join(root, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper")];
+		for (const file of candidates) {
+			if (!existsSync(file)) continue;
+			try {
+				accessSync(file, constants.X_OK);
+			} catch {
+				chmodSync(file, 493);
+			}
+		}
+	} catch {}
+};
 var PtyHost = class {
 	ptys = /* @__PURE__ */ new Map();
 	constructor(options) {
 		this.options = options;
 	}
 	async spawn(options) {
+		ensureSpawnHelperExecutable();
 		const pty = await import("node-pty");
 		const shell = process.env.SHELL ?? (process.platform === "win32" ? "powershell.exe" : "/bin/zsh");
 		const id = randomUUID();
@@ -3103,7 +3125,31 @@ var WorkspaceManager = class {
 	}
 };
 //#endregion
+//#region src/main/shellEnv.ts
+var MARKER = "__NUBASE_PATH__";
+/**
+* Apps started from the Dock or Finder get launchd's bare PATH, so the agent
+* and terminal could not find git, node or Homebrew tools. Takes PATH from the
+* user's login shell instead, unless the `nubase` CLI already passed its own.
+*/
+var adoptLoginShellPath = () => {
+	if (process.platform !== "darwin" || process.env.NUBASE_LAUNCHED_FROM_CLI) return;
+	try {
+		const path = execFileSync(process.env.SHELL ?? "/bin/zsh", ["-ilc", `printf '${MARKER}%s' "$PATH"`], {
+			encoding: "utf8",
+			timeout: 5e3,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).split(MARKER).at(-1)?.trim();
+		if (path) process.env.PATH = path;
+	} catch {}
+};
+//#endregion
 //#region src/main/index.ts
+adoptLoginShellPath();
 var safeMode = process.argv.includes("--safe-mode");
 protocol.registerSchemesAsPrivileged([{
 	scheme: EXTENSION_PROTOCOL,
@@ -3150,7 +3196,9 @@ var createWindow = () => {
 };
 var main = async () => {
 	await app.whenReady();
-	const resourcesDir = join(app.getAppPath(), "resources");
+	const resourcesDir = join(import.meta.dirname, "../../resources");
+	const iconPath = join(resourcesDir, "icon.png");
+	if (process.platform === "darwin" && existsSync(iconPath)) app.dock?.setIcon(iconPath);
 	const rootSettings = new SettingsService(paths.settings);
 	await rootSettings.load();
 	await prepareExtensionsWorkspace(paths.extensions, resourcesDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nubase/terminal",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Nubase: an AI harness with a real, self-extending UI",
   "license": "MIT",
   "type": "module",
@@ -24,7 +24,8 @@
     "test": "vitest run",
     "typecheck": "tsc --noEmit",
     "lint": "biome check .",
-    "lint:fix": "biome check . --write --unsafe"
+    "lint:fix": "biome check . --write --unsafe",
+    "icons": "./scripts/make-icns.sh"
   },
   "dependencies": {
     "@earendil-works/pi-coding-agent": "1.5.2",
@@ -64,5 +65,6 @@
     "vite": "^8.1.0",
     "vitest": "^4.1.9",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
-  }
+  },
+  "productName": "Nubase"
 }