Remove workspace from hash

Author: Zentrik

src/extension/noConfigDebugInit.ts

@@ -11,7 +11,6 @@ import {
     env,
     l10n,
     RelativePattern,
-    workspace,
 } from 'vscode';
 import { createFileSystemWatcher, debugStartDebugging } from './utils';
 import { traceError, traceVerbose } from './common/log/logging';
@@ -40,24 +39,12 @@ export async function registerNoConfigDebug(
     const collection = envVarCollection;
 
     // create a temp directory for the noConfigDebugAdapterEndpoints
-    // file path format: extPath/.noConfigDebugAdapterEndpoints/endpoint-stableWorkspaceHash.txt
-    let workspaceString = workspace.workspaceFile?.fsPath;
-    if (!workspaceString) {
-        workspaceString = workspace.workspaceFolders?.map((e) => e.uri.fsPath).join(';');
-    }
-    if (!workspaceString) {
-        traceError('No workspace folder found');
-        return Promise.resolve(new Disposable(() => {}));
-    }
-
-    // Create unique hash based on workspace and VS Code session ID
-    const hash = crypto.createHash('sha256');
-    hash.update(workspaceString.toString());
-    hash.update(env.sessionId);
-    const stableWorkspaceHash = hash.digest('hex').slice(0, 16);
+    // file path format: extPath/.noConfigDebugAdapterEndpoints/endpoint-<sessionId>.txt
+    // sessionId is unique per VS Code window, ensuring isolation between windows
 
     const tempDirPath = path.join(extPath, '.noConfigDebugAdapterEndpoints');
-    const endpointFilename = `endpoint-${stableWorkspaceHash}.txt`;
+    const sessionIdHash = crypto.createHash('sha256').update(env.sessionId).digest('hex').slice(0, 16);
+    const endpointFilename = `endpoint-${sessionIdHash}.txt`;
     const tempFilePath = path.join(tempDirPath, endpointFilename);
 
     // create the temp directory if it doesn't exist

src/test/unittest/noConfigDebugInit.unit.test.ts

@@ -6,7 +6,7 @@ import { IExtensionContext } from '../../extension/common/types';
 import { registerNoConfigDebug as registerNoConfigDebug } from '../../extension/noConfigDebugInit';
 import * as TypeMoq from 'typemoq';
 import * as sinon from 'sinon';
-import { DebugConfiguration, DebugSessionOptions, RelativePattern, Uri, workspace } from 'vscode';
+import { DebugConfiguration, DebugSessionOptions, env, RelativePattern, Uri } from 'vscode';
 import * as utils from '../../extension/utils';
 import { assert } from 'console';
 import * as fs from 'fs';
@@ -19,10 +19,10 @@ suite('setup for no-config debug scenario', function () {
     let context: TypeMoq.IMock<IExtensionContext>;
     let noConfigScriptsDir: string;
     let bundledDebugPath: string;
-    let noConfigEndpointDir: string;
     let DEBUGPY_ADAPTER_ENDPOINTS = 'DEBUGPY_ADAPTER_ENDPOINTS';
     let BUNDLED_DEBUGPY_PATH = 'BUNDLED_DEBUGPY_PATH';
-    let workspaceUriStub: sinon.SinonStub;
+    const testSessionId = 'test-session-id-1234';
+    const hashedSessionId = crypto.createHash('sha256').update(testSessionId).digest('hex').slice(0, 16);
 
     const testDataDir = path.join(__dirname, 'testData');
     const testFilePath = path.join(testDataDir, 'debuggerAdapterEndpoint.txt');
@@ -34,21 +34,20 @@ suite('setup for no-config debug scenario', function () {
             context.setup((c) => c.subscriptions).returns(() => []);
             noConfigScriptsDir = path.join(context.object.extensionPath, 'bundled/scripts/noConfigScripts');
             bundledDebugPath = path.join(context.object.extensionPath, 'bundled/libs/debugpy');
-            noConfigEndpointDir = path.join(context.object.extensionPath, '.noConfigDebugAdapterEndpoints');
 
             // Stub crypto.randomBytes with proper typing
             let randomBytesStub = sinon.stub(crypto, 'randomBytes');
             // Provide a valid Buffer object
             randomBytesStub.callsFake((_size: number) => Buffer.from('1234567899', 'hex'));
 
-            workspaceUriStub = sinon.stub(workspace, 'workspaceFolders').value([{ uri: Uri.parse(os.tmpdir()) }]);
+            // Stub env.sessionId to return a consistent value for tests
+            sinon.stub(env, 'sessionId').value(testSessionId);
         } catch (error) {
             console.error('Error in setup:', error);
         }
     });
     teardown(() => {
         sinon.restore();
-        workspaceUriStub.restore();
     });
 
     test('should add environment variables for DEBUGPY_ADAPTER_ENDPOINTS, BUNDLED_DEBUGPY_PATH, and PATH', async () => {
@@ -195,10 +194,10 @@ suite('setup for no-config debug scenario', function () {
 
         // Assert
         sinon.assert.calledOnce(createFileSystemWatcherFunct);
-        const expectedPattern = sinon.match
-            .instanceOf(RelativePattern)
-            .and(sinon.match.has('base', Uri.file(noConfigEndpointDir).fsPath))
-            .and(sinon.match.has('pattern', sinon.match(/^endpoint-[0-9a-f]{16}\.txt$/)));
+        const expectedPattern = new RelativePattern(
+            path.join(os.tmpdir(), '.noConfigDebugAdapterEndpoints'),
+            `endpoint-${hashedSessionId}.txt`,
+        );
         sinon.assert.calledWith(createFileSystemWatcherFunct, expectedPattern);
     });