From 6ccb54f97870fc14080ec1a68d85e0f6eaa0e79a Mon Sep 17 00:00:00 2001
From: Bharat Middha <5100938+bmiddha@users.noreply.github.com>
Date: Tue, 26 Aug 2025 10:43:09 -0700
Subject: [PATCH 1/4] bump shell integration timeout

---
 .../src/terminal.ts                                           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts b/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts
index 9def626f78b..e5b084b4c95 100644
--- a/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts
+++ b/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts
@@ -5,6 +5,8 @@ import { ITerminal } from '@rushstack/terminal';
 import * as vscode from 'vscode';
 import { stripVTControlCharacters } from 'node:util';
 
+const SHELL_INTEGRATION_TIMEOUT: number = 15_000;
+
 export async function runWorkspaceCommandAsync({
   terminalOptions,
   commandLine,
@@ -37,7 +39,7 @@ export async function runWorkspaceCommandAsync({
       timeoutId = setTimeout(() => {
         shellIntegrationDisposable?.dispose();
         reject(new Error('Shell integration timeout'));
-      }, 5000);
+      }, SHELL_INTEGRATION_TIMEOUT);
     }));
 
   // Run the command through shell integration and grab output

From 0cd685aea1e689eabe111ba865e5a3c94e85e8da Mon Sep 17 00:00:00 2001
From: Bharat Middha <5100938+bmiddha@users.noreply.github.com>
Date: Tue, 26 Aug 2025 10:49:38 -0700
Subject: [PATCH 2/4] bump extension version

---
 .../debug-certificate-manager-vscode-extension/package.json     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode-extensions/debug-certificate-manager-vscode-extension/package.json b/vscode-extensions/debug-certificate-manager-vscode-extension/package.json
index 76fb49e3639..2a9be9d1791 100644
--- a/vscode-extensions/debug-certificate-manager-vscode-extension/package.json
+++ b/vscode-extensions/debug-certificate-manager-vscode-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "debug-certificate-manager",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/microsoft/rushstack.git",

From 90f41235cd4ef62b1e53ea430350d130d636195d Mon Sep 17 00:00:00 2001
From: Bharat Middha <5100938+bmiddha@users.noreply.github.com>
Date: Tue, 26 Aug 2025 14:32:11 -0700
Subject: [PATCH 3/4] fix activation event

---
 .../debug-certificate-manager-vscode-extension/package.json     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode-extensions/debug-certificate-manager-vscode-extension/package.json b/vscode-extensions/debug-certificate-manager-vscode-extension/package.json
index 2a9be9d1791..ad94ab5c49b 100644
--- a/vscode-extensions/debug-certificate-manager-vscode-extension/package.json
+++ b/vscode-extensions/debug-certificate-manager-vscode-extension/package.json
@@ -107,7 +107,7 @@
   },
   "enabledApiProposals": [],
   "activationEvents": [
-    "workspaceContains:.vscode/debug-certificate-manager.json"
+    "workspaceContains:/.vscode/debug-certificate-manager.json"
   ],
   "dependencies": {
     "@rushstack/debug-certificate-manager": "workspace:*",

From 6b0bddb85eb639034ebabd35db39da1893ad1896 Mon Sep 17 00:00:00 2001
From: Bharat Middha <5100938+bmiddha@users.noreply.github.com>
Date: Tue, 26 Aug 2025 14:32:17 -0700
Subject: [PATCH 4/4] remove timeout

---
 .../src/terminal.ts                                  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts b/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts
index e5b084b4c95..a84c376c055 100644
--- a/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts
+++ b/vscode-extensions/debug-certificate-manager-vscode-extension/src/terminal.ts
@@ -5,8 +5,6 @@ import { ITerminal } from '@rushstack/terminal';
 import * as vscode from 'vscode';
 import { stripVTControlCharacters } from 'node:util';
 
-const SHELL_INTEGRATION_TIMEOUT: number = 15_000;
-
 export async function runWorkspaceCommandAsync({
   terminalOptions,
   commandLine,
@@ -22,24 +20,16 @@ export async function runWorkspaceCommandAsync({
   const shellIntegration: vscode.TerminalShellIntegration =
     vsTerminal.shellIntegration ??
     (await new Promise((resolve, reject) => {
-      let timeoutId: NodeJS.Timeout | undefined;
       const shellIntegrationDisposable: vscode.Disposable = vscode.window.onDidChangeTerminalShellIntegration(
         (event) => {
           if (event.terminal !== vsTerminal) {
             return;
           }
-          if (timeoutId) {
-            clearTimeout(timeoutId);
-            timeoutId = undefined;
-          }
+
           resolve(event.shellIntegration);
           shellIntegrationDisposable?.dispose();
         }
       );
-      timeoutId = setTimeout(() => {
-        shellIntegrationDisposable?.dispose();
-        reject(new Error('Shell integration timeout'));
-      }, SHELL_INTEGRATION_TIMEOUT);
     }));
 
   // Run the command through shell integration and grab output