From ee7c916494a3ae6ab44c3ce033eec126fc8e63c9 Mon Sep 17 00:00:00 2001
From: Zhihe Li <zhihe.li@hashicorp.com>
Date: Mon, 15 Sep 2025 18:11:43 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20sessions=20not=20pr?=
 =?UTF-8?q?operly=20getting=20cleaned=20up=20(#3002)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-17645
---
 ui/desktop/electron-app/src/models/session.js | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/ui/desktop/electron-app/src/models/session.js b/ui/desktop/electron-app/src/models/session.js
index 15777097e..e80f82d30 100644
--- a/ui/desktop/electron-app/src/models/session.js
+++ b/ui/desktop/electron-app/src/models/session.js
@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 
-const treeKill = require('tree-kill');
 const sanitizer = require('../utils/sanitizer.js');
-const { isWindows } = require('../helpers/platform.js');
-const { spawnAsyncJSONPromise } = require('../helpers/spawn-promise.js');
+const {
+  spawnAsyncJSONPromise,
+  spawnSync,
+} = require('../helpers/spawn-promise.js');
 
 class Session {
   #id;
@@ -73,14 +74,20 @@ class Session {
       if (this.isRunning) {
         this.#process.on('close', () => resolve());
         this.#process.on('error', (e) => reject(e));
-        /**
-         * On Windows OS, a spawned process uses cmd.exe to initiate a session.
-         * Hence, captured process.pid corresponds to cmd.exe instead of session.
-         * To avoid orphaned session processes and due to lack of node support
-         * to handle killing processes cleanly in this scenario,
-         * kill entire dependent process tree on Windows.
-         */
-        isWindows() ? treeKill(this.#process.pid) : this.#process.kill();
+
+        const sanitizedToken = sanitizer.base62EscapeAndValidate(this.#token);
+        // Cancel session before killing process
+        const cancelSessionCommand = [
+          'sessions',
+          'cancel',
+          `-id=${this.id}`,
+          '-token=env://BOUNDARY_TOKEN',
+        ];
+        spawnSync(cancelSessionCommand, {
+          BOUNDARY_TOKEN: sanitizedToken,
+        });
+
+        this.#process.kill();
       } else {
         // Do nothing when process isn't running
         resolve();