From e9b53c7d09763f042455b04383c9038475a495a9 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 2 Mar 2023 14:15:59 -0800
Subject: [PATCH 1/3] fix: cannot read property error

Seems like esbuild doesn't deal with const enums in dependency .d.ts like ts does
---
 .husky/pre-commit                      | 2 +-
 package.json                           | 1 +
 src/targets/browser/browserLauncher.ts | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index 3622d7050..84aacf945 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run test:lint && npm run test:types
+npm run -S precommit
diff --git a/package.json b/package.json
index 7ffc94739..c0c7ac171 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "prepare": "husky install",
     "package": "gulp package",
     "publish": "gulp publish",
+    "precommit": "npm-run-all --parallel test:lint test:types",
     "updatetypes": "cd src/typings && npx vscode-dts dev && npx vscode-dts master",
     "updatenodeapi": "python src/build/getNodePdl.py && prettier --write src/build/nodeCustom.ts",
     "generateapis": "node dist/src/build/generateDap.js && node dist/src/build/generateCdp.js",
diff --git a/src/targets/browser/browserLauncher.ts b/src/targets/browser/browserLauncher.ts
index af71e48e3..de9298c27 100644
--- a/src/targets/browser/browserLauncher.ts
+++ b/src/targets/browser/browserLauncher.ts
@@ -2,7 +2,7 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import { IBrowserFinder, isQuality, Quality } from '@vscode/js-debug-browsers';
+import { IBrowserFinder, isQuality } from '@vscode/js-debug-browsers';
 import * as fs from 'fs';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
@@ -92,7 +92,7 @@ export abstract class BrowserLauncher<T extends AnyChromiumLaunchConfiguration>
     telemetryReporter: ITelemetryReporter,
     promisedPort?: Promise<number>,
   ): Promise<launcher.ILaunchResult> {
-    const executablePath = await this.findBrowserPath(executable || Quality.Stable);
+    const executablePath = await this.findBrowserPath(executable || 'stable');
 
     // If we had a custom executable, don't resolve a data
     // dir unless it's  explicitly requested.
@@ -298,7 +298,7 @@ export abstract class BrowserLauncher<T extends AnyChromiumLaunchConfiguration>
       // try to find the stable browser, but if that fails just get any browser
       // that's available on the system
       const found =
-        (await finder.findWhere(r => r.quality === Quality.Stable)) || (await finder.findAll())[0];
+        (await finder.findWhere(r => r.quality === 'stable')) || (await finder.findAll())[0];
       return found?.path;
     } else if (isQuality(executablePath)) {
       return (await finder.findWhere(r => r.quality === executablePath))?.path;

From 2bf3f18024b142c485722530171502bef81d6571 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 2 Mar 2023 16:39:21 -0800
Subject: [PATCH 2/3] fix: assorted bad source behaviors when reloading a page

Fixes #1582
---
 CHANGELOG.md                                  |  1 +
 src/adapter/breakpoints.ts                    | 19 ++--
 src/adapter/breakpoints/breakpointBase.ts     | 20 ++--
 src/adapter/diagnosics.ts                     |  2 +-
 src/adapter/scriptSkipper/implementation.ts   | 26 +++--
 src/adapter/sources.ts                        | 43 ++++++--
 src/adapter/threads.ts                        | 99 ++++++++++---------
 ...s-with-removed-execution-contexts-1582.txt | 27 +++++
 src/test/breakpoints/breakpointsTest.ts       | 25 +++++
 testWorkspace/web/iframe-1582/index.html      | 12 +++
 testWorkspace/web/iframe-1582/inner.html      | 12 +++
 testWorkspace/web/iframe-1582/inner.js        |  4 +
 12 files changed, 204 insertions(+), 86 deletions(-)
 create mode 100644 src/test/breakpoints/breakpoints-deals-with-removed-execution-contexts-1582.txt
 create mode 100644 testWorkspace/web/iframe-1582/index.html
 create mode 100644 testWorkspace/web/iframe-1582/inner.html
 create mode 100644 testWorkspace/web/iframe-1582/inner.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e6b07cdc..605a12030 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This changelog records changes to stable releases since 1.50.2. "TBA" changes he
 - fix: repl stacktrace with renames showing too much info ([#1259](https://github.com/microsoft/vscode-js-debug/issues/1259#issuecomment-1409443564))
 - fix: recursive source map resolution parsing ignored locations ([vscode#169733](https://github.com/microsoft/vscode/issues/169733))
 - fix: unbound breakpoints in sourcemaps on Chrome 112 ([#1567](https://github.com/microsoft/vscode-js-debug/issues/1567))
+- fix: assorted bad source behaviors when reloading a page ([#1582](https://github.com/microsoft/vscode-js-debug/issues/1582))
 - chore: remove webpack, adopt esbuild
 
 ## v1.76 (February 2023)
diff --git a/src/adapter/breakpoints.ts b/src/adapter/breakpoints.ts
index bcf3cd201..45ba4e71d 100644
--- a/src/adapter/breakpoints.ts
+++ b/src/adapter/breakpoints.ts
@@ -26,17 +26,17 @@ import { PatternEntryBreakpoint } from './breakpoints/patternEntrypointBreakpoin
 import { UserDefinedBreakpoint } from './breakpoints/userDefinedBreakpoint';
 import { DiagnosticToolSuggester } from './diagnosticToolSuggester';
 import {
-  base0To1,
-  base1To0,
   ISourceWithMap,
-  isSourceWithMap,
   IUiLocation,
-  rawToUiOffset,
   Source,
   SourceContainer,
+  base0To1,
+  base1To0,
+  isSourceWithMap,
+  rawToUiOffset,
   uiToRawOffset,
 } from './sources';
-import { Script, ScriptWithSourceMapHandler, Thread } from './threads';
+import { ScriptWithSourceMapHandler, Thread } from './threads';
 
 /**
  * Differential result used internally in setBreakpoints.
@@ -348,16 +348,15 @@ export class BreakpointManager {
         continue;
       }
 
-      // Only take the first script that matches this source. The breakpoints
+      // Only take the last script that matches this source. The breakpoints
       // are all coming from the same source code, so possible breakpoints
       // at one location where this source is present should match every other.
       const lsrc = start.source;
-      const scripts = thread.scriptsFromSource(lsrc);
-      if (scripts.size === 0) {
+      if (!lsrc.scripts.length) {
         continue;
       }
 
-      const { scriptId } = scripts.values().next().value as Script;
+      const { scriptId } = lsrc.scripts[lsrc.scripts.length - 1];
       todo.push(
         thread
           .cdp()
@@ -610,7 +609,7 @@ export class BreakpointManager {
     await Promise.all(
       result.unbound.map(b => {
         this._byDapId.delete(b.dapId);
-        b.disable();
+        return b.disable();
       }),
     );
 
diff --git a/src/adapter/breakpoints/breakpointBase.ts b/src/adapter/breakpoints/breakpointBase.ts
index 8abc51a1b..33e9af0a1 100644
--- a/src/adapter/breakpoints/breakpointBase.ts
+++ b/src/adapter/breakpoints/breakpointBase.ts
@@ -7,7 +7,14 @@ import { LogTag } from '../../common/logging';
 import { absolutePathToFileUrl, urlToRegex } from '../../common/urlUtils';
 import Dap from '../../dap/api';
 import { BreakpointManager } from '../breakpoints';
-import { base1To0, IUiLocation, Source, SourceFromMap, uiToRawOffset } from '../sources';
+import {
+  base1To0,
+  ISourceScript,
+  IUiLocation,
+  Source,
+  SourceFromMap,
+  uiToRawOffset,
+} from '../sources';
 import { Script, Thread } from '../threads';
 
 export type LineColumn = { lineNumber: number; columnNumber: number }; // 1-based
@@ -451,10 +458,9 @@ export abstract class Breakpoint {
   }
 
   private async _setByUiLocation(thread: Thread, uiLocation: IUiLocation): Promise<void> {
-    const promises: Promise<void>[] = [];
-    const scripts = thread.scriptsFromSource(uiLocation.source);
-    for (const script of scripts) promises.push(this._setByScriptId(thread, script, uiLocation));
-    await Promise.all(promises);
+    await Promise.all(
+      uiLocation.source.scripts.map(script => this._setByScriptId(thread, script, uiLocation)),
+    );
   }
 
   protected async _setByPath(thread: Thread, lineColumn: LineColumn): Promise<void> {
@@ -503,7 +509,7 @@ export abstract class Breakpoint {
    * requests to avoid triggering any logpoint breakpoints multiple times,
    * as would happen if we set a breakpoint both by script and URL.
    */
-  protected hasSetOnLocation(script: Partial<Script>, lineColumn: LineColumn) {
+  protected hasSetOnLocation(script: ISourceScript, lineColumn: LineColumn) {
     return this.cdpBreakpoints.find(
       bp =>
         (script.scriptId &&
@@ -566,7 +572,7 @@ export abstract class Breakpoint {
 
   private async _setByScriptId(
     thread: Thread,
-    script: Script,
+    script: ISourceScript,
     lineColumn: LineColumn,
   ): Promise<void> {
     lineColumn = base1To0(lineColumn);
diff --git a/src/adapter/diagnosics.ts b/src/adapter/diagnosics.ts
index d676e33f8..1cb0e3332 100644
--- a/src/adapter/diagnosics.ts
+++ b/src/adapter/diagnosics.ts
@@ -140,7 +140,7 @@ export class Diagnostics {
           sourceReference: source.sourceReference,
           absolutePath: source.absolutePath,
           actualAbsolutePath: await source.existingAbsolutePath(),
-          scriptIds: source.scriptIds(),
+          scriptIds: source.scripts.map(s => s.scriptId),
           prettyName: await source.prettyName(),
           compiledSourceRefToUrl:
             source instanceof SourceFromMap
diff --git a/src/adapter/scriptSkipper/implementation.ts b/src/adapter/scriptSkipper/implementation.ts
index 317ea6b92..2cd6e0146 100644
--- a/src/adapter/scriptSkipper/implementation.ts
+++ b/src/adapter/scriptSkipper/implementation.ts
@@ -12,7 +12,7 @@ import { ILogger, LogTag } from '../../common/logging';
 import { node15InternalsPrefix } from '../../common/node15Internal';
 import { memoizeLast, trailingEdgeThrottle, truthy } from '../../common/objUtils';
 import * as pathUtils from '../../common/pathUtils';
-import { getDeferred, IDeferred } from '../../common/promiseUtil';
+import { IDeferred, getDeferred } from '../../common/promiseUtil';
 import { ISourcePathResolver } from '../../common/sourcePathResolver';
 import { escapeRegexSpecialChars } from '../../common/stringUtils';
 import * as urlUtils from '../../common/urlUtils';
@@ -20,11 +20,12 @@ import { AnyLaunchConfiguration } from '../../configuration';
 import Dap from '../../dap/api';
 import { ITarget } from '../../targets/targets';
 import {
+  ISourceScript,
   ISourceWithMap,
-  isSourceWithMap,
   Source,
   SourceContainer,
   SourceFromMap,
+  isSourceWithMap,
 } from '../sources';
 import { getSourceSuffix } from '../templates';
 import { simpleGlobsToRe } from './simpleGlobToRe';
@@ -205,7 +206,7 @@ export class ScriptSkipper {
 
   private async _updateSourceWithSkippedSourceMappedSources(
     source: ISourceWithMap,
-    scriptIds: Cdp.Runtime.ScriptId[],
+    scripts: readonly ISourceScript[],
   ): Promise<void> {
     // Order "should" be correct
     const parentIsSkipped = this.isScriptSkipped(source.url);
@@ -238,14 +239,14 @@ export class ScriptSkipper {
       }
     });
 
-    let targets = scriptIds;
+    let targets = scripts;
     if (!skipRanges.length) {
-      targets = targets.filter(t => this._scriptsWithSkipping.has(t));
-      targets.forEach(t => this._scriptsWithSkipping.delete(t));
+      targets = targets.filter(t => this._scriptsWithSkipping.has(t.scriptId));
+      targets.forEach(t => this._scriptsWithSkipping.delete(t.scriptId));
     }
 
     await Promise.all(
-      targets.map(scriptId =>
+      targets.map(({ scriptId }) =>
         this.cdp.Debugger.setBlackboxedRanges({ scriptId, positions: skipRanges }),
       ),
     );
@@ -255,7 +256,7 @@ export class ScriptSkipper {
     this._initializeSkippingValueForSource(source);
   }
 
-  private _initializeSkippingValueForSource(source: Source, scriptIds = source.scriptIds()) {
+  private _initializeSkippingValueForSource(source: Source, scripts = source.scripts) {
     const url = source.url;
     let skipped = this.isScriptSkipped(url);
 
@@ -281,10 +282,10 @@ export class ScriptSkipper {
       }
 
       for (const nestedSource of source.sourceMap.sourceByUrl.values()) {
-        this._initializeSkippingValueForSource(nestedSource, scriptIds);
+        this._initializeSkippingValueForSource(nestedSource, scripts);
       }
 
-      this._updateSourceWithSkippedSourceMappedSources(source, scriptIds);
+      this._updateSourceWithSkippedSourceMappedSources(source, scripts);
     }
   }
 
@@ -333,10 +334,7 @@ export class ScriptSkipper {
       const compiledSources = Array.from(source.compiledToSourceUrl.keys());
       await Promise.all(
         compiledSources.map(compiledSource =>
-          this._updateSourceWithSkippedSourceMappedSources(
-            compiledSource,
-            compiledSource.scriptIds(),
-          ),
+          this._updateSourceWithSkippedSourceMappedSources(compiledSource, compiledSource.scripts),
         ),
       );
     } else {
diff --git a/src/adapter/sources.ts b/src/adapter/sources.ts
index 568f4ec26..8992ba1df 100644
--- a/src/adapter/sources.ts
+++ b/src/adapter/sources.ts
@@ -17,7 +17,7 @@ import { forceForwardSlashes, isSubdirectoryOf, properResolve } from '../common/
 import { delay, getDeferred } from '../common/promiseUtil';
 import { ISourceMapMetadata, SourceMap } from '../common/sourceMaps/sourceMap';
 import { CachingSourceMapFactory, ISourceMapFactory } from '../common/sourceMaps/sourceMapFactory';
-import { InlineScriptOffset, ISourcePathResolver } from '../common/sourcePathResolver';
+import { ISourcePathResolver, InlineScriptOffset } from '../common/sourcePathResolver';
 import * as sourceUtils from '../common/sourceUtils';
 import { prettyPrintAsSourceMap } from '../common/sourceUtils';
 import * as utils from '../common/urlUtils';
@@ -95,6 +95,12 @@ const defaultTimeouts: SourceMapTimeouts = {
   sourceMapCumulativePause: 10000,
 };
 
+export interface ISourceScript {
+  executionContextId: Cdp.Runtime.ExecutionContextId;
+  scriptId: Cdp.Runtime.ScriptId;
+  url: string;
+}
+
 // Represents a text source visible to the user.
 //
 // Source maps flow (start with compiled1 and compiled2). Two different compiled sources
@@ -134,7 +140,7 @@ export class Source {
   // This is the same as |_absolutePath|, but additionally checks that file exists to
   // avoid errors when page refers to non-existing paths/urls.
   private readonly _existingAbsolutePath: Promise<string | undefined>;
-  private readonly _scriptIds: Cdp.Runtime.ScriptId[] = [];
+  private _scripts: ISourceScript[] = [];
 
   /**
    * @param inlineScriptOffset Offset of the start location of the script in
@@ -157,7 +163,7 @@ export class Source {
     sourceMapUrl?: string,
     public readonly inlineScriptOffset?: InlineScriptOffset,
     public readonly runtimeScriptOffset?: InlineScriptOffset,
-    contentHash?: string,
+    public readonly contentHash?: string,
   ) {
     this.sourceReference = container.getSourceReference(url);
     this._contentGetter = once(contentGetter);
@@ -191,12 +197,26 @@ export class Source {
     };
   }
 
-  addScriptId(scriptId: Cdp.Runtime.ScriptId): void {
-    this._scriptIds.push(scriptId);
+  /**
+   * Associated a script with this source. This is only valid for a source
+   * from the runtime, not a {@link SourceFromMap}.
+   */
+  addScript(script: ISourceScript): void {
+    this._scripts.push(script);
+  }
+
+  /**
+   * Filters scripts from a source, done when an execution context is removed.
+   */
+  filterScripts(fn: (s: ISourceScript) => boolean): void {
+    this._scripts = this._scripts.filter(fn);
   }
 
-  scriptIds(): Cdp.Runtime.ScriptId[] {
-    return this._scriptIds;
+  /**
+   * Gets scripts associated with this source.
+   */
+  get scripts(): ReadonlyArray<ISourceScript> {
+    return this._scripts;
   }
 
   /**
@@ -903,6 +923,9 @@ export class SourceContainer {
   }
 
   private async _addSource(source: Source) {
+    // todo: we should allow the same source at multiple uri's if their scripts
+    // have different executionContextId. We only really need the overwrite
+    // behavior in Node for tools that transpile sources inline.
     const existingByUrl = source.url && this._sourceByOriginalUrl.get(source.url);
     if (existingByUrl && !isOriginalSourceOf(existingByUrl, source)) {
       this.removeSource(existingByUrl, true);
@@ -1023,6 +1046,12 @@ export class SourceContainer {
       'Expected source to be the same as the existing reference',
     );
     this._sourceByReference.delete(source.sourceReference);
+
+    // check for overwrites:
+    if (this._sourceByOriginalUrl.get(source.url) === source) {
+      this._sourceByOriginalUrl.delete(source.url);
+    }
+
     if (source instanceof SourceFromMap) {
       this._sourceMapSourcesByUrl.delete(source.url);
       for (const [compiled, key] of source.compiledToSourceUrl) {
diff --git a/src/adapter/threads.ts b/src/adapter/threads.ts
index 895b1ce72..7fa4f9c6c 100644
--- a/src/adapter/threads.ts
+++ b/src/adapter/threads.ts
@@ -11,7 +11,7 @@ import { HrTime } from '../common/hrnow';
 import { ILogger, LogTag } from '../common/logging';
 import { isInstanceOf, truthy } from '../common/objUtils';
 import { Base1Position } from '../common/positions';
-import { delay, getDeferred, IDeferred } from '../common/promiseUtil';
+import { IDeferred, delay, getDeferred } from '../common/promiseUtil';
 import { IRenameProvider } from '../common/sourceMaps/renameProvider';
 import * as sourceUtils from '../common/sourceUtils';
 import { StackTraceParser } from '../common/stackTraceParser';
@@ -33,16 +33,16 @@ import { CustomBreakpointId, customBreakpoints } from './customBreakpoints';
 import { IEvaluator } from './evaluator';
 import { IExceptionPauseService } from './exceptionPauseService';
 import * as objectPreview from './objectPreview';
-import { getContextForType, PreviewContextType } from './objectPreview/contexts';
+import { PreviewContextType, getContextForType } from './objectPreview/contexts';
 import { SmartStepper } from './smartStepping';
 import {
-  base1To0,
   IPreferredUiLocation,
   ISourceWithMap,
   IUiLocation,
-  rawToUiOffset,
   Source,
   SourceContainer,
+  base1To0,
+  rawToUiOffset,
 } from './sources';
 import { StackFrame, StackTrace } from './stackTrace';
 import {
@@ -85,22 +85,33 @@ export interface IPausedDetails {
 }
 
 export class ExecutionContext {
-  readonly thread: Thread;
-  readonly description: Cdp.Runtime.ExecutionContextDescription;
+  public readonly sourceMapLoads = new Map<string, Promise<IUiLocation[]>>();
+  public readonly scripts: Script[] = [];
 
-  constructor(thread: Thread, description: Cdp.Runtime.ExecutionContextDescription) {
-    this.thread = thread;
-    this.description = description;
-  }
+  constructor(public readonly description: Cdp.Runtime.ExecutionContextDescription) {}
 
-  isDefault(): boolean {
+  get isDefault(): boolean {
     return this.description.auxData && this.description.auxData['isDefault'];
   }
+
+  /** Removes all scripts associated with the context */
+  async remove(container: SourceContainer) {
+    await Promise.all(
+      this.scripts.map(async s => {
+        const source = await s.source;
+        source.filterScripts(s => s.executionContextId !== this.description.id);
+        if (!source.scripts.length) {
+          container.removeSource(source);
+        }
+      }),
+    );
+  }
 }
 
 export type Script = {
   url: string;
   scriptId: string;
+  executionContextId: number;
   source: Promise<Source>;
   resolvedSource?: Source;
 };
@@ -168,12 +179,8 @@ export class Thread implements IVariableStoreLocationProvider {
   static _allThreadsByDebuggerId = new Map<Cdp.Runtime.UniqueDebuggerId, Thread>();
   private _scriptWithSourceMapHandler?: ScriptWithSourceMapHandler;
   private _sourceMapDisabler?: SourceMapDisabler;
-  // url => (hash => Source)
-  private _scriptSources = new Map<string, Map<string, Source>>();
-  private _sourceMapLoads = new Map<string, Promise<IUiLocation[]>>();
   private _expectedPauseReason?: ExpectedPauseReason;
   private _excludedCallers: readonly Dap.ExcludedCaller[] = [];
-  private readonly _sourceScripts = new WeakMap<Source, Set<Script>>();
   private readonly _onPausedEmitter = new EventEmitter<IPausedDetails>();
   private readonly _dap: DeferredContainer<Dap.Api>;
   private disposed = false;
@@ -239,13 +246,9 @@ export class Thread implements IVariableStoreLocationProvider {
     return this._pausedVariables;
   }
 
-  executionContexts(): ExecutionContext[] {
-    return Array.from(this._executionContexts.values());
-  }
-
   defaultExecutionContext(): ExecutionContext | undefined {
     for (const context of this._executionContexts.values()) {
-      if (context.isDefault()) return context;
+      if (context.isDefault) return context;
     }
   }
 
@@ -774,7 +777,7 @@ export class Thread implements IVariableStoreLocationProvider {
   }
 
   private _executionContextCreated(description: Cdp.Runtime.ExecutionContextDescription) {
-    const context = new ExecutionContext(this, description);
+    const context = new ExecutionContext(description);
     this._executionContexts.set(description.id, context);
   }
 
@@ -782,6 +785,7 @@ export class Thread implements IVariableStoreLocationProvider {
     const context = this._executionContexts.get(contextId);
     if (!context) return;
     this._executionContexts.delete(contextId);
+    context.remove(this._sourceContainer);
   }
 
   _executionContextsCleared() {
@@ -1372,14 +1376,8 @@ export class Thread implements IVariableStoreLocationProvider {
     };
   }
 
-  scriptsFromSource(source: Source): Set<Script> {
-    return this._sourceScripts.get(source) || new Set();
-  }
-
   private _removeAllScripts(silent = false) {
     this._sourceContainer.clear(silent);
-    this._scriptSources.clear();
-    this._sourceMapLoads.clear();
   }
 
   private _onScriptParsed(event: Cdp.Debugger.ScriptParsedEvent) {
@@ -1397,18 +1395,23 @@ export class Thread implements IVariableStoreLocationProvider {
       return;
     }
 
-    if (event.url) event.url = this.target.scriptUrlToUrl(event.url);
+    if (event.url) {
+      event.url = this.target.scriptUrlToUrl(event.url);
+    }
 
-    let urlHashMap = this._scriptSources.get(event.url);
-    if (!urlHashMap) {
-      urlHashMap = new Map();
-      this._scriptSources.set(event.url, urlHashMap);
+    const executionContext = this._executionContexts.get(event.executionContextId);
+    if (!executionContext) {
+      return;
     }
 
     const createSource = async () => {
-      const prevSource = event.url && event.hash && urlHashMap && urlHashMap.get(event.hash);
-      if (prevSource) {
-        prevSource.addScriptId(event.scriptId);
+      const prevSource = this._sourceContainer.getSourceByOriginalUrl(event.url);
+      if (event.hash && prevSource?.contentHash === event.hash) {
+        prevSource.addScript({
+          scriptId: event.scriptId,
+          url: event.url,
+          executionContextId: event.executionContextId,
+        });
         return prevSource;
       }
 
@@ -1454,16 +1457,11 @@ export class Thread implements IVariableStoreLocationProvider {
         !event.hasSourceURL && this.launchConfig.enableContentValidation ? event.hash : undefined,
       );
 
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      urlHashMap!.set(event.hash, source);
-      source.addScriptId(event.scriptId);
-
-      let scriptSet = this._sourceScripts.get(source);
-      if (!scriptSet) {
-        scriptSet = new Set();
-        this._sourceScripts.set(source, scriptSet);
-      }
-      scriptSet.add(script);
+      source.addScript({
+        scriptId: event.scriptId,
+        url: event.url,
+        executionContextId: event.executionContextId,
+      });
 
       return source;
     };
@@ -1471,9 +1469,11 @@ export class Thread implements IVariableStoreLocationProvider {
     const script: Script = {
       url: event.url,
       scriptId: event.scriptId,
+      executionContextId: event.executionContextId,
       source: createSource(),
     };
     script.source.then(s => (script.resolvedSource = s));
+    executionContext.scripts.push(script);
 
     this._sourceContainer.addScriptById(script);
 
@@ -1550,7 +1550,12 @@ export class Thread implements IVariableStoreLocationProvider {
    * handler's results.
    */
   private _getOrStartLoadingSourceMaps(script: Script) {
-    const existing = this._sourceMapLoads.get(script.scriptId);
+    const ctx = this._executionContexts.get(script.executionContextId);
+    if (!ctx) {
+      return Promise.resolve([]);
+    }
+
+    const existing = ctx.sourceMapLoads.get(script.scriptId);
     if (existing) {
       return existing;
     }
@@ -1563,7 +1568,7 @@ export class Thread implements IVariableStoreLocationProvider {
           : [],
       );
 
-    this._sourceMapLoads.set(script.scriptId, result);
+    ctx.sourceMapLoads.set(script.scriptId, result);
     return result;
   }
 
diff --git a/src/test/breakpoints/breakpoints-deals-with-removed-execution-contexts-1582.txt b/src/test/breakpoints/breakpoints-deals-with-removed-execution-contexts-1582.txt
new file mode 100644
index 000000000..a9d75166d
--- /dev/null
+++ b/src/test/breakpoints/breakpoints-deals-with-removed-execution-contexts-1582.txt
@@ -0,0 +1,27 @@
+{
+    allThreadsStopped : false
+    description : Paused on breakpoint
+    reason : breakpoint
+    threadId : <number>
+}
+<anonymous> @ ${workspaceFolder}/web/iframe-1582/inner.js:3:3
+----setInterval----
+<anonymous> @ ${workspaceFolder}/web/iframe-1582/inner.js:2:1
+{
+    allThreadsStopped : false
+    description : Paused on breakpoint
+    reason : breakpoint
+    threadId : <number>
+}
+<anonymous> @ ${workspaceFolder}/web/iframe-1582/inner.js:3:3
+----setInterval----
+<anonymous> @ ${workspaceFolder}/web/iframe-1582/inner.js:2:1
+{
+    allThreadsStopped : false
+    description : Paused on breakpoint
+    reason : breakpoint
+    threadId : <number>
+}
+<anonymous> @ ${workspaceFolder}/web/iframe-1582/inner.js:3:3
+----setInterval----
+<anonymous> @ ${workspaceFolder}/web/iframe-1582/inner.js:2:1
diff --git a/src/test/breakpoints/breakpointsTest.ts b/src/test/breakpoints/breakpointsTest.ts
index 0c557df00..557c14944 100644
--- a/src/test/breakpoints/breakpointsTest.ts
+++ b/src/test/breakpoints/breakpointsTest.ts
@@ -1228,4 +1228,29 @@ describe('breakpoints', () => {
     await evaluation;
     p.assertLog();
   });
+
+  itIntegrates.only('deals with removed execution contexts (#1582)', async ({ r }) => {
+    const p = await r.launchUrlAndLoad('iframe-1582/index.html');
+
+    const source: Dap.Source = {
+      path: p.workspacePath('web/iframe-1582/inner.js'),
+    };
+    p.dap.setBreakpoints({ source, breakpoints: [{ line: 3 }] });
+    await waitForPause(p, async () => {
+      await p.dap.evaluate({
+        expression: 'document.getElementsByTagName("IFRAME")[0].src += ""',
+        context: 'repl',
+      });
+    });
+
+    await waitForPause(p, async () => {
+      await p.dap.setBreakpoints({ source, breakpoints: [] });
+    });
+
+    // re-sets the breakpoints in the new script
+    p.dap.setBreakpoints({ source, breakpoints: [{ line: 3 }] });
+
+    await waitForPause(p);
+    p.assertLog();
+  });
 });
diff --git a/testWorkspace/web/iframe-1582/index.html b/testWorkspace/web/iframe-1582/index.html
new file mode 100644
index 000000000..a27fd65bb
--- /dev/null
+++ b/testWorkspace/web/iframe-1582/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
+</head>
+<body>
+  <iframe src="inner.html"></iframe>
+</body>
+</html>
diff --git a/testWorkspace/web/iframe-1582/inner.html b/testWorkspace/web/iframe-1582/inner.html
new file mode 100644
index 000000000..e732d815f
--- /dev/null
+++ b/testWorkspace/web/iframe-1582/inner.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
+</head>
+<body>
+  <script src="inner.js"></script>
+</body>
+</html>
diff --git a/testWorkspace/web/iframe-1582/inner.js b/testWorkspace/web/iframe-1582/inner.js
new file mode 100644
index 000000000..35ad40cf7
--- /dev/null
+++ b/testWorkspace/web/iframe-1582/inner.js
@@ -0,0 +1,4 @@
+let i = 0;
+setInterval(() => {
+  i++;
+}, 50);

From 2209ba5a8b5358d3b7d77449cb9cc92abdb524bd Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 3 Mar 2023 09:03:29 -0800
Subject: [PATCH 3/3] bump build bot