@pizzapi/pizza 0.1.32 → 0.1.34-dev.0

package/bin/pizza.mjs

@@ -9,9 +9,9 @@
  * Pattern borrowed from esbuild, turbo, swc, etc.
  */
 
-import { execFileSync } from "node:child_process";
+import { execFileSync, execSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { join, dirname } from "node:path";
+import { join, dirname, resolve } from "node:path";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 
@@ -33,18 +33,19 @@ if (!pkgName) {
     console.error(
         `Error: PizzaPi does not have a prebuilt binary for your platform (${platformKey}).\n` +
             `Supported platforms: ${Object.keys(PLATFORM_PACKAGES).join(", ")}\n\n` +
-            `You can build from source: https://github.com/badlogic/PizzaPi`,
+            `You can build from source: https://github.com/Pizzaface/PizzaPi`,
     );
     process.exit(1);
 }
 
 // Try to find the binary
 function findBinary() {
-    const require = createRequire(join(__dirname, ".."));
     const binName = process.platform === "win32" ? "pizza.exe" : "pizza";
+    const parts = pkgName.split("/");
 
     // Strategy 1: require.resolve the platform package
     try {
+        const require = createRequire(join(__dirname, "..", "package.json"));
         const pkgJson = require.resolve(`${pkgName}/package.json`);
         const pkgDir = dirname(pkgJson);
         const binPath = join(pkgDir, "bin", binName);
@@ -53,7 +54,16 @@ function findBinary() {
         // not found via require
     }
 
-    // Strategy 2: Check common node_modules layouts (hoisted, nested)
+    // Strategy 2: Sibling scoped package — both packages live under
+    // node_modules/@pizzapi/, so the platform package is a sibling of ours.
+    // __dirname = .../node_modules/@pizzapi/pizza/bin
+    // sibling  = .../node_modules/@pizzapi/cli-win32-x64/bin/pizza.exe
+    {
+        const siblingPath = join(__dirname, "..", "..", parts[1], "bin", binName);
+        if (existsSync(siblingPath)) return siblingPath;
+    }
+
+    // Strategy 3: Check common node_modules layouts (hoisted, nested)
     const searchRoots = [
         join(__dirname, "..", "node_modules"),
         join(__dirname, "..", "..", "node_modules"),
@@ -61,27 +71,67 @@ function findBinary() {
     ];
 
     for (const root of searchRoots) {
-        // Scoped package: node_modules/@pizzapi/cli-<platform>/bin/pizzapi
-        const parts = pkgName.split("/");
         const binPath = join(root, parts[0], parts[1], "bin", binName);
         if (existsSync(binPath)) return binPath;
     }
 
+    // Strategy 4: Walk up from __dirname looking for node_modules containing
+    // the platform package (covers deeply nested or unusual layouts)
+    {
+        let dir = resolve(__dirname);
+        for (let i = 0; i < 10; i++) {
+            const candidate = join(dir, "node_modules", parts[0], parts[1], "bin", binName);
+            if (existsSync(candidate)) return candidate;
+            const parent = dirname(dir);
+            if (parent === dir) break;
+            dir = parent;
+        }
+    }
+
+    // Strategy 5: Use npm root -g to find global node_modules (global installs)
+    try {
+        const globalRoot = execSync("npm root -g", { encoding: "utf-8" }).trim();
+        if (globalRoot) {
+            const binPath = join(globalRoot, parts[0], parts[1], "bin", binName);
+            if (existsSync(binPath)) return binPath;
+        }
+    } catch {
+        // npm not available or failed
+    }
+
     return null;
 }
 
 const binaryPath = findBinary();
 
 if (!binaryPath) {
+    // Collect diagnostic info for troubleshooting
+    const diag = [
+        `  launcher: ${fileURLToPath(import.meta.url)}`,
+        `  __dirname: ${__dirname}`,
+        `  platform: ${platformKey}`,
+    ];
+    // Check if the platform package directory exists at all
+    const parts = pkgName.split("/");
+    const siblingDir = join(__dirname, "..", "..", parts[1]);
+    diag.push(`  sibling dir exists: ${existsSync(siblingDir)} (${siblingDir})`);
+    try {
+        const globalRoot = execSync("npm root -g", { encoding: "utf-8" }).trim();
+        const globalPkg = join(globalRoot, parts[0], parts[1]);
+        diag.push(`  global root: ${globalRoot}`);
+        diag.push(`  global pkg exists: ${existsSync(globalPkg)} (${globalPkg})`);
+    } catch {}
+
     console.error(
         `Error: Could not find the PizzaPi binary for your platform (${platformKey}).\n\n` +
             `The platform-specific package "${pkgName}" should have been installed\n` +
             `automatically as an optional dependency.\n\n` +
             `Try reinstalling:\n` +
-            `  npm install pizzapi\n\n` +
+            `  npm install @pizzapi/pizza\n\n` +
             `If the problem persists, install the platform package directly:\n` +
             `  npm install ${pkgName}\n\n` +
-            `Or build from source: https://github.com/badlogic/PizzaPi`,
+            `Or build from source: https://github.com/Pizzaface/PizzaPi\n\n` +
+            `Diagnostics:\n${diag.join("\n")}`,
     );
     process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pizzapi/pizza",
-  "version": "0.1.32",
+  "version": "0.1.34-dev.0",
   "description": "PizzaPi — a self-hosted web interface and relay server for the pi coding agent. Stream live AI coding sessions to any browser.",
   "license": "MIT",
   "bin": {
@@ -13,11 +13,11 @@
     "LICENSE"
   ],
   "optionalDependencies": {
-    "@pizzapi/cli-linux-x64": "0.1.32",
-    "@pizzapi/cli-linux-arm64": "0.1.32",
-    "@pizzapi/cli-darwin-x64": "0.1.32",
-    "@pizzapi/cli-darwin-arm64": "0.1.32",
-    "@pizzapi/cli-win32-x64": "0.1.32"
+    "@pizzapi/cli-linux-x64": "0.1.34-dev.0",
+    "@pizzapi/cli-linux-arm64": "0.1.34-dev.0",
+    "@pizzapi/cli-darwin-x64": "0.1.34-dev.0",
+    "@pizzapi/cli-darwin-arm64": "0.1.34-dev.0",
+    "@pizzapi/cli-win32-x64": "0.1.34-dev.0"
   },
   "engines": {
     "node": ">=18"