Release v0.0.48: Fixed backend command execution PATH issues and updated title bar logo/title

SFARPak · SFARPak · commit 9dbf3c185d29 · 2025-10-10T01:30:38.000+05:00
diff --git a/src/app/TitleBar.tsx b/src/app/TitleBar.tsx
@@ -77,31 +77,39 @@ export const TitleBar = () => {
 
   return (
     <>
-      <div className="@container z-11 w-full h-11 bg-(--sidebar) absolute top-0 left-0 app-region-drag flex items-center">
-        <div className={`${showWindowControls ? "pl-2" : "pl-18"}`}></div>
-
-        <img src={logo} alt="AliFullStack Logo" className="w-6 h-6 mr-0.5" />
-        <Button
-          data-testid="title-bar-app-name-button"
-          variant="outline"
-          size="sm"
-          className={`hidden @2xl:block no-app-region-drag text-xs max-w-38 truncate font-medium ${
-            selectedApp ? "cursor-pointer" : ""
-          }`}
-          onClick={handleAppClick}
-        >
-          {displayText}
-        </Button>
-        {isDyadPro && <DyadProButton isAliFullStackProEnabled={isAliFullStackProEnabled} />}
-
-        {/* Preview Header */}
-        {location.pathname === "/chat" && (
-          <div className="flex-1 flex justify-end">
-            <PreviewHeader />
-          </div>
-        )}
-
-        {showWindowControls && <WindowsControls />}
+      <div className="@container z-11 w-full h-11 bg-(--sidebar) absolute top-0 left-0 app-region-drag flex items-center justify-between">
+        <div className="flex items-center">
+          <div className={`${showWindowControls ? "pl-2" : "pl-18"}`}></div>
+          <img src={logo} alt="AliFullStack Logo" className="w-[75%] h-[75%]" />
+          <Button
+            data-testid="title-bar-app-name-button"
+            variant="outline"
+            size="sm"
+            className={`hidden @2xl:block no-app-region-drag text-xs max-w-38 truncate font-medium ${
+              selectedApp ? "cursor-pointer" : ""
+            }`}
+            onClick={handleAppClick}
+          >
+            {displayText}
+          </Button>
+        </div>
+
+        <div className="flex-1 flex justify-center items-center">
+          <span className="text-lg font-semibold no-app-region-drag">AliFullStack</span>
+        </div>
+
+        <div className="flex items-center">
+          {isDyadPro && <DyadProButton isAliFullStackProEnabled={isAliFullStackProEnabled} />}
+
+          {/* Preview Header */}
+          {location.pathname === "/chat" && (
+            <div className="flex justify-end">
+              <PreviewHeader />
+            </div>
+          )}
+
+          {showWindowControls && <WindowsControls />}
+        </div>
       </div>
 
       <DyadProSuccessDialog
diff --git a/src/ipc/handlers/app_handlers.ts b/src/ipc/handlers/app_handlers.ts
@@ -13,7 +13,7 @@ import type {
 import fs from "node:fs";
 import path from "node:path";
 import { getDyadAppPath, getUserDataPath } from "../../paths/paths";
-import { ChildProcess, spawn } from "node:child_process";
+import { ChildProcess, spawn, execSync } from "node:child_process";
 import git from "isomorphic-git";
 import { promises as fsPromises } from "node:fs";
 
@@ -30,7 +30,82 @@ import {
 import { getEnvVar } from "../utils/read_env";
 import { readSettings } from "../../main/settings";
 
-import fixPath from "fix-path";
+// Cache for the dynamically captured PATH
+let cachedExtendedPath: string | undefined;
+let cachedShellEnv: NodeJS.ProcessEnv | undefined;
+
+/**
+ * Dynamically captures the PATH environment variable from a login shell.
+ * This ensures that tools installed via pyenv, conda, or other environment managers
+ * are accessible to child processes spawned by the Electron app.
+ *
+ * The result is cached to avoid repeatedly spawning a login shell.
+ *
+ * @returns The PATH string from the user's login shell.
+ */
+export function getExtendedPath(): string {
+  if (cachedExtendedPath) {
+    return cachedExtendedPath;
+  }
+
+  try {
+    // Spawn a login shell and get its environment
+    // For macOS, 'login -il <shell>' is used to get a login shell.
+    // For Linux, 'bash -lc "env"' or 'zsh -lc "env"' might be used.
+    // We'll try to detect the user's default shell.
+    const shell = process.env.SHELL || "/bin/bash";
+    let command: string;
+
+    if (process.platform === "darwin") {
+      // On macOS, a login shell is crucial for tools like Homebrew, pyenv, nvm
+      command = `login -il ${shell} -c "env"`;
+    } else {
+      // For Linux/Windows, a non-login shell might be sufficient, but -l ensures full environment
+      command = `${shell} -lc "env"`;
+    }
+
+    logger.info(`Attempting to capture PATH from login shell using command: ${command}`);
+    const output = execSync(command, { encoding: "utf8", maxBuffer: 10 * 1024 * 1024 }); // 10MB buffer
+
+    const env: NodeJS.ProcessEnv = {};
+    output.split("\n").forEach((line) => {
+      const parts = line.split("=");
+      if (parts.length >= 2) {
+        const key = parts[0];
+        const value = parts.slice(1).join("=");
+        env[key] = value;
+      }
+    });
+
+    cachedShellEnv = env;
+    cachedExtendedPath = env.PATH || process.env.PATH || "";
+    logger.info(`Successfully captured PATH from login shell: ${cachedExtendedPath}`);
+    return cachedExtendedPath;
+  } catch (error) {
+    logger.error(`Failed to capture PATH from login shell: ${error}. Falling back to current process PATH.`);
+    cachedExtendedPath = process.env.PATH || "";
+    cachedShellEnv = process.env; // Fallback to current process env
+    return cachedExtendedPath;
+  }
+}
+
+/**
+ * Dynamically captures the complete environment variables from a login shell.
+ * This ensures that all environment variables (not just PATH) set by tools
+ * like pyenv, conda, or other environment managers are accessible.
+ *
+ * The result is cached to avoid repeatedly spawning a login shell.
+ *
+ * @returns The complete environment variables from the user's login shell.
+ */
+function getShellEnv(): NodeJS.ProcessEnv {
+  if (cachedShellEnv) {
+    return cachedShellEnv;
+  }
+  // Call getExtendedPath to populate cachedShellEnv
+  getExtendedPath();
+  return cachedShellEnv || process.env;
+}
 
 import killPort from "kill-port";
 import util from "util";
@@ -90,7 +165,7 @@ let proxyWorker: Worker | null = null;
 
 // Needed, otherwise electron in MacOS/Linux will not be able
 // to find node/pnpm.
-fixPath();
+getExtendedPath();
 
 /**
  * Check if a port is available
@@ -475,6 +550,7 @@ async function executeAppLocalNode({
                   cwd: strategy.cwd,
                   shell: true,
                   stdio: "pipe",
+                  env: getShellEnv(),
                 });
 
                 let fixOutput = "";
@@ -606,6 +682,7 @@ async function executeAppLocalNode({
         shell: true,
         stdio: "pipe",
         detached: false,
+        env: getShellEnv(),
       });
 
       if (backendProcess.pid) {
@@ -672,6 +749,7 @@ async function executeAppLocalNode({
         shell: true,
         stdio: "pipe",
         detached: false,
+        env: getShellEnv(),
       });
 
       if (frontendProcess.pid) {
@@ -1182,7 +1260,7 @@ async function executeAppInDocker({
   // First, check if Docker is available
   try {
     await new Promise<void>((resolve, reject) => {
-      const checkDocker = spawn("docker", ["--version"], { stdio: "pipe" });
+      const checkDocker = spawn("docker", ["--version"], { stdio: "pipe", env: getShellEnv() });
       checkDocker.on("close", (code) => {
         if (code === 0) {
           resolve();
@@ -1205,10 +1283,12 @@ async function executeAppInDocker({
     await new Promise<void>((resolve) => {
       const stopContainer = spawn("docker", ["stop", containerName], {
         stdio: "pipe",
+        env: getShellEnv(),
       });
       stopContainer.on("close", () => {
         const removeContainer = spawn("docker", ["rm", containerName], {
           stdio: "pipe",
+          env: getShellEnv(),
         });
         removeContainer.on("close", () => resolve());
         removeContainer.on("error", () => resolve()); // Container might not exist
@@ -1245,6 +1325,7 @@ RUN npm install -g pnpm
     {
       cwd: appPath,
       stdio: "pipe",
+      env: getShellEnv(),
     },
   );
 
@@ -1315,6 +1396,7 @@ RUN npm install -g pnpm
     {
       stdio: "pipe",
       detached: false,
+      env: getShellEnv(),
     },
   );
 
@@ -1364,6 +1446,7 @@ async function stopDockerContainersOnPort(port: number): Promise<void> {
     // List container IDs that publish the given port
     const list = spawn("docker", ["ps", "--filter", `publish=${port}`, "-q"], {
       stdio: "pipe",
+      env: getShellEnv(),
     });
 
     let stdout = "";
@@ -1390,7 +1473,7 @@ async function stopDockerContainersOnPort(port: number): Promise<void> {
       containerIds.map(
         (id) =>
           new Promise<void>((resolve) => {
-            const stop = spawn("docker", ["stop", id], { stdio: "pipe" });
+            const stop = spawn("docker", ["stop", id], { stdio: "pipe", env: getShellEnv() });
             stop.on("close", () => resolve());
             stop.on("error", () => resolve());
           }),
@@ -2717,6 +2800,7 @@ async function installDependencies(projectPath: string, framework: string) {
       cwd: projectPath,
       shell: true,
       stdio: "pipe",
+      env: getShellEnv(),
     });
 
     logger.info(`Running install command: ${installCommand} in ${projectPath}`);
@@ -2786,6 +2870,7 @@ async function installDependenciesAuto(projectPath: string, componentType: strin
         cwd: projectPath,
         shell: true,
         stdio: "pipe",
+        env: getShellEnv(),
       });
 
       logger.info(`Installing dependencies with: ${installCommand} in ${projectPath}`);
@@ -2835,6 +2920,7 @@ async function installNodejsDependenciesRobust(projectPath: string, componentTyp
           cwd: projectPath,
           shell: true,
           stdio: "pipe",
+          env: getShellEnv(),
         });
 
         let installOutput = "";
@@ -2894,6 +2980,7 @@ async function installNodejsDependenciesRobust(projectPath: string, componentTyp
           cwd: projectPath,
           shell: true,
           stdio: "pipe",
+          env: getShellEnv(),
         });
 
         cleanupProcess.on("close", (code) => {
@@ -2926,6 +3013,7 @@ async function installSpecificPackage(projectPath: string, packageName: string):
       cwd: projectPath,
       shell: true,
       stdio: "pipe",
+      env: getShellEnv(),
     });
 
     logger.info(`Installing specific package: ${installCommand} in ${projectPath}`);
@@ -2967,6 +3055,7 @@ async function installDependenciesAutoFallback(projectPath: string, componentTyp
       cwd: projectPath,
       shell: true,
       stdio: "pipe",
+      env: getShellEnv(),
     });
 
     logger.info(`Fallback auto-installing dependencies with: ${installCommand} in ${projectPath}`);
diff --git a/src/ipc/handlers/node_handlers.ts b/src/ipc/handlers/node_handlers.ts
@@ -2,7 +2,7 @@ import { ipcMain } from "electron";
 import { execSync } from "child_process";
 import { platform, arch } from "os";
 import { NodeSystemInfo } from "../ipc_types";
-import fixPath from "fix-path";
+import { getExtendedPath } from "./app_handlers";
 import { runShellCommand } from "../utils/runShellCommand";
 import log from "electron-log";
 
@@ -50,7 +50,7 @@ export function registerNodeHandlers() {
       }).trim();
       process.env.PATH = newPath;
     } else {
-      fixPath();
+      getExtendedPath();
     }
     logger.debug("Reloaded env path, now:", process.env.PATH);
   });
