@tiflis-io/tiflis-code-workstation 0.3.6 → 0.3.7

package/dist/main.js

@@ -2716,10 +2716,79 @@ function isTerminalSession(session) {
   return session.type === "terminal";
 }
 
-// src/infrastructure/terminal/pty-manager.ts
+// src/infrastructure/shell/shell-env.ts
+import { execSync as execSync2 } from "child_process";
+var cachedShellEnv = null;
 function getDefaultShell() {
   return process.env.SHELL ?? "/bin/bash";
 }
+function getShellEnv() {
+  if (cachedShellEnv) {
+    return cachedShellEnv;
+  }
+  const shell = getDefaultShell();
+  const isZsh = shell.includes("zsh");
+  const isBash = shell.includes("bash");
+  let envOutput;
+  try {
+    if (isZsh) {
+      envOutput = execSync2(`${shell} -i -l -c 'env -0'`, {
+        encoding: "utf-8",
+        timeout: 5e3,
+        maxBuffer: 10 * 1024 * 1024,
+        // 10MB buffer for large environments
+        env: {
+          ...process.env,
+          // Prevent zsh from printing extra output
+          PROMPT_EOL_MARK: ""
+        },
+        stdio: ["pipe", "pipe", "pipe"]
+        // Capture stderr to ignore it
+      });
+    } else if (isBash) {
+      envOutput = execSync2(`${shell} --login -i -c 'env -0'`, {
+        encoding: "utf-8",
+        timeout: 5e3,
+        maxBuffer: 10 * 1024 * 1024,
+        stdio: ["pipe", "pipe", "pipe"]
+      });
+    } else {
+      envOutput = execSync2(`${shell} -l -c 'env -0'`, {
+        encoding: "utf-8",
+        timeout: 5e3,
+        maxBuffer: 10 * 1024 * 1024,
+        stdio: ["pipe", "pipe", "pipe"]
+      });
+    }
+    const shellEnv = {};
+    for (const entry of envOutput.split("\0")) {
+      if (!entry) continue;
+      const eqIndex = entry.indexOf("=");
+      if (eqIndex > 0) {
+        const key = entry.slice(0, eqIndex);
+        const value = entry.slice(eqIndex + 1);
+        shellEnv[key] = value;
+      }
+    }
+    cachedShellEnv = {
+      ...process.env,
+      ...shellEnv
+    };
+    return cachedShellEnv;
+  } catch (error) {
+    console.warn(
+      "Failed to retrieve shell environment, using process.env:",
+      error instanceof Error ? error.message : String(error)
+    );
+    cachedShellEnv = { ...process.env };
+    return cachedShellEnv;
+  }
+}
+
+// src/infrastructure/terminal/pty-manager.ts
+function getDefaultShell2() {
+  return process.env.SHELL ?? "/bin/bash";
+}
 var PtyManager = class {
   logger;
   bufferSize;
@@ -2733,18 +2802,19 @@ var PtyManager = class {
    */
   create(workingDir, cols, rows) {
     const sessionId = new SessionId(nanoid(12));
-    const shell = getDefaultShell();
+    const shell = getDefaultShell2();
     this.logger.debug(
       { sessionId: sessionId.value, workingDir, shell, cols, rows },
       "Creating terminal session"
     );
+    const shellEnv = getShellEnv();
     const ptyProcess = pty.spawn(shell, [], {
       name: "xterm-256color",
       cols,
       rows,
       cwd: workingDir,
       env: {
-        ...process.env,
+        ...shellEnv,
         TERM: "xterm-256color",
         // Disable zsh partial line marker (inverse % sign on startup)
         PROMPT_EOL_MARK: ""
@@ -2834,10 +2904,11 @@ var HeadlessAgentExecutor = class extends EventEmitter {
     }
     const { command, args } = this.buildCommand(prompt);
     const aliasEnvVars = this.getAliasEnvVars();
+    const shellEnv = getShellEnv();
     this.subprocess = spawn2(command, args, {
       cwd: this.workingDir,
       env: {
-        ...process.env,
+        ...shellEnv,
         // Apply alias env vars (e.g., CLAUDE_CONFIG_DIR)
         ...aliasEnvVars,
         // Ensure proper terminal environment
@@ -10861,6 +10932,14 @@ bootstrap().catch((error) => {
  * @copyright 2025 Roman Barinov <rbarinov@gmail.com>
  * @license FSL-1.1-NC
  */
+/**
+ * @file shell-env.ts
+ * @copyright 2025 Roman Barinov <rbarinov@gmail.com>
+ * @license FSL-1.1-NC
+ *
+ * Utility to get the interactive login shell environment variables,
+ * ensuring PATH and other user-configured variables are properly sourced.
+ */
 /**
  * @file pty-manager.ts
  * @copyright 2025 Roman Barinov <rbarinov@gmail.com>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiflis-io/tiflis-code-workstation",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Workstation server for tiflis-code - manages agent sessions and terminal access",
   "author": "Roman Barinov <rbarinov@gmail.com>",
   "license": "FSL-1.1-NC",