hypha-cli 0.1.1 → 0.1.2

package/bin/postinstall.mjs

@@ -3,63 +3,73 @@
 /**
  * postinstall script for hypha-cli
  *
- * Detects and removes conflicting Python 'hypha' command from pip.
+ * Detects and removes conflicting Python 'hypha' command.
  * The Python hypha package installs a 'hypha' console_script for starting
  * the server, but `python -m hypha.server` is the preferred way to do that.
- * This script removes the Python entry point to avoid PATH conflicts.
+ *
+ * npm runs postinstall in a stripped shell (no ~/.zshrc, no conda init, etc),
+ * so `which` can't see all PATH entries. We solve this by running `which -a`
+ * inside a login shell to get the user's full PATH.
  */
 
 import { execSync } from 'child_process';
-import { readFileSync, unlinkSync } from 'fs';
+import { existsSync, readFileSync, unlinkSync } from 'fs';
+
+function isPythonHyphaScript(filePath) {
+    try {
+        const head = readFileSync(filePath, 'utf-8').slice(0, 500);
+        return head.includes('python') && head.includes('from hypha');
+    } catch {
+        return false;
+    }
+}
 
 function findConflictingBinaries() {
-    const found = [];
+    const found = new Set();
 
-    // Use 'which -a' (macOS/Linux) to find all 'hypha' binaries in PATH
-    try {
-        const output = execSync('which -a hypha 2>/dev/null', { encoding: 'utf-8' }).trim();
-        if (output) {
-            for (const binPath of output.split('\n')) {
-                const p = binPath.trim();
-                if (!p) continue;
+    // Detect user's shell
+    const shell = process.env.SHELL || '/bin/sh';
 
-                // Check if it's a Python script (not our Node.js binary)
-                try {
-                    const head = readFileSync(p, 'utf-8').slice(0, 200);
-                    if (head.includes('python') && head.includes('from hypha')) {
-                        found.push(p);
-                    }
-                } catch {
-                    // Can't read — skip
+    // Run `which -a hypha` in a login shell to get full PATH (conda, pyenv, etc.)
+    for (const cmd of [
+        `${shell} -l -c 'which -a hypha' 2>/dev/null`,  // login shell (loads ~/.zshrc, conda init, etc.)
+        'which -a hypha 2>/dev/null',                      // plain fallback
+    ]) {
+        try {
+            const output = execSync(cmd, { encoding: 'utf-8', timeout: 10000 }).trim();
+            for (const line of output.split('\n')) {
+                const p = line.trim();
+                if (p && existsSync(p) && isPythonHyphaScript(p)) {
+                    found.add(p);
                 }
             }
+        } catch {
+            // Shell or which not available
         }
-    } catch {
-        // 'which' not found or no results — OK
     }
 
-    return found;
+    return [...found];
 }
 
 function main() {
     const conflicts = findConflictingBinaries();
-
     if (conflicts.length === 0) return;
 
     for (const binPath of conflicts) {
         try {
             unlinkSync(binPath);
-            console.log(`hypha-cli: removed conflicting Python 'hypha' command at ${binPath}`);
-            console.log(`           (use 'python -m hypha.server' to start the Hypha server)`);
+            console.log(`hypha-cli: removed conflicting Python 'hypha' at ${binPath}`);
         } catch (err) {
             if (err.code === 'EACCES') {
-                console.log(`hypha-cli: found conflicting Python 'hypha' command at ${binPath}`);
-                console.log(`           remove it manually: sudo rm ${binPath}`);
-                console.log(`           (use 'python -m hypha.server' to start the Hypha server)`);
+                console.log(`hypha-cli: conflicting Python 'hypha' at ${binPath}`);
+                console.log(`           remove it manually: rm ${binPath}`);
             }
-            // Other errors — silently skip
         }
     }
+
+    if (conflicts.length > 0) {
+        console.log(`  (use 'python -m hypha.server' to start the Hypha server instead)`);
+    }
 }
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hypha-cli",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "description": "Hypha Cloud CLI — manage workspaces, apps, and artifacts",
     "author": "Amun AI AB",
     "license": "SEE LICENSE IN LICENSE",