specrails-desktop 2.36.0 → 2.42.2

package/server/dist/terminal-manager.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TerminalManager = exports.TERMINAL_EARLY_EXIT_MS = exports.TerminalSpawnError = exports.TerminalNameInvalidError = exports.TerminalNotFoundError = exports.TerminalLimitExceededError = exports.RingBuffer = exports.TERMINAL_DEFAULT_ROWS = exports.TERMINAL_DEFAULT_COLS = exports.TERMINAL_NAME_MAX = exports.TERMINAL_MAX_PER_PROJECT = exports.TERMINAL_KILL_GRACE_MS = exports.TERMINAL_SCROLLBACK_BYTES = void 0;
+exports.killTerminalTree = killTerminalTree;
 exports.resolveShell = resolveShell;
 exports.resolveShellFor = resolveShellFor;
 exports.shellArgs = shellArgs;
@@ -20,6 +21,21 @@ const terminal_marks_store_1 = require("./terminal-marks-store");
 const terminal_shell_integration_1 = require("./terminal-shell-integration");
 exports.TERMINAL_SCROLLBACK_BYTES = 262_144;
 exports.TERMINAL_KILL_GRACE_MS = 2_000;
+/**
+ * Windows: node-pty ends a ConPTY session by enumerating the pseudo console's
+ * processes through a helper it starts with `process.execPath`. In the
+ * packaged sidecar that path is the sidecar binary itself, so the helper never
+ * runs, only the shell is terminated and whatever the shell started (a dev
+ * server, a watcher) survives the closed terminal. Kill the shell's process
+ * tree ourselves (`taskkill /T /F` through tree-kill). No-op elsewhere: the
+ * POSIX pty closes its process group.
+ */
+function killTerminalTree(pid, platform = process.platform, kill = win_spawn_1.treeKillSafe) {
+    if (platform !== 'win32' || !pid || !Number.isInteger(pid) || pid <= 0)
+        return false;
+    kill(pid, 'SIGKILL');
+    return true;
+}
 exports.TERMINAL_MAX_PER_PROJECT = 10;
 exports.TERMINAL_NAME_MAX = 64;
 exports.TERMINAL_DEFAULT_COLS = 80;
@@ -246,7 +262,7 @@ class TerminalManager {
         const shellIntegration = (0, terminal_shell_integration_1.composeShellIntegrationSpawn)(shell, id, projectSlug, opts.settings ?? { shellIntegrationEnabled: false });
         for (const [k, v] of Object.entries(shellIntegration.env))
             env[k] = v;
-        const args = shellIntegration.args.length > 0
+        const args = shellIntegration.replaceArgs ? shellIntegration.args : shellIntegration.args.length > 0
             ? [...shellIntegration.args, ...baseArgs]
             : baseArgs;
         let pty;
@@ -455,6 +471,7 @@ class TerminalManager {
     async shutdown() {
         const all = Array.from(this.sessions.values());
         for (const s of all) {
+            killTerminalTree(s.pty.pid);
             try {
                 s.pty.kill('SIGTERM');
             }
@@ -462,6 +479,7 @@ class TerminalManager {
         }
         await new Promise((r) => setTimeout(r, exports.TERMINAL_KILL_GRACE_MS));
         for (const s of Array.from(this.sessions.values())) {
+            killTerminalTree(s.pty.pid);
             try {
                 s.pty.kill('SIGKILL');
             }
@@ -540,12 +558,14 @@ class TerminalManager {
             return;
         this.detachFromRegistry(s);
         if (!s.exited) {
+            killTerminalTree(s.pty.pid);
             try {
                 s.pty.kill('SIGTERM');
             }
             catch { /* ignore */ }
             s.killTimer = setTimeout(() => {
                 if (!s.exited) {
+                    killTerminalTree(s.pty.pid);
                     try {
                         s.pty.kill('SIGKILL');
                     }

package/server/dist/terminal-shell-integration.js

@@ -141,7 +141,10 @@ function composeShellIntegrationSpawn(shell, sessionId, projectSlug, settings) {
         const shimContent = `# Specrails auto-generated PowerShell profile — do not edit\n. '${bundled.replace(/'/g, "''")}'\n`;
         writeFile(shimPath, shimContent);
         return {
-            args: ['-NoLogo', '-NoExit', '-File', shimPath],
+            // A process-only policy permits our generated local profile under the
+            // default Restricted policy; machine/user Group Policy still takes priority.
+            args: ['-NoLogo', '-NoExit', '-ExecutionPolicy', 'Bypass', '-File', shimPath],
+            replaceArgs: true,
             env: {},
             shimDir,
             shimPath,