From d0dad6bc962431ae9716f04dc7e52b6a1a7c3836 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Thu, 5 Feb 2026 13:12:39 +0100
Subject: [PATCH 01/36] feat: adding records to browser

---
 .../BaselineOfDebuggingSpy.class.st           | 16 ++--
 RecordBrowser/RecordBrowserPresenter.class.st | 84 +++++++++++++++++++
 RecordBrowser/package.st                      |  1 +
 3 files changed, 92 insertions(+), 9 deletions(-)
 create mode 100644 RecordBrowser/RecordBrowserPresenter.class.st
 create mode 100644 RecordBrowser/package.st

diff --git a/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st b/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
index 7d92234..abdb873 100644
--- a/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
+++ b/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
@@ -9,15 +9,13 @@ Class {
 BaselineOfDebuggingSpy >> baseline: spec [
 
 	<baseline>
-	
-	spec baseline: 'ExperimentModel' with: [ 
-		spec repository:
-			'github://Pharo-XP-Tools/ExperimentModel:main' ].
-	
-	spec for: #common do: [ 
-		spec postLoadDoIt: #postloadAction.
-		spec package: 'DebuggingSpy'.
-		spec package: 'DebuggingSpy-Tests' ]
+	spec baseline: 'ExperimentModel' with: [ spec repository: 'github://Pharo-XP-Tools/ExperimentModel:main' ].
+
+	spec for: #common do: [
+			spec postLoadDoIt: #postloadAction.
+			spec package: 'DebuggingSpy'.
+			spec package: 'DebuggingSpy-Tests'.
+			spec package: 'RecordBrowser' ]
 ]
 
 { #category : 'baselines' }
diff --git a/RecordBrowser/RecordBrowserPresenter.class.st b/RecordBrowser/RecordBrowserPresenter.class.st
new file mode 100644
index 0000000..b2fa745
--- /dev/null
+++ b/RecordBrowser/RecordBrowserPresenter.class.st
@@ -0,0 +1,84 @@
+"
+Record browser for DsSpy data.
+"
+Class {
+	#name : 'RecordBrowserPresenter',
+	#superclass : 'SpPresenter',
+	#instVars : [
+		'files',
+		'listPresenter',
+		'addButton',
+		'toolbar',
+		'fileContent'
+	],
+	#category : 'RecordBrowser',
+	#package : 'RecordBrowser'
+}
+
+{ #category : 'adding' }
+RecordBrowserPresenter >> addFile: newFile [
+
+	files add: newFile.
+	listPresenter items: files
+]
+
+{ #category : 'layout' }
+RecordBrowserPresenter >> defaultLayout [
+
+	^ SpBoxLayout newVertical
+		  add: toolbar expand: false;
+		  add: (SpPanedLayout newHorizontal
+				   positionOfSlider: 30 percent;
+				   add: listPresenter;
+				   add: fileContent;
+				   yourself);
+		  yourself
+]
+
+{ #category : 'accessing' }
+RecordBrowserPresenter >> files [
+
+	^ files
+]
+
+{ #category : 'initialization' }
+RecordBrowserPresenter >> initializePresenters [
+
+	files := OrderedCollection new.
+
+	addButton := SpToolbarButtonPresenter new
+		             label: 'Add';
+		             icon: (self iconNamed: #smallAdd);
+		             help: 'Add a new record';
+		             action: [ self openAddFileDialog ];
+		             yourself.
+
+	toolbar := self newToolbar addItem: addButton.
+
+	listPresenter := self newList
+		                 items: files;
+		                 display: [ :file | file basenameWithoutExtension ];
+		                 whenSelectionChangedDo: [ :file | file ifNotNil: [ self updateContentViewer: file selectedItem ] ].
+
+	fileContent := self newText beNotEditable
+]
+
+{ #category : 'operations' }
+RecordBrowserPresenter >> openAddFileDialog [
+
+	| fileNames |
+	fileNames := StOpenFilePresenter chooseModal.
+	fileNames do: [ :file | self addFile: file asFileReference ]
+]
+
+{ #category : 'operations' }
+RecordBrowserPresenter >> updateContentViewer: aFileReference [
+
+	fileContent text: aFileReference contents
+]
+
+{ #category : 'accessing' }
+RecordBrowserPresenter >> windowTitle [
+
+	^ 'Debugging record browser'
+]
diff --git a/RecordBrowser/package.st b/RecordBrowser/package.st
new file mode 100644
index 0000000..6e314a3
--- /dev/null
+++ b/RecordBrowser/package.st
@@ -0,0 +1 @@
+Package { #name : 'RecordBrowser' }

From 8b1479ca7ddabb8c3599c0530e79a37ac806d70f Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Thu, 5 Feb 2026 18:12:07 +0100
Subject: [PATCH 02/36] feat: displaying history on tree table

---
 RecordBrowser/RecordBrowserPresenter.class.st | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/RecordBrowser/RecordBrowserPresenter.class.st b/RecordBrowser/RecordBrowserPresenter.class.st
index b2fa745..4ac26fd 100644
--- a/RecordBrowser/RecordBrowserPresenter.class.st
+++ b/RecordBrowser/RecordBrowserPresenter.class.st
@@ -9,7 +9,8 @@ Class {
 		'listPresenter',
 		'addButton',
 		'toolbar',
-		'fileContent'
+		'selectedRecordsPresenter',
+		'selectedRecords'
 	],
 	#category : 'RecordBrowser',
 	#package : 'RecordBrowser'
@@ -22,6 +23,15 @@ RecordBrowserPresenter >> addFile: newFile [
 	listPresenter items: files
 ]
 
+{ #category : 'initialization' }
+RecordBrowserPresenter >> connectPresenters [
+
+	selectedRecords ifNotNil: [
+			selectedRecordsPresenter
+				roots: selectedRecords records;
+				children: [ :item | OrderedCollection new ] ]
+]
+
 { #category : 'layout' }
 RecordBrowserPresenter >> defaultLayout [
 
@@ -30,7 +40,7 @@ RecordBrowserPresenter >> defaultLayout [
 		  add: (SpPanedLayout newHorizontal
 				   positionOfSlider: 30 percent;
 				   add: listPresenter;
-				   add: fileContent;
+				   add: selectedRecordsPresenter;
 				   yourself);
 		  yourself
 ]
@@ -60,21 +70,32 @@ RecordBrowserPresenter >> initializePresenters [
 		                 display: [ :file | file basenameWithoutExtension ];
 		                 whenSelectionChangedDo: [ :file | file ifNotNil: [ self updateContentViewer: file selectedItem ] ].
 
-	fileContent := self newText beNotEditable
+	selectedRecordsPresenter := self newTreeTable
+		                            addColumn: (SpStringTableColumn title: 'Event type' evaluated: [ :item | item eventName asString ]);
+		                            addColumn: (SpStringTableColumn title: 'Date' evaluated: [ :item | item dateTime asString ]);
+		                            beResizable;
+		                            yourself
 ]
 
 { #category : 'operations' }
 RecordBrowserPresenter >> openAddFileDialog [
 
 	| fileNames |
-	fileNames := StOpenFilePresenter chooseModal.
+	fileNames := StOpenFilePresenter new
+		             defaultFolder: DSSpy logger loggingDirectory;
+		             openModal.
 	fileNames do: [ :file | self addFile: file asFileReference ]
 ]
 
 { #category : 'operations' }
 RecordBrowserPresenter >> updateContentViewer: aFileReference [
 
-	fileContent text: aFileReference contents
+	| raw history |
+	aFileReference ifNotNil: [
+			raw := DSSpy materialize: aFileReference.
+			history := DSRecordHistory on: raw.
+			selectedRecords := history.
+			self connectPresenters ]
 ]
 
 { #category : 'accessing' }

From 23ec5e0ee5744fc870e7eae199da4f9514d8bbd3 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Fri, 6 Feb 2026 09:52:09 +0100
Subject: [PATCH 03/36] feat: open history when adding a file

---
 RecordBrowser/RecordBrowserPresenter.class.st | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/RecordBrowser/RecordBrowserPresenter.class.st b/RecordBrowser/RecordBrowserPresenter.class.st
index 4ac26fd..e6a6da0 100644
--- a/RecordBrowser/RecordBrowserPresenter.class.st
+++ b/RecordBrowser/RecordBrowserPresenter.class.st
@@ -17,10 +17,11 @@ Class {
 }
 
 { #category : 'adding' }
-RecordBrowserPresenter >> addFile: newFile [
+RecordBrowserPresenter >> addFile: aFileReference [
 
-	files add: newFile.
-	listPresenter items: files
+	files add: aFileReference.
+	listPresenter items: files.
+	self updateContentViewer: aFileReference
 ]
 
 { #category : 'initialization' }

From 486cfedb8e511a59f555f4c78e9548ef093a531a Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Fri, 6 Feb 2026 15:28:50 +0100
Subject: [PATCH 04/36] feat: DSSpy button & start/stop buttons on toolbar

---
 RecordBrowser/RecordBrowserPresenter.class.st | 106 ++++++++++++++----
 1 file changed, 83 insertions(+), 23 deletions(-)

diff --git a/RecordBrowser/RecordBrowserPresenter.class.st b/RecordBrowser/RecordBrowserPresenter.class.st
index e6a6da0..cb37b80 100644
--- a/RecordBrowser/RecordBrowserPresenter.class.st
+++ b/RecordBrowser/RecordBrowserPresenter.class.st
@@ -1,29 +1,62 @@
 "
-Record browser for DsSpy data.
+Debugging Spy interface.
 "
 Class {
 	#name : 'RecordBrowserPresenter',
 	#superclass : 'SpPresenter',
 	#instVars : [
 		'files',
-		'listPresenter',
-		'addButton',
 		'toolbar',
 		'selectedRecordsPresenter',
-		'selectedRecords'
+		'selectedRecords',
+		'addedFilesPresenter',
+		'startRecordButton',
+		'stopRecordButton',
+		'addRecordButton'
+	],
+	#classInstVars : [
+		'browser'
 	],
 	#category : 'RecordBrowser',
 	#package : 'RecordBrowser'
 }
 
+{ #category : 'accessing' }
+RecordBrowserPresenter class >> browser [
+
+	^ browser
+]
+
+{ #category : 'world menu' }
+RecordBrowserPresenter class >> menuCommandOn: aBuilder [
+
+	<worldMenu>
+	(aBuilder item: #DSSpy)
+		order: 100;
+		help: 'Open the Debugging Spy browser.';
+		action: [ self new open ]
+]
+
 { #category : 'adding' }
 RecordBrowserPresenter >> addFile: aFileReference [
 
 	files add: aFileReference.
-	listPresenter items: files.
+	addedFilesPresenter items: files.
 	self updateContentViewer: aFileReference
 ]
 
+{ #category : 'layout' }
+RecordBrowserPresenter >> addRecordButton [
+
+	^ addRecordButton ifNil: [
+			  addRecordButton := SpToolbarButtonPresenter new
+				                     label: 'Add';
+				                     icon: (self iconNamed: #smallAdd);
+				                     help: 'Add a new record.';
+				                     action: [ self openAddFileDialog ];
+				                     yourself ]
+]
+
 { #category : 'initialization' }
 RecordBrowserPresenter >> connectPresenters [
 
@@ -40,7 +73,7 @@ RecordBrowserPresenter >> defaultLayout [
 		  add: toolbar expand: false;
 		  add: (SpPanedLayout newHorizontal
 				   positionOfSlider: 30 percent;
-				   add: listPresenter;
+				   add: addedFilesPresenter;
 				   add: selectedRecordsPresenter;
 				   yourself);
 		  yourself
@@ -49,31 +82,26 @@ RecordBrowserPresenter >> defaultLayout [
 { #category : 'accessing' }
 RecordBrowserPresenter >> files [
 
-	^ files
+	^ files ifNil: [ files := OrderedCollection new ]
 ]
 
 { #category : 'initialization' }
 RecordBrowserPresenter >> initializePresenters [
 
-	files := OrderedCollection new.
-
-	addButton := SpToolbarButtonPresenter new
-		             label: 'Add';
-		             icon: (self iconNamed: #smallAdd);
-		             help: 'Add a new record';
-		             action: [ self openAddFileDialog ];
-		             yourself.
-
-	toolbar := self newToolbar addItem: addButton.
+	toolbar := self newToolbar
+		           addItem: self addRecordButton;
+		           addItem: self startRecordButton;
+		           addItem: self stopRecordButton.
 
-	listPresenter := self newList
-		                 items: files;
-		                 display: [ :file | file basenameWithoutExtension ];
-		                 whenSelectionChangedDo: [ :file | file ifNotNil: [ self updateContentViewer: file selectedItem ] ].
+	addedFilesPresenter := self newList
+		                       items: self files;
+		                       display: [ :file | file basenameWithoutExtension ];
+		                       whenSelectionChangedDo: [ :file | file ifNotNil: [ self updateContentViewer: file selectedItem ] ];
+		                       yourself.
 
 	selectedRecordsPresenter := self newTreeTable
 		                            addColumn: (SpStringTableColumn title: 'Event type' evaluated: [ :item | item eventName asString ]);
-		                            addColumn: (SpStringTableColumn title: 'Date' evaluated: [ :item | item dateTime asString ]);
+		                            addColumn: (SpStringTableColumn title: 'Time' evaluated: [ :item | item dateTime asTime print24 ]);
 		                            beResizable;
 		                            yourself
 ]
@@ -85,7 +113,39 @@ RecordBrowserPresenter >> openAddFileDialog [
 	fileNames := StOpenFilePresenter new
 		             defaultFolder: DSSpy logger loggingDirectory;
 		             openModal.
-	fileNames do: [ :file | self addFile: file asFileReference ]
+	fileNames ifNotNil: [ fileNames do: [ :file | self addFile: file asFileReference ] ]
+]
+
+{ #category : 'layout' }
+RecordBrowserPresenter >> startRecordButton [
+
+	^ startRecordButton ifNil: [
+			  startRecordButton := SpToolbarButtonPresenter new
+				                       label: 'Start';
+				                       icon: (self iconNamed: #glamorousGo);
+				                       help: 'Start recording events.';
+				                       action: [
+						                       DSSpyInstrumenter instrumentSystem.
+						                       startRecordButton enabled: false.
+						                       stopRecordButton enabled: true ];
+				                       enabled: DSSpy recordingSession not;
+				                       yourself ]
+]
+
+{ #category : 'layout' }
+RecordBrowserPresenter >> stopRecordButton [
+
+	^ stopRecordButton ifNil: [
+			  stopRecordButton := SpToolbarButtonPresenter new
+				                      label: 'Stop';
+				                      icon: (self iconNamed: #stop);
+				                      help: 'Stop recording events.';
+				                      action: [
+						                      DSSpyInstrumenter stopInstrumentation.
+						                      startRecordButton enabled: true.
+						                      stopRecordButton enabled: false ];
+				                      enabled: DSSpy recordingSession;
+				                      yourself ]
 ]
 
 { #category : 'operations' }

From f911360549248d08004d09f324e1d56946a58d01 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Mon, 9 Feb 2026 17:50:45 +0100
Subject: [PATCH 05/36] feat: adding a recorder window fix: using now only one
 instance of browser refactor: renaming package

---
 .../DSRecordBrowserPresenter.class.st         | 113 +++++++++++-----
 .../DSRecorderWindow.class.st                 | 124 ++++++++++++++++++
 DebuggingSpy-Browser/package.st               |   1 +
 RecordBrowser/package.st                      |   1 -
 4 files changed, 202 insertions(+), 37 deletions(-)
 rename RecordBrowser/RecordBrowserPresenter.class.st => DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st (59%)
 create mode 100644 DebuggingSpy-Browser/DSRecorderWindow.class.st
 create mode 100644 DebuggingSpy-Browser/package.st
 delete mode 100644 RecordBrowser/package.st

diff --git a/RecordBrowser/RecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
similarity index 59%
rename from RecordBrowser/RecordBrowserPresenter.class.st
rename to DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index cb37b80..a84be7e 100644
--- a/RecordBrowser/RecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -1,44 +1,65 @@
 "
-Debugging Spy interface.
+Debugging Spy main interface thats includes :
+- an interface that could be opened with a button on the topside bar 
+- a button that adds files to the list displayed on the interface
+- a button to start the instrumentation and another to stop it
+- an interface that shows the content of a selected file
 "
 Class {
-	#name : 'RecordBrowserPresenter',
+	#name : 'DSRecordBrowserPresenter',
 	#superclass : 'SpPresenter',
 	#instVars : [
 		'files',
-		'toolbar',
-		'selectedRecordsPresenter',
 		'selectedRecords',
-		'addedFilesPresenter',
 		'startRecordButton',
 		'stopRecordButton',
-		'addRecordButton'
+		'addRecordButton',
+		'toolbar',
+		'addedFilesPresenter',
+		'selectedRecordsPresenter',
+		'recorderWindow'
 	],
 	#classInstVars : [
-		'browser'
+		'presenterWindow'
 	],
-	#category : 'RecordBrowser',
-	#package : 'RecordBrowser'
+	#category : 'DebuggingSpy-Browser',
+	#package : 'DebuggingSpy-Browser'
 }
 
-{ #category : 'accessing' }
-RecordBrowserPresenter class >> browser [
-
-	^ browser
-]
-
 { #category : 'world menu' }
-RecordBrowserPresenter class >> menuCommandOn: aBuilder [
+DSRecordBrowserPresenter class >> menuCommandOn: aBuilder [
+	"Adds the DSSpy button on topside bar, the order is 100 just to make sure the DSSpy button is at the end"
 
 	<worldMenu>
 	(aBuilder item: #DSSpy)
 		order: 100;
 		help: 'Open the Debugging Spy browser.';
-		action: [ self new open ]
+		action: [ self toggleBrowser ]
+]
+
+{ #category : 'initialization' }
+DSRecordBrowserPresenter class >> resetBrowser [
+
+	<script>
+	presenterWindow := nil
+]
+
+{ #category : 'open/close' }
+DSRecordBrowserPresenter class >> toggleBrowser [
+
+	| presenter |
+	presenterWindow ifNotNil: [
+			^ presenterWindow isOpen
+				  ifTrue: [ presenterWindow close ]
+				  ifFalse: [ presenterWindow open ] ].
+
+	presenter := self new.
+	presenter open.
+	presenterWindow := presenter window
 ]
 
 { #category : 'adding' }
-RecordBrowserPresenter >> addFile: aFileReference [
+DSRecordBrowserPresenter >> addFile: aFileReference [
 
 	files add: aFileReference.
 	addedFilesPresenter items: files.
@@ -46,7 +67,7 @@ RecordBrowserPresenter >> addFile: aFileReference [
 ]
 
 { #category : 'layout' }
-RecordBrowserPresenter >> addRecordButton [
+DSRecordBrowserPresenter >> addRecordButton [
 
 	^ addRecordButton ifNil: [
 			  addRecordButton := SpToolbarButtonPresenter new
@@ -58,7 +79,7 @@ RecordBrowserPresenter >> addRecordButton [
 ]
 
 { #category : 'initialization' }
-RecordBrowserPresenter >> connectPresenters [
+DSRecordBrowserPresenter >> connectPresenters [
 
 	selectedRecords ifNotNil: [
 			selectedRecordsPresenter
@@ -67,7 +88,7 @@ RecordBrowserPresenter >> connectPresenters [
 ]
 
 { #category : 'layout' }
-RecordBrowserPresenter >> defaultLayout [
+DSRecordBrowserPresenter >> defaultLayout [
 
 	^ SpBoxLayout newVertical
 		  add: toolbar expand: false;
@@ -80,13 +101,13 @@ RecordBrowserPresenter >> defaultLayout [
 ]
 
 { #category : 'accessing' }
-RecordBrowserPresenter >> files [
+DSRecordBrowserPresenter >> files [
 
 	^ files ifNil: [ files := OrderedCollection new ]
 ]
 
 { #category : 'initialization' }
-RecordBrowserPresenter >> initializePresenters [
+DSRecordBrowserPresenter >> initializePresenters [
 
 	toolbar := self newToolbar
 		           addItem: self addRecordButton;
@@ -107,49 +128,69 @@ RecordBrowserPresenter >> initializePresenters [
 ]
 
 { #category : 'operations' }
-RecordBrowserPresenter >> openAddFileDialog [
+DSRecordBrowserPresenter >> openAddFileDialog [
 
 	| fileNames |
 	fileNames := StOpenFilePresenter new
+		             beMultipleSelection;
 		             defaultFolder: DSSpy logger loggingDirectory;
 		             openModal.
 	fileNames ifNotNil: [ fileNames do: [ :file | self addFile: file asFileReference ] ]
 ]
 
 { #category : 'layout' }
-RecordBrowserPresenter >> startRecordButton [
+DSRecordBrowserPresenter >> startRecordButton [
 
 	^ startRecordButton ifNil: [
 			  startRecordButton := SpToolbarButtonPresenter new
 				                       label: 'Start';
 				                       icon: (self iconNamed: #glamorousGo);
 				                       help: 'Start recording events.';
-				                       action: [
-						                       DSSpyInstrumenter instrumentSystem.
-						                       startRecordButton enabled: false.
-						                       stopRecordButton enabled: true ];
+				                       action: [ self startRecording ];
 				                       enabled: DSSpy recordingSession not;
 				                       yourself ]
 ]
 
+{ #category : 'recording' }
+DSRecordBrowserPresenter >> startRecording [
+	"Starts recording events and instianciates a new RecorderWindow that displays a timer and shows that Debugging Spy is recordering."
+
+	DSSpyInstrumenter instrumentSystem.
+	startRecordButton enabled: false.
+	stopRecordButton enabled: true.
+	recorderWindow := DSRecorderWindow new.
+	recorderWindow
+		openInWorld;
+		startTimer
+]
+
 { #category : 'layout' }
-RecordBrowserPresenter >> stopRecordButton [
+DSRecordBrowserPresenter >> stopRecordButton [
 
 	^ stopRecordButton ifNil: [
 			  stopRecordButton := SpToolbarButtonPresenter new
 				                      label: 'Stop';
 				                      icon: (self iconNamed: #stop);
 				                      help: 'Stop recording events.';
-				                      action: [
-						                      DSSpyInstrumenter stopInstrumentation.
-						                      startRecordButton enabled: true.
-						                      stopRecordButton enabled: false ];
+				                      action: [ self stopRecording ];
 				                      enabled: DSSpy recordingSession;
 				                      yourself ]
 ]
 
+{ #category : 'recording' }
+DSRecordBrowserPresenter >> stopRecording [
+	"Stops the recording session and closes the RecorderWindow."
+
+	DSSpyInstrumenter stopInstrumentation.
+	startRecordButton enabled: true.
+	stopRecordButton enabled: false.
+	recorderWindow
+		stopTimer;
+		close
+]
+
 { #category : 'operations' }
-RecordBrowserPresenter >> updateContentViewer: aFileReference [
+DSRecordBrowserPresenter >> updateContentViewer: aFileReference [
 
 	| raw history |
 	aFileReference ifNotNil: [
@@ -160,7 +201,7 @@ RecordBrowserPresenter >> updateContentViewer: aFileReference [
 ]
 
 { #category : 'accessing' }
-RecordBrowserPresenter >> windowTitle [
+DSRecordBrowserPresenter >> windowTitle [
 
 	^ 'Debugging record browser'
 ]
diff --git a/DebuggingSpy-Browser/DSRecorderWindow.class.st b/DebuggingSpy-Browser/DSRecorderWindow.class.st
new file mode 100644
index 0000000..ccd0927
--- /dev/null
+++ b/DebuggingSpy-Browser/DSRecorderWindow.class.st
@@ -0,0 +1,124 @@
+"
+This class is a window displaying some informations while DebuggingSpy is recording.
+"
+Class {
+	#name : 'DSRecorderWindow',
+	#superclass : 'SystemWindow',
+	#instVars : [
+		'labelMorph',
+		'running',
+		'startTime',
+		'timer'
+	],
+	#category : 'DebuggingSpy-Browser',
+	#package : 'DebuggingSpy-Browser'
+}
+
+{ #category : 'initialization' }
+DSRecorderWindow >> buildUI [
+
+	labelMorph := StringMorph new.
+	labelMorph contents: '00:00:000'.
+	labelMorph position: 10 @ 40.
+	labelMorph extent: 230 @ 60.
+	self addMorph: labelMorph
+]
+
+{ #category : 'initialization' }
+DSRecorderWindow >> initialize [
+
+	super initialize.
+	running := false.
+	self initializeProperties.
+	self buildUI
+]
+
+{ #category : 'initialization' }
+DSRecorderWindow >> initializeProperties [
+
+	self
+		setLabel: 'Debugging spy recorder';
+		extent: self size;
+		lock;
+		"makeUnclosable;"
+		"makeBorderless ;"
+		beUnresizeable
+]
+
+{ #category : 'initialization' }
+DSRecorderWindow >> makeButton: aLabel action: anAction [
+    | btn |
+    btn := PluggableButtonMorph new.
+    btn label: aLabel.
+    btn target: self.
+    btn actionSelector: anAction.
+    btn extent: 70@30.
+    ^btn
+
+]
+
+{ #category : 'accessing' }
+DSRecorderWindow >> margin [
+	"Space around the window"
+
+	^ 5 @ 32
+]
+
+{ #category : 'wiw support' }
+DSRecorderWindow >> morphicLayerNumber [
+	"To ensure the recorder window is always displayed at screen and cannot be covered"
+
+	^ 12
+]
+
+{ #category : 'opening' }
+DSRecorderWindow >> openInWorld [
+
+	super openInWorld.
+	self position: self currentWorld extent - self extent - self margin
+]
+
+{ #category : 'timer' }
+DSRecorderWindow >> resetTimer [
+    startTime := Time millisecondClockValue.
+    labelMorph contents: '00:00:000'.
+
+]
+
+{ #category : 'accessing' }
+DSRecorderWindow >> size [
+
+	^ 150 @ 40
+]
+
+{ #category : 'timer' }
+DSRecorderWindow >> startTimer [
+
+	running ifTrue: [ ^ self ].
+
+	startTime := Time millisecondClockValue.
+	running := true.
+	timer := [
+		         [ running ] whileTrue: [
+				         | elapsed minutes seconds milliseconds text |
+				         elapsed := Time millisecondClockValue - startTime.
+
+				         minutes := elapsed // 60000 \\ 60.
+				         seconds := elapsed // 1000 \\ 60.
+				         milliseconds := elapsed \\ 1000.
+
+				         text := String streamContents: [ :s |
+						                 s nextPutAll: (minutes printPaddedWith: $0 to: 2).
+						                 s nextPut: $:.
+						                 s nextPutAll: (seconds printPaddedWith: $0 to: 2).
+						                 s nextPut: $:.
+						                 s nextPutAll: (milliseconds printPaddedWith: $0 to: 3) ].
+
+				         labelMorph contents: text.
+				         (Delay forMilliseconds: 50) wait ] ] fork
+]
+
+{ #category : 'timer' }
+DSRecorderWindow >> stopTimer [
+    running := false.
+]
diff --git a/DebuggingSpy-Browser/package.st b/DebuggingSpy-Browser/package.st
new file mode 100644
index 0000000..0831d90
--- /dev/null
+++ b/DebuggingSpy-Browser/package.st
@@ -0,0 +1 @@
+Package { #name : 'DebuggingSpy-Browser' }
diff --git a/RecordBrowser/package.st b/RecordBrowser/package.st
deleted file mode 100644
index 6e314a3..0000000
--- a/RecordBrowser/package.st
+++ /dev/null
@@ -1 +0,0 @@
-Package { #name : 'RecordBrowser' }

From ea04d1d368194b6f279c76845c3f979c498edfd0 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 11 Feb 2026 10:21:17 +0100
Subject: [PATCH 06/36] feat: can inspect records on right click

---
 .../DSRecordBrowserPresenter.class.st         | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index a84be7e..66d6aab 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -106,6 +106,12 @@ DSRecordBrowserPresenter >> files [
 	^ files ifNil: [ files := OrderedCollection new ]
 ]
 
+{ #category : 'operations' }
+DSRecordBrowserPresenter >> getHistoryOf: aFileReference [
+
+	^ DSRecordHistory on: (DSSpy materialize: aFileReference)
+]
+
 { #category : 'initialization' }
 DSRecordBrowserPresenter >> initializePresenters [
 
@@ -118,6 +124,7 @@ DSRecordBrowserPresenter >> initializePresenters [
 		                       items: self files;
 		                       display: [ :file | file basenameWithoutExtension ];
 		                       whenSelectionChangedDo: [ :file | file ifNotNil: [ self updateContentViewer: file selectedItem ] ];
+		                       actions: self listAddedFilesActions;
 		                       yourself.
 
 	selectedRecordsPresenter := self newTreeTable
@@ -127,6 +134,25 @@ DSRecordBrowserPresenter >> initializePresenters [
 		                            yourself
 ]
 
+{ #category : 'operations' }
+DSRecordBrowserPresenter >> listAddedFilesActions [
+
+	^ SpActionGroup new
+		  addActionWith: [ :anItem |
+				  anItem
+					  name: 'Inspect';
+					  description: 'Inspect the raw records';
+					  shortcutKey: $i meta;
+					  action: [ (DSSpy materialize: addedFilesPresenter selectedItem) inspect ] ];
+		  addActionWith: [ :anItem |
+				  anItem
+					  name: 'Inspect history';
+					  description: 'Inspect the record history';
+					  shortcutKey: $h meta;
+					  action: [ (self getHistoryOf: addedFilesPresenter selectedItem) inspect ] ];
+		  yourself
+]
+
 { #category : 'operations' }
 DSRecordBrowserPresenter >> openAddFileDialog [
 
@@ -192,11 +218,8 @@ DSRecordBrowserPresenter >> stopRecording [
 { #category : 'operations' }
 DSRecordBrowserPresenter >> updateContentViewer: aFileReference [
 
-	| raw history |
 	aFileReference ifNotNil: [
-			raw := DSSpy materialize: aFileReference.
-			history := DSRecordHistory on: raw.
-			selectedRecords := history.
+			selectedRecords := self getHistoryOf: aFileReference.
 			self connectPresenters ]
 ]
 

From f31aa6c6d4b43530beb9ac8565d07155c5598b16 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 11 Feb 2026 16:41:43 +0100
Subject: [PATCH 07/36] feat: more info on recorder window and stop button

---
 .../DSRecordBrowserPresenter.class.st         |  11 +-
 .../DSRecorderWindow.class.st                 | 117 +++++++++++-------
 2 files changed, 78 insertions(+), 50 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index 66d6aab..de2b8c4 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -37,6 +37,12 @@ DSRecordBrowserPresenter class >> menuCommandOn: aBuilder [
 		action: [ self toggleBrowser ]
 ]
 
+{ #category : 'accessing' }
+DSRecordBrowserPresenter class >> presenterWindow [
+
+	^ presenterWindow
+]
+
 { #category : 'initialization' }
 DSRecordBrowserPresenter class >> resetBrowser [
 
@@ -210,9 +216,8 @@ DSRecordBrowserPresenter >> stopRecording [
 	DSSpyInstrumenter stopInstrumentation.
 	startRecordButton enabled: true.
 	stopRecordButton enabled: false.
-	recorderWindow
-		stopTimer;
-		close
+	recorderWindow stopTimer.
+	self currentWorld removeMorph: recorderWindow
 ]
 
 { #category : 'operations' }
diff --git a/DebuggingSpy-Browser/DSRecorderWindow.class.st b/DebuggingSpy-Browser/DSRecorderWindow.class.st
index ccd0927..80f3dc8 100644
--- a/DebuggingSpy-Browser/DSRecorderWindow.class.st
+++ b/DebuggingSpy-Browser/DSRecorderWindow.class.st
@@ -5,10 +5,11 @@ Class {
 	#name : 'DSRecorderWindow',
 	#superclass : 'SystemWindow',
 	#instVars : [
-		'labelMorph',
+		'timerMorph',
 		'running',
 		'startTime',
-		'timer'
+		'timer',
+		'timeNowMorph'
 	],
 	#category : 'DebuggingSpy-Browser',
 	#package : 'DebuggingSpy-Browser'
@@ -17,11 +18,32 @@ Class {
 { #category : 'initialization' }
 DSRecorderWindow >> buildUI [
 
-	labelMorph := StringMorph new.
-	labelMorph contents: '00:00:000'.
-	labelMorph position: 10 @ 40.
-	labelMorph extent: 230 @ 60.
-	self addMorph: labelMorph
+	| recordingIcon stopButton |
+	recordingIcon := ImageMorph new
+		                 image: (self iconNamed: #glamorousRedCircle);
+		                 position: 0 @ 7;
+		                 yourself.
+
+	timerMorph := StringMorph new
+		              contents: '00:00:000';
+		              position: 15 @ 6.
+
+	timeNowMorph := StringMorph new
+		                contents: Time now print24;
+		                position: 75 @ 6.
+
+	stopButton := PluggableButtonMorph new
+		              label: (IconicListItemMorph new icon: (self iconNamed: #stop));
+		              model: DSRecordBrowserPresenter presenterWindow presenter;
+		              actionSelector: #stopRecording;
+		              position: 125 @ 4;
+		              yourself.
+
+	self
+		addMorph: recordingIcon;
+		addMorph: timerMorph;
+		addMorph: timeNowMorph;
+		addMorph: stopButton
 ]
 
 { #category : 'initialization' }
@@ -29,6 +51,7 @@ DSRecorderWindow >> initialize [
 
 	super initialize.
 	running := false.
+	self minimumExtent: self size.
 	self initializeProperties.
 	self buildUI
 ]
@@ -37,26 +60,14 @@ DSRecorderWindow >> initialize [
 DSRecorderWindow >> initializeProperties [
 
 	self
-		setLabel: 'Debugging spy recorder';
 		extent: self size;
-		lock;
-		"makeUnclosable;"
-		"makeBorderless ;"
+		beSticky;
+		makeUnclosable;
+		removeLabelArea;
+		removeBoxes;
 		beUnresizeable
 ]
 
-{ #category : 'initialization' }
-DSRecorderWindow >> makeButton: aLabel action: anAction [
-    | btn |
-    btn := PluggableButtonMorph new.
-    btn label: aLabel.
-    btn target: self.
-    btn actionSelector: anAction.
-    btn extent: 70@30.
-    ^btn
-
-]
-
 { #category : 'accessing' }
 DSRecorderWindow >> margin [
 	"Space around the window"
@@ -71,6 +82,37 @@ DSRecorderWindow >> morphicLayerNumber [
 	^ 12
 ]
 
+{ #category : 'initialization' }
+DSRecorderWindow >> obuildUI [
+
+	| recordingIcon stopButton |
+	recordingIcon := ImageMorph new
+		                 image: (self iconNamed: #glamorousRedCircle);
+		                 position: 0 @ 7;
+		                 yourself.
+
+	timerMorph := StringMorph new
+		              contents: '00:00:000';
+		              position: 15 @ 6.
+
+	timeNowMorph := StringMorph new
+		                contents: Time now print24;
+		                position: 75 @ 6.
+
+	stopButton := PluggableButtonMorph new
+		              icon: (self iconNamed: #stop);
+		              position: 128 @ 6;
+		              beIconTop;
+		              "target: self;
+		              actionSelector: #stopRecording;"yourself.
+
+	self
+		addMorph: recordingIcon;
+		addMorph: timerMorph;
+		addMorph: timeNowMorph;
+		addMorph: stopButton
+]
+
 { #category : 'opening' }
 DSRecorderWindow >> openInWorld [
 
@@ -78,17 +120,10 @@ DSRecorderWindow >> openInWorld [
 	self position: self currentWorld extent - self extent - self margin
 ]
 
-{ #category : 'timer' }
-DSRecorderWindow >> resetTimer [
-    startTime := Time millisecondClockValue.
-    labelMorph contents: '00:00:000'.
-
-]
-
 { #category : 'accessing' }
 DSRecorderWindow >> size [
 
-	^ 150 @ 40
+	^ 150 @ 30
 ]
 
 { #category : 'timer' }
@@ -100,25 +135,13 @@ DSRecorderWindow >> startTimer [
 	running := true.
 	timer := [
 		         [ running ] whileTrue: [
-				         | elapsed minutes seconds milliseconds text |
-				         elapsed := Time millisecondClockValue - startTime.
-
-				         minutes := elapsed // 60000 \\ 60.
-				         seconds := elapsed // 1000 \\ 60.
-				         milliseconds := elapsed \\ 1000.
-
-				         text := String streamContents: [ :s |
-						                 s nextPutAll: (minutes printPaddedWith: $0 to: 2).
-						                 s nextPut: $:.
-						                 s nextPutAll: (seconds printPaddedWith: $0 to: 2).
-						                 s nextPut: $:.
-						                 s nextPutAll: (milliseconds printPaddedWith: $0 to: 3) ].
-
-				         labelMorph contents: text.
+				         timerMorph contents: (Time millisecondClockValue - startTime) seconds asString.
+				         timeNowMorph contents: Time now print24.
 				         (Delay forMilliseconds: 50) wait ] ] fork
 ]
 
 { #category : 'timer' }
 DSRecorderWindow >> stopTimer [
-    running := false.
+
+	running := false
 ]

From 0f39f0e8d53318086b432e328008ea81f7bb7e0c Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 11 Feb 2026 17:24:12 +0100
Subject: [PATCH 08/36] fix: could not hide with taskbar, also adding window
 icon

---
 DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st | 6 ++++++
 DebuggingSpy-Browser/DSRecorderWindow.class.st         | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index de2b8c4..a2b8af3 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -228,6 +228,12 @@ DSRecordBrowserPresenter >> updateContentViewer: aFileReference [
 			self connectPresenters ]
 ]
 
+{ #category : 'accessing' }
+DSRecordBrowserPresenter >> windowIcon [
+
+	^ self iconNamed: #browse
+]
+
 { #category : 'accessing' }
 DSRecordBrowserPresenter >> windowTitle [
 
diff --git a/DebuggingSpy-Browser/DSRecorderWindow.class.st b/DebuggingSpy-Browser/DSRecorderWindow.class.st
index 80f3dc8..c1cf509 100644
--- a/DebuggingSpy-Browser/DSRecorderWindow.class.st
+++ b/DebuggingSpy-Browser/DSRecorderWindow.class.st
@@ -46,6 +46,12 @@ DSRecorderWindow >> buildUI [
 		addMorph: stopButton
 ]
 
+{ #category : 'resize/collapse' }
+DSRecorderWindow >> collapseOrExpand [
+
+	^ self
+]
+
 { #category : 'initialization' }
 DSRecorderWindow >> initialize [
 
@@ -60,6 +66,7 @@ DSRecorderWindow >> initialize [
 DSRecorderWindow >> initializeProperties [
 
 	self
+		setLabel: 'DSSpy recorder';
 		extent: self size;
 		beSticky;
 		makeUnclosable;

From a8720ec5214c0e2f1802b1a4cb1936ad860fad7c Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Thu, 12 Feb 2026 09:52:33 +0100
Subject: [PATCH 09/36] feat: can inspect records in browser

---
 .../DSRecordBrowserPresenter.class.st              | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index a2b8af3..a3adb92 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -137,6 +137,7 @@ DSRecordBrowserPresenter >> initializePresenters [
 		                            addColumn: (SpStringTableColumn title: 'Event type' evaluated: [ :item | item eventName asString ]);
 		                            addColumn: (SpStringTableColumn title: 'Time' evaluated: [ :item | item dateTime asTime print24 ]);
 		                            beResizable;
+		                            actions: self listRecordActions;
 		                            yourself
 ]
 
@@ -159,6 +160,19 @@ DSRecordBrowserPresenter >> listAddedFilesActions [
 		  yourself
 ]
 
+{ #category : 'operations' }
+DSRecordBrowserPresenter >> listRecordActions [
+
+	^ SpActionGroup new
+		  addActionWith: [ :anItem |
+				  anItem
+					  name: 'Inspect';
+					  description: 'Inspect the raw records';
+					  shortcutKey: $i meta;
+					  action: [ selectedRecordsPresenter selectedItem inspect ] ];
+		  yourself
+]
+
 { #category : 'operations' }
 DSRecordBrowserPresenter >> openAddFileDialog [
 

From 9f3f530d2a0a8b6f76879521a414653b422e22b9 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Thu, 12 Feb 2026 11:24:57 +0100
Subject: [PATCH 10/36] feat: colored records on browser

---
 DebuggingSpy-Browser/DSColoredRecord.class.st | 46 +++++++++++++++++++
 .../DSRecordBrowserPresenter.class.st         | 46 +++++++++++++++++--
 2 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 DebuggingSpy-Browser/DSColoredRecord.class.st

diff --git a/DebuggingSpy-Browser/DSColoredRecord.class.st b/DebuggingSpy-Browser/DSColoredRecord.class.st
new file mode 100644
index 0000000..1d4472b
--- /dev/null
+++ b/DebuggingSpy-Browser/DSColoredRecord.class.st
@@ -0,0 +1,46 @@
+"
+I am representing a DSSpy record, which associates a color to be displayed.
+"
+Class {
+	#name : 'DSColoredRecord',
+	#superclass : 'Object',
+	#instVars : [
+		'record',
+		'color'
+	],
+	#category : 'DebuggingSpy-Browser',
+	#package : 'DebuggingSpy-Browser'
+}
+
+{ #category : 'initialization' }
+DSColoredRecord class >> for: aRecord withColor: aColor [
+
+	^ self new
+		  record: aRecord;
+		  color: aColor;
+		  yourself
+]
+
+{ #category : 'accessing' }
+DSColoredRecord >> color [
+
+	^ color
+]
+
+{ #category : 'accessing' }
+DSColoredRecord >> color: aColor [
+
+	color := aColor
+]
+
+{ #category : 'accessing' }
+DSColoredRecord >> record [
+
+	^ record
+]
+
+{ #category : 'accessing' }
+DSColoredRecord >> record: aRecord [
+
+	record := aRecord
+]
diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index a3adb92..74e0ba5 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -89,7 +89,7 @@ DSRecordBrowserPresenter >> connectPresenters [
 
 	selectedRecords ifNotNil: [
 			selectedRecordsPresenter
-				roots: selectedRecords records;
+				roots: selectedRecords;
 				children: [ :item | OrderedCollection new ] ]
 ]
 
@@ -112,12 +112,41 @@ DSRecordBrowserPresenter >> files [
 	^ files ifNil: [ files := OrderedCollection new ]
 ]
 
+{ #category : 'operations' }
+DSRecordBrowserPresenter >> getColoredRecordsOf: aWindowRecordCollection [
+
+	| coloredRecords |
+	coloredRecords := OrderedCollection new.
+	aWindowRecordCollection do: [ :windowRecord |
+			coloredRecords addAll:
+				(windowRecord events collect: [ :record | DSColoredRecord for: record withColor: (self getWindowColorFor: windowRecord) ]) ].
+	coloredRecords sort: [ :i :j | i record dateTime < j record dateTime ].
+	^ coloredRecords
+]
+
 { #category : 'operations' }
 DSRecordBrowserPresenter >> getHistoryOf: aFileReference [
 
 	^ DSRecordHistory on: (DSSpy materialize: aFileReference)
 ]
 
+{ #category : 'color' }
+DSRecordBrowserPresenter >> getWindowColorFor: aWindowRecord [
+
+	aWindowRecord isBrowser ifTrue: [ ^ Color green ]. "aWindowRecord isImplementorOrSender ifTrue: [ ^ Color lightGreen ]"
+	aWindowRecord isInspector ifTrue: [ ^ Color blue ].
+	aWindowRecord isDebugger ifTrue: [ ^ Color pink ].
+
+	aWindowRecord isPlayground ifTrue: [ ^ Color blue muchLighter ].
+	aWindowRecord isBreakpointBrowser ifTrue: [ ^ Color pink muchDarker ].
+	aWindowRecord isCritiqueBrowser ifTrue: [ ^ Color green muchDarker ].
+	aWindowRecord isEpicea ifTrue: [ ^ Color green muchDarker muchDarker ].
+	aWindowRecord isIceberg ifTrue: [ ^ Color blue muchDarker ].
+	aWindowRecord isRewriter ifTrue: [ ^ Color blue muchLighter muchLighter ].
+
+	^ nil
+]
+
 { #category : 'initialization' }
 DSRecordBrowserPresenter >> initializePresenters [
 
@@ -134,8 +163,15 @@ DSRecordBrowserPresenter >> initializePresenters [
 		                       yourself.
 
 	selectedRecordsPresenter := self newTreeTable
-		                            addColumn: (SpStringTableColumn title: 'Event type' evaluated: [ :item | item eventName asString ]);
-		                            addColumn: (SpStringTableColumn title: 'Time' evaluated: [ :item | item dateTime asTime print24 ]);
+		                            addColumn: (SpStringTableColumn new
+				                             title: 'Event type';
+				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
+				                             evaluated: [ :coloredRecord | coloredRecord record eventName asString ];
+				                             yourself);
+		                            addColumn: (SpStringTableColumn new
+				                             title: 'Time';
+				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
+				                             evaluated: [ :coloredRecord | coloredRecord record dateTime asTime print24 ]);
 		                            beResizable;
 		                            actions: self listRecordActions;
 		                            yourself
@@ -237,8 +273,10 @@ DSRecordBrowserPresenter >> stopRecording [
 { #category : 'operations' }
 DSRecordBrowserPresenter >> updateContentViewer: aFileReference [
 
+	| history |
 	aFileReference ifNotNil: [
-			selectedRecords := self getHistoryOf: aFileReference.
+			history := self getHistoryOf: aFileReference.
+			selectedRecords := self getColoredRecordsOf: history windows.
 			self connectPresenters ]
 ]
 

From 5321071855261f0bf178056879335961f886832d Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Thu, 12 Feb 2026 14:36:19 +0100
Subject: [PATCH 11/36] fix: column for color in browser

---
 DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index 74e0ba5..73d5f6a 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -164,13 +164,18 @@ DSRecordBrowserPresenter >> initializePresenters [
 
 	selectedRecordsPresenter := self newTreeTable
 		                            addColumn: (SpStringTableColumn new
-				                             title: 'Event type';
+				                             title: ' ';
 				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
+				                             evaluated: [ ' ' ];
+				                             width: 10;
+				                             beNotExpandable;
+				                             yourself);
+		                            addColumn: (SpStringTableColumn new
+				                             title: 'Event type';
 				                             evaluated: [ :coloredRecord | coloredRecord record eventName asString ];
 				                             yourself);
 		                            addColumn: (SpStringTableColumn new
 				                             title: 'Time';
-				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
 				                             evaluated: [ :coloredRecord | coloredRecord record dateTime asTime print24 ]);
 		                            beResizable;
 		                            actions: self listRecordActions;

From 819f0b0064f7c8299107a95615905743cd284af4 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Thu, 12 Feb 2026 16:32:21 +0100
Subject: [PATCH 12/36] feat: new colors for browser

---
 .../DSRecordBrowserPresenter.class.st         | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index 73d5f6a..e236487 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -133,16 +133,16 @@ DSRecordBrowserPresenter >> getHistoryOf: aFileReference [
 { #category : 'color' }
 DSRecordBrowserPresenter >> getWindowColorFor: aWindowRecord [
 
-	aWindowRecord isBrowser ifTrue: [ ^ Color green ]. "aWindowRecord isImplementorOrSender ifTrue: [ ^ Color lightGreen ]"
-	aWindowRecord isInspector ifTrue: [ ^ Color blue ].
-	aWindowRecord isDebugger ifTrue: [ ^ Color pink ].
+	aWindowRecord isBrowser ifTrue: [ ^ Color fromHexString: '#2A2AB7' ]. "aWindowRecord isImplementorOrSender ifTrue: [ ^ Color lightGreen ]"
+	aWindowRecord isInspector ifTrue: [ ^ Color fromHexString: '#FFC300' ].
+	aWindowRecord isDebugger ifTrue: [ ^ Color fromHexString: '#C41E3D' ].
 
-	aWindowRecord isPlayground ifTrue: [ ^ Color blue muchLighter ].
-	aWindowRecord isBreakpointBrowser ifTrue: [ ^ Color pink muchDarker ].
-	aWindowRecord isCritiqueBrowser ifTrue: [ ^ Color green muchDarker ].
-	aWindowRecord isEpicea ifTrue: [ ^ Color green muchDarker muchDarker ].
-	aWindowRecord isIceberg ifTrue: [ ^ Color blue muchDarker ].
-	aWindowRecord isRewriter ifTrue: [ ^ Color blue muchLighter muchLighter ].
+	aWindowRecord isPlayground ifTrue: [ ^ Color fromHexString: '#70B77E'].
+	aWindowRecord isBreakpointBrowser ifTrue: [ ^ Color fromHexString: '#7C238C' ].
+	aWindowRecord isCritiqueBrowser ifTrue: [ ^ Color fromHexString: '#A45C15' ].
+	aWindowRecord isEpicea ifTrue: [ ^ Color fromHexString: '#345e54' ].
+	aWindowRecord isIceberg ifTrue: [ ^ Color fromHexString: '#2B5BA9' ].
+	aWindowRecord isRewriter ifTrue: [ ^ Color fromHexString: '#292929' ].
 
 	^ nil
 ]
@@ -163,19 +163,14 @@ DSRecordBrowserPresenter >> initializePresenters [
 		                       yourself.
 
 	selectedRecordsPresenter := self newTreeTable
-		                            addColumn: (SpStringTableColumn new
-				                             title: ' ';
-				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
-				                             evaluated: [ ' ' ];
-				                             width: 10;
-				                             beNotExpandable;
-				                             yourself);
 		                            addColumn: (SpStringTableColumn new
 				                             title: 'Event type';
+				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
 				                             evaluated: [ :coloredRecord | coloredRecord record eventName asString ];
 				                             yourself);
 		                            addColumn: (SpStringTableColumn new
 				                             title: 'Time';
+				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
 				                             evaluated: [ :coloredRecord | coloredRecord record dateTime asTime print24 ]);
 		                            beResizable;
 		                            actions: self listRecordActions;

From 1af3591b6a46f42132b5ee248e6ba7fdb3e04bb5 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Fri, 13 Feb 2026 10:16:27 +0100
Subject: [PATCH 13/36] fix: cannot add a file twice

---
 DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index e236487..789d16c 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -67,7 +67,9 @@ DSRecordBrowserPresenter class >> toggleBrowser [
 { #category : 'adding' }
 DSRecordBrowserPresenter >> addFile: aFileReference [
 
-	files add: aFileReference.
+	(files includes: aFileReference)
+		ifFalse: [ files add: aFileReference ]
+		ifTrue: [ ^ self inform: 'File already added in the browser !' ].
 	addedFilesPresenter items: files.
 	self updateContentViewer: aFileReference
 ]

From c3b5de3064f657fc5ed3c60ffefe1b544519e694 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Fri, 13 Feb 2026 17:14:40 +0100
Subject: [PATCH 14/36] feat: timeline chart (data need to be fixed, also need
 refactoring)

---
 .../DSRecordBrowserPresenter.class.st         | 104 +++++++++++++-----
 DebuggingSpy/DSWindowRecord.class.st          |  16 +--
 2 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index 789d16c..d7a9351 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -17,7 +17,8 @@ Class {
 		'toolbar',
 		'addedFilesPresenter',
 		'selectedRecordsPresenter',
-		'recorderWindow'
+		'recorderWindow',
+		'timeline'
 	],
 	#classInstVars : [
 		'presenterWindow'
@@ -43,6 +44,12 @@ DSRecordBrowserPresenter class >> presenterWindow [
 	^ presenterWindow
 ]
 
+{ #category : 'accessing' }
+DSRecordBrowserPresenter class >> presenterWindow: aWindow [
+
+	presenterWindow := aWindow
+]
+
 { #category : 'initialization' }
 DSRecordBrowserPresenter class >> resetBrowser [
 
@@ -68,10 +75,11 @@ DSRecordBrowserPresenter class >> toggleBrowser [
 DSRecordBrowserPresenter >> addFile: aFileReference [
 
 	(files includes: aFileReference)
-		ifFalse: [ files add: aFileReference ]
-		ifTrue: [ ^ self inform: 'File already added in the browser !' ].
-	addedFilesPresenter items: files.
-	self updateContentViewer: aFileReference
+		ifTrue: [ ^ self inform: 'File already added in the browser !' ]
+		ifFalse: [
+				files add: aFileReference.
+				addedFilesPresenter items: files.
+				addedFilesPresenter selectItem: aFileReference ]
 ]
 
 { #category : 'layout' }
@@ -89,10 +97,14 @@ DSRecordBrowserPresenter >> addRecordButton [
 { #category : 'initialization' }
 DSRecordBrowserPresenter >> connectPresenters [
 
-	selectedRecords ifNotNil: [
-			selectedRecordsPresenter
-				roots: selectedRecords;
-				children: [ :item | OrderedCollection new ] ]
+	addedFilesPresenter whenSelectionChangedDo: [ :presenter |
+			presenter selectedItem ifNotNil: [
+					selectedRecords := self getColoredRecordsOf: (self getHistoryOf: presenter selectedItem) windows.
+					selectedRecordsPresenter
+						roots: selectedRecords;
+						children: [ :item | OrderedCollection new ].
+					timeline script: [ :canvas | self timelineChart renderIn: canvas ].
+					timeline refresh ] ]
 ]
 
 { #category : 'layout' }
@@ -103,9 +115,13 @@ DSRecordBrowserPresenter >> defaultLayout [
 		  add: (SpPanedLayout newHorizontal
 				   positionOfSlider: 30 percent;
 				   add: addedFilesPresenter;
-				   add: selectedRecordsPresenter;
-				   yourself);
-		  yourself
+				   add: (SpBoxLayout newTopToBottom
+						    add: (SpTabLayout new
+								     add: selectedRecordsPresenter label: 'Records';
+								     add: timeline label: 'Timeline';
+								     yourself);
+						    yourself);
+				   yourself)
 ]
 
 { #category : 'accessing' }
@@ -135,11 +151,11 @@ DSRecordBrowserPresenter >> getHistoryOf: aFileReference [
 { #category : 'color' }
 DSRecordBrowserPresenter >> getWindowColorFor: aWindowRecord [
 
-	aWindowRecord isBrowser ifTrue: [ ^ Color fromHexString: '#2A2AB7' ]. "aWindowRecord isImplementorOrSender ifTrue: [ ^ Color lightGreen ]"
+	aWindowRecord isBrowser ifTrue: [ ^ Color fromHexString: '#2A2AB7' ].
 	aWindowRecord isInspector ifTrue: [ ^ Color fromHexString: '#FFC300' ].
 	aWindowRecord isDebugger ifTrue: [ ^ Color fromHexString: '#C41E3D' ].
-
-	aWindowRecord isPlayground ifTrue: [ ^ Color fromHexString: '#70B77E'].
+	
+	aWindowRecord isPlayground ifTrue: [ ^ Color fromHexString: '#70B77E' ].
 	aWindowRecord isBreakpointBrowser ifTrue: [ ^ Color fromHexString: '#7C238C' ].
 	aWindowRecord isCritiqueBrowser ifTrue: [ ^ Color fromHexString: '#A45C15' ].
 	aWindowRecord isEpicea ifTrue: [ ^ Color fromHexString: '#345e54' ].
@@ -160,7 +176,6 @@ DSRecordBrowserPresenter >> initializePresenters [
 	addedFilesPresenter := self newList
 		                       items: self files;
 		                       display: [ :file | file basenameWithoutExtension ];
-		                       whenSelectionChangedDo: [ :file | file ifNotNil: [ self updateContentViewer: file selectedItem ] ];
 		                       actions: self listAddedFilesActions;
 		                       yourself.
 
@@ -176,7 +191,9 @@ DSRecordBrowserPresenter >> initializePresenters [
 				                             evaluated: [ :coloredRecord | coloredRecord record dateTime asTime print24 ]);
 		                            beResizable;
 		                            actions: self listRecordActions;
-		                            yourself
+		                            yourself.
+
+	timeline := self newRoassal
 ]
 
 { #category : 'operations' }
@@ -214,12 +231,18 @@ DSRecordBrowserPresenter >> listRecordActions [
 { #category : 'operations' }
 DSRecordBrowserPresenter >> openAddFileDialog [
 
-	| fileNames |
-	fileNames := StOpenFilePresenter new
+	| newFiles |
+	newFiles := StOpenFilePresenter new
 		             beMultipleSelection;
 		             defaultFolder: DSSpy logger loggingDirectory;
 		             openModal.
-	fileNames ifNotNil: [ fileNames do: [ :file | self addFile: file asFileReference ] ]
+	newFiles ifNotNil: [ newFiles do: [ :file | self addFile: file asFileReference ] ]
+]
+
+{ #category : 'initialization' }
+DSRecordBrowserPresenter >> resetBrowser [
+
+	<script: 'self resetBrowser'>
 ]
 
 { #category : 'layout' }
@@ -272,20 +295,45 @@ DSRecordBrowserPresenter >> stopRecording [
 	self currentWorld removeMorph: recorderWindow
 ]
 
-{ #category : 'operations' }
-DSRecordBrowserPresenter >> updateContentViewer: aFileReference [
+{ #category : 'layout' }
+DSRecordBrowserPresenter >> timelineChart [
+
+	| history names chart data plot |
+	addedFilesPresenter selectedItem ifNil: [ ^ nil ].
+	history := self getHistoryOf: addedFilesPresenter selectedItem.
+
+	names := history windows collect: [ :i | i getWindowType ].
+
+	data := history windows collect: [ :w |
+			        {
+				        w events first dateTime asSeconds.
+				        w events last dateTime asSeconds } ].
+
+	data ifEmpty: [ ^ nil ].
+
+	chart := RSCompositeChart new.
+	data doWithIndex: [ :line :index |
+			plot := RSTimeLinePlot new entries: line at: index.
+			chart add: plot ].
+
+	chart verticalTick fromNames: names.
+
+	chart horizontalTick
+		useNiceLabel;
+		numberOfTicks: history windows size // 2;
+		useDiagonalLabel;
+		labelConversion: [ :v | (DateAndTime fromSeconds: v) asTime ].
+
+	chart build.
+	chart plots doWithIndex: [ :p :index | p bars @ (RSPopup text: [ :assoc | (names at: index) , String cr , assoc asString ]) ].
 
-	| history |
-	aFileReference ifNotNil: [
-			history := self getHistoryOf: aFileReference.
-			selectedRecords := self getColoredRecordsOf: history windows.
-			self connectPresenters ]
+	^ chart
 ]
 
 { #category : 'accessing' }
 DSRecordBrowserPresenter >> windowIcon [
 
-	^ self iconNamed: #browse
+	^ self iconNamed: #smallObjects 
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSWindowRecord.class.st b/DebuggingSpy/DSWindowRecord.class.st
index a722898..d0f895c 100644
--- a/DebuggingSpy/DSWindowRecord.class.st
+++ b/DebuggingSpy/DSWindowRecord.class.st
@@ -103,6 +103,14 @@ DSWindowRecord >> events: anObject [
 	events := anObject
 ]
 
+{ #category : 'accessing' }
+DSWindowRecord >> getWindowType [
+
+	toolInfos ifNotNil: [ ^ toolInfos first toolClassName ].
+	type isString ifTrue: [ ^ type ].
+	^ 'External Window'
+]
+
 { #category : 'accessing' }
 DSWindowRecord >> idleTime [
 
@@ -213,13 +221,7 @@ DSWindowRecord >> printOn: ws [
 { #category : 'printing' }
 DSWindowRecord >> printTypeOn: aStream [
 
-	toolInfos ifNotNil: [
-		aStream << toolInfos first toolClassName.
-		^ self ].
-	type isString ifTrue: [
-		aStream << type.
-		^ self ].
-	aStream << 'External Window'
+	aStream << self getWindowType
 ]
 
 { #category : 'accessing' }

From 5cd5eb85ab76f317da64354c67241ad61f541cf9 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Mon, 16 Feb 2026 10:14:39 +0100
Subject: [PATCH 15/36] feat: dynamic colors for timeline

---
 .../DSRecordBrowserPresenter.class.st         | 53 ++++++++++---------
 .../DSTimelineWindow.class.st                 | 52 ++++++++++++++++++
 2 files changed, 79 insertions(+), 26 deletions(-)
 create mode 100644 DebuggingSpy-Browser/DSTimelineWindow.class.st

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index d7a9351..ee594eb 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -27,6 +27,23 @@ Class {
 	#package : 'DebuggingSpy-Browser'
 }
 
+{ #category : 'color' }
+DSRecordBrowserPresenter class >> getWindowColorFor: aWindowRecord [
+
+	aWindowRecord isBrowser ifTrue: [ ^ Color fromHexString: '#2A2AB7' ].
+	aWindowRecord isInspector ifTrue: [ ^ Color fromHexString: '#FFC300' ].
+	aWindowRecord isDebugger ifTrue: [ ^ Color fromHexString: '#C41E3D' ].
+	
+	aWindowRecord isPlayground ifTrue: [ ^ Color fromHexString: '#70B77E' ].
+	aWindowRecord isBreakpointBrowser ifTrue: [ ^ Color fromHexString: '#7C238C' ].
+	aWindowRecord isCritiqueBrowser ifTrue: [ ^ Color fromHexString: '#A45C15' ].
+	aWindowRecord isEpicea ifTrue: [ ^ Color fromHexString: '#345e54' ].
+	aWindowRecord isIceberg ifTrue: [ ^ Color fromHexString: '#2B5BA9' ].
+	aWindowRecord isRewriter ifTrue: [ ^ Color fromHexString: '#292929' ].
+
+	^ Color gray
+]
+
 { #category : 'world menu' }
 DSRecordBrowserPresenter class >> menuCommandOn: aBuilder [
 	"Adds the DSSpy button on topside bar, the order is 100 just to make sure the DSSpy button is at the end"
@@ -137,7 +154,7 @@ DSRecordBrowserPresenter >> getColoredRecordsOf: aWindowRecordCollection [
 	coloredRecords := OrderedCollection new.
 	aWindowRecordCollection do: [ :windowRecord |
 			coloredRecords addAll:
-				(windowRecord events collect: [ :record | DSColoredRecord for: record withColor: (self getWindowColorFor: windowRecord) ]) ].
+				(windowRecord events collect: [ :record | DSColoredRecord for: record withColor: (self class getWindowColorFor: windowRecord) ]) ].
 	coloredRecords sort: [ :i :j | i record dateTime < j record dateTime ].
 	^ coloredRecords
 ]
@@ -148,21 +165,10 @@ DSRecordBrowserPresenter >> getHistoryOf: aFileReference [
 	^ DSRecordHistory on: (DSSpy materialize: aFileReference)
 ]
 
-{ #category : 'color' }
-DSRecordBrowserPresenter >> getWindowColorFor: aWindowRecord [
-
-	aWindowRecord isBrowser ifTrue: [ ^ Color fromHexString: '#2A2AB7' ].
-	aWindowRecord isInspector ifTrue: [ ^ Color fromHexString: '#FFC300' ].
-	aWindowRecord isDebugger ifTrue: [ ^ Color fromHexString: '#C41E3D' ].
-	
-	aWindowRecord isPlayground ifTrue: [ ^ Color fromHexString: '#70B77E' ].
-	aWindowRecord isBreakpointBrowser ifTrue: [ ^ Color fromHexString: '#7C238C' ].
-	aWindowRecord isCritiqueBrowser ifTrue: [ ^ Color fromHexString: '#A45C15' ].
-	aWindowRecord isEpicea ifTrue: [ ^ Color fromHexString: '#345e54' ].
-	aWindowRecord isIceberg ifTrue: [ ^ Color fromHexString: '#2B5BA9' ].
-	aWindowRecord isRewriter ifTrue: [ ^ Color fromHexString: '#292929' ].
+{ #category : 'operations' }
+DSRecordBrowserPresenter >> getTimelinePointsFrom: aHistory [
 
-	^ nil
+	^ aHistory windows collect: [ :w | DSTimelineWindow for: w ]
 ]
 
 { #category : 'initialization' }
@@ -300,20 +306,17 @@ DSRecordBrowserPresenter >> timelineChart [
 
 	| history names chart data plot |
 	addedFilesPresenter selectedItem ifNil: [ ^ nil ].
-	history := self getHistoryOf: addedFilesPresenter selectedItem.
 
+	history := self getHistoryOf: addedFilesPresenter selectedItem.
 	names := history windows collect: [ :i | i getWindowType ].
 
-	data := history windows collect: [ :w |
-			        {
-				        w events first dateTime asSeconds.
-				        w events last dateTime asSeconds } ].
-
-	data ifEmpty: [ ^ nil ].
+	data := self getTimelinePointsFrom: history.
 
 	chart := RSCompositeChart new.
-	data doWithIndex: [ :line :index |
-			plot := RSTimeLinePlot new entries: line at: index.
+	data doWithIndex: [ :timelineWindow :index |
+			plot := RSTimeLinePlot new
+				        entries: timelineWindow points at: index;
+				        color: timelineWindow color.
 			chart add: plot ].
 
 	chart verticalTick fromNames: names.
@@ -325,8 +328,6 @@ DSRecordBrowserPresenter >> timelineChart [
 		labelConversion: [ :v | (DateAndTime fromSeconds: v) asTime ].
 
 	chart build.
-	chart plots doWithIndex: [ :p :index | p bars @ (RSPopup text: [ :assoc | (names at: index) , String cr , assoc asString ]) ].
-
 	^ chart
 ]
 
diff --git a/DebuggingSpy-Browser/DSTimelineWindow.class.st b/DebuggingSpy-Browser/DSTimelineWindow.class.st
new file mode 100644
index 0000000..6148173
--- /dev/null
+++ b/DebuggingSpy-Browser/DSTimelineWindow.class.st
@@ -0,0 +1,52 @@
+"
+I am a class representing a plot for the DSSpy visualizer timeline.
+"
+Class {
+	#name : 'DSTimelineWindow',
+	#superclass : 'Object',
+	#instVars : [
+		'color',
+		'points'
+	],
+	#category : 'DebuggingSpy-Browser',
+	#package : 'DebuggingSpy-Browser'
+}
+
+{ #category : 'instance creation' }
+DSTimelineWindow class >> for: aWindow [
+
+	^ self new processWindow: aWindow
+]
+
+{ #category : 'accessing' }
+DSTimelineWindow >> color [
+
+	^ color
+]
+
+{ #category : 'accessing' }
+DSTimelineWindow >> color: newColor [
+
+	color := newColor
+]
+
+{ #category : 'accessing' }
+DSTimelineWindow >> points [
+
+	^ points
+]
+
+{ #category : 'accessing' }
+DSTimelineWindow >> points: newPoints [
+
+	points := newPoints
+]
+
+{ #category : 'processing' }
+DSTimelineWindow >> processWindow: aWindow [
+
+	points := {
+		          aWindow events first dateTime asSeconds.
+		          aWindow events last dateTime asSeconds }.
+	color := DSRecordBrowserPresenter getWindowColorFor: aWindow
+]

From 70a8d125aae6b217769efe32ca9345ce3e9bb5ca Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Mon, 16 Feb 2026 11:31:58 +0100
Subject: [PATCH 16/36] fix: refactoring and display plots with nanoseconds

---
 .../DSRecordBrowserPresenter.class.st         | 18 ++++---
 .../DSTimelineWindow.class.st                 | 52 -------------------
 2 files changed, 10 insertions(+), 60 deletions(-)
 delete mode 100644 DebuggingSpy-Browser/DSTimelineWindow.class.st

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index ee594eb..b7407b2 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -168,7 +168,13 @@ DSRecordBrowserPresenter >> getHistoryOf: aFileReference [
 { #category : 'operations' }
 DSRecordBrowserPresenter >> getTimelinePointsFrom: aHistory [
 
-	^ aHistory windows collect: [ :w | DSTimelineWindow for: w ]
+	^ aHistory windows collectWithIndex: [ :w :index |
+			  RSTimeLinePlot new
+				  entries: {
+						  w events first dateTime asNanoSeconds.
+						  w events last dateTime asNanoSeconds }
+				  at: index;
+				  color: (self class getWindowColorFor: w) ]
 ]
 
 { #category : 'initialization' }
@@ -304,7 +310,7 @@ DSRecordBrowserPresenter >> stopRecording [
 { #category : 'layout' }
 DSRecordBrowserPresenter >> timelineChart [
 
-	| history names chart data plot |
+	| history names chart data |
 	addedFilesPresenter selectedItem ifNil: [ ^ nil ].
 
 	history := self getHistoryOf: addedFilesPresenter selectedItem.
@@ -313,11 +319,7 @@ DSRecordBrowserPresenter >> timelineChart [
 	data := self getTimelinePointsFrom: history.
 
 	chart := RSCompositeChart new.
-	data doWithIndex: [ :timelineWindow :index |
-			plot := RSTimeLinePlot new
-				        entries: timelineWindow points at: index;
-				        color: timelineWindow color.
-			chart add: plot ].
+	chart addAll: data.
 
 	chart verticalTick fromNames: names.
 
@@ -325,7 +327,7 @@ DSRecordBrowserPresenter >> timelineChart [
 		useNiceLabel;
 		numberOfTicks: history windows size // 2;
 		useDiagonalLabel;
-		labelConversion: [ :v | (DateAndTime fromSeconds: v) asTime ].
+		labelConversion: [ :v | (DateAndTime fromSeconds: v // 1000000000) asTime ].
 
 	chart build.
 	^ chart
diff --git a/DebuggingSpy-Browser/DSTimelineWindow.class.st b/DebuggingSpy-Browser/DSTimelineWindow.class.st
deleted file mode 100644
index 6148173..0000000
--- a/DebuggingSpy-Browser/DSTimelineWindow.class.st
+++ /dev/null
@@ -1,52 +0,0 @@
-"
-I am a class representing a plot for the DSSpy visualizer timeline.
-"
-Class {
-	#name : 'DSTimelineWindow',
-	#superclass : 'Object',
-	#instVars : [
-		'color',
-		'points'
-	],
-	#category : 'DebuggingSpy-Browser',
-	#package : 'DebuggingSpy-Browser'
-}
-
-{ #category : 'instance creation' }
-DSTimelineWindow class >> for: aWindow [
-
-	^ self new processWindow: aWindow
-]
-
-{ #category : 'accessing' }
-DSTimelineWindow >> color [
-
-	^ color
-]
-
-{ #category : 'accessing' }
-DSTimelineWindow >> color: newColor [
-
-	color := newColor
-]
-
-{ #category : 'accessing' }
-DSTimelineWindow >> points [
-
-	^ points
-]
-
-{ #category : 'accessing' }
-DSTimelineWindow >> points: newPoints [
-
-	points := newPoints
-]
-
-{ #category : 'processing' }
-DSTimelineWindow >> processWindow: aWindow [
-
-	points := {
-		          aWindow events first dateTime asSeconds.
-		          aWindow events last dateTime asSeconds }.
-	color := DSRecordBrowserPresenter getWindowColorFor: aWindow
-]

From a44b70a72903d564e38c653eb869a04ec73c0e31 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Tue, 17 Feb 2026 10:31:39 +0100
Subject: [PATCH 17/36] refactoring: remove buttons attributes in browser class

---
 .../DSRecordBrowserPresenter.class.st         | 70 +++++++++++--------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index b7407b2..bd66601 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -11,9 +11,6 @@ Class {
 	#instVars : [
 		'files',
 		'selectedRecords',
-		'startRecordButton',
-		'stopRecordButton',
-		'addRecordButton',
 		'toolbar',
 		'addedFilesPresenter',
 		'selectedRecordsPresenter',
@@ -102,13 +99,12 @@ DSRecordBrowserPresenter >> addFile: aFileReference [
 { #category : 'layout' }
 DSRecordBrowserPresenter >> addRecordButton [
 
-	^ addRecordButton ifNil: [
-			  addRecordButton := SpToolbarButtonPresenter new
-				                     label: 'Add';
-				                     icon: (self iconNamed: #smallAdd);
-				                     help: 'Add a new record.';
-				                     action: [ self openAddFileDialog ];
-				                     yourself ]
+	^ SpToolbarButtonPresenter new
+		  label: 'Add';
+		  icon: (self iconNamed: #smallAdd);
+		  help: 'Add a new record.';
+		  action: [ self openAddFileDialog ];
+		  yourself
 ]
 
 { #category : 'initialization' }
@@ -147,6 +143,17 @@ DSRecordBrowserPresenter >> files [
 	^ files ifNil: [ files := OrderedCollection new ]
 ]
 
+{ #category : 'layout' }
+DSRecordBrowserPresenter >> filterRecordsButton [
+
+	^ SpToolbarButtonPresenter new
+		  label: 'Filter';
+		  icon: (self iconNamed: #diff);
+		  help: 'Filter the records.';
+		  action: [ self openAddFileDialog ];
+		  yourself
+]
+
 { #category : 'operations' }
 DSRecordBrowserPresenter >> getColoredRecordsOf: aWindowRecordCollection [
 
@@ -183,7 +190,10 @@ DSRecordBrowserPresenter >> initializePresenters [
 	toolbar := self newToolbar
 		           addItem: self addRecordButton;
 		           addItem: self startRecordButton;
-		           addItem: self stopRecordButton.
+		           addItem: self stopRecordButton;
+		           addItem: self filterRecordsButton.
+
+	toolbar inspect.
 
 	addedFilesPresenter := self newList
 		                       items: self files;
@@ -260,14 +270,13 @@ DSRecordBrowserPresenter >> resetBrowser [
 { #category : 'layout' }
 DSRecordBrowserPresenter >> startRecordButton [
 
-	^ startRecordButton ifNil: [
-			  startRecordButton := SpToolbarButtonPresenter new
-				                       label: 'Start';
-				                       icon: (self iconNamed: #glamorousGo);
-				                       help: 'Start recording events.';
-				                       action: [ self startRecording ];
-				                       enabled: DSSpy recordingSession not;
-				                       yourself ]
+	^ SpToolbarButtonPresenter new
+		  label: 'Start';
+		  icon: (self iconNamed: #glamorousGo);
+		  help: 'Start recording events.';
+		  action: [ self startRecording ];
+		  enabled: DSSpy recordingSession not;
+		  yourself
 ]
 
 { #category : 'recording' }
@@ -275,8 +284,8 @@ DSRecordBrowserPresenter >> startRecording [
 	"Starts recording events and instianciates a new RecorderWindow that displays a timer and shows that Debugging Spy is recordering."
 
 	DSSpyInstrumenter instrumentSystem.
-	startRecordButton enabled: false.
-	stopRecordButton enabled: true.
+	(toolbar leftItems at: 2) enabled: false. "Disable the start recording button."
+	(toolbar leftItems at: 3) enabled: true. "Enable the stop recording button."
 	recorderWindow := DSRecorderWindow new.
 	recorderWindow
 		openInWorld;
@@ -286,14 +295,13 @@ DSRecordBrowserPresenter >> startRecording [
 { #category : 'layout' }
 DSRecordBrowserPresenter >> stopRecordButton [
 
-	^ stopRecordButton ifNil: [
-			  stopRecordButton := SpToolbarButtonPresenter new
-				                      label: 'Stop';
-				                      icon: (self iconNamed: #stop);
-				                      help: 'Stop recording events.';
-				                      action: [ self stopRecording ];
-				                      enabled: DSSpy recordingSession;
-				                      yourself ]
+	^ SpToolbarButtonPresenter new
+		  label: 'Stop';
+		  icon: (self iconNamed: #stop);
+		  help: 'Stop recording events.';
+		  action: [ self stopRecording ];
+		  enabled: DSSpy recordingSession;
+		  yourself
 ]
 
 { #category : 'recording' }
@@ -301,8 +309,8 @@ DSRecordBrowserPresenter >> stopRecording [
 	"Stops the recording session and closes the RecorderWindow."
 
 	DSSpyInstrumenter stopInstrumentation.
-	startRecordButton enabled: true.
-	stopRecordButton enabled: false.
+	(toolbar leftItems at: 2) enabled: true. "Enable the start recording button."
+	(toolbar leftItems at: 3) enabled: false. "Disable the stop recording button."
 	recorderWindow stopTimer.
 	self currentWorld removeMorph: recorderWindow
 ]

From 0ae7e5ca25117190eb5237ce0e61908bcab566d6 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Tue, 17 Feb 2026 11:26:03 +0100
Subject: [PATCH 18/36] feat: adding a method for getting all record classes

---
 DebuggingSpy/DSAbstractBrowserRecord.class.st         |  6 ++++++
 DebuggingSpy/DSAbstractDebugPointEventRecord.class.st |  6 ++++++
 DebuggingSpy/DSAbstractDebuggerActionRecord.class.st  |  6 ++++++
 DebuggingSpy/DSAbstractEventRecord.class.st           | 10 ++++++++++
 DebuggingSpy/DSAbstractExtendedRecord.class.st        |  6 ++++++
 DebuggingSpy/DSAbstractHaltRecord.class.st            |  6 ++++++
 DebuggingSpy/DSAbstractSindarinActionRecord.class.st  |  6 ++++++
 DebuggingSpy/DSAbstractTaskRecord.class.st            |  6 ++++++
 DebuggingSpy/DSClipboardActionRecord.class.st         |  6 ++++++
 DebuggingSpy/DSCodeActionRecord.class.st              |  6 ++++++
 DebuggingSpy/DSDebugPointRecord.class.st              |  6 ++++++
 DebuggingSpy/DSMethodDebugPointRecord.class.st        |  6 ++++++
 DebuggingSpy/DSMethodEventRecord.class.st             |  6 ++++++
 DebuggingSpy/DSMouseEventRecord.class.st              |  6 ++++++
 DebuggingSpy/DSWindowEventRecord.class.st             |  6 ++++++
 15 files changed, 94 insertions(+)

diff --git a/DebuggingSpy/DSAbstractBrowserRecord.class.st b/DebuggingSpy/DSAbstractBrowserRecord.class.st
index 323bd07..62bf207 100644
--- a/DebuggingSpy/DSAbstractBrowserRecord.class.st
+++ b/DebuggingSpy/DSAbstractBrowserRecord.class.st
@@ -9,6 +9,12 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'testing' }
+DSAbstractBrowserRecord class >> isAbstract [
+
+	^ self == DSAbstractBrowserRecord
+]
+
 { #category : 'actions api' }
 DSAbstractBrowserRecord >> record: aCommandObject [
 
diff --git a/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st b/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
index 7957707..25a9e12 100644
--- a/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
@@ -18,6 +18,12 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'testing' }
+DSAbstractDebugPointEventRecord class >> isAbstract [
+
+	^ self == DSAbstractDebugPointEventRecord
+]
+
 { #category : 'converting' }
 DSAbstractDebugPointEventRecord >> asDebugPointRecord [
 
diff --git a/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st b/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
index 98d2ade..f6dc99f 100644
--- a/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
+++ b/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
@@ -8,3 +8,9 @@ Class {
 	#package : 'DebuggingSpy',
 	#tag : 'Records'
 }
+
+{ #category : 'testing' }
+DSAbstractDebuggerActionRecord class >> isAbstract [
+
+	^ self == DSAbstractDebuggerActionRecord
+]
diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index 0c7ecf5..5dab13d 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -23,6 +23,16 @@ DSAbstractEventRecord class >> for: anObject [
 	^ rec
 ]
 
+{ #category : 'accessing' }
+DSAbstractEventRecord class >> getRecordClasses [
+
+	| classes |
+	classes := (self subclasses reject: [ :c | c isAbstract ]) asOrderedCollection.
+	self subclasses do: [ :subclass | classes addAll: subclass getRecordClasses ].
+
+	^ classes
+]
+
 { #category : 'accessing' }
 DSAbstractEventRecord class >> link [
 
diff --git a/DebuggingSpy/DSAbstractExtendedRecord.class.st b/DebuggingSpy/DSAbstractExtendedRecord.class.st
index 9a4356e..fd4bca8 100644
--- a/DebuggingSpy/DSAbstractExtendedRecord.class.st
+++ b/DebuggingSpy/DSAbstractExtendedRecord.class.st
@@ -17,6 +17,12 @@ DSAbstractExtendedRecord class >> for: anObject [
 		  yourself
 ]
 
+{ #category : 'testing' }
+DSAbstractExtendedRecord class >> isAbstract [
+
+	^ self == DSAbstractExtendedRecord
+]
+
 { #category : 'accessing' }
 DSAbstractExtendedRecord >> dateTime [
 
diff --git a/DebuggingSpy/DSAbstractHaltRecord.class.st b/DebuggingSpy/DSAbstractHaltRecord.class.st
index 659fa0c..b0bef19 100644
--- a/DebuggingSpy/DSAbstractHaltRecord.class.st
+++ b/DebuggingSpy/DSAbstractHaltRecord.class.st
@@ -13,6 +13,12 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'testing' }
+DSAbstractHaltRecord class >> isAbstract [
+
+	^ self == DSAbstractHaltRecord
+]
+
 { #category : 'accessing' }
 DSAbstractHaltRecord >> method [
 
diff --git a/DebuggingSpy/DSAbstractSindarinActionRecord.class.st b/DebuggingSpy/DSAbstractSindarinActionRecord.class.st
index 63bda5e..b134a9a 100644
--- a/DebuggingSpy/DSAbstractSindarinActionRecord.class.st
+++ b/DebuggingSpy/DSAbstractSindarinActionRecord.class.st
@@ -8,3 +8,9 @@ Class {
 	#package : 'DebuggingSpy',
 	#tag : 'Records'
 }
+
+{ #category : 'testing' }
+DSAbstractSindarinActionRecord class >> isAbstract [
+
+	^ self == DSAbstractSindarinActionRecord
+]
diff --git a/DebuggingSpy/DSAbstractTaskRecord.class.st b/DebuggingSpy/DSAbstractTaskRecord.class.st
index 7d20053..5713acc 100644
--- a/DebuggingSpy/DSAbstractTaskRecord.class.st
+++ b/DebuggingSpy/DSAbstractTaskRecord.class.st
@@ -15,6 +15,12 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'testing' }
+DSAbstractTaskRecord class >> isAbstract [
+
+	^ self == DSAbstractTaskRecord
+]
+
 { #category : 'accessing' }
 DSAbstractTaskRecord >> description [
 
diff --git a/DebuggingSpy/DSClipboardActionRecord.class.st b/DebuggingSpy/DSClipboardActionRecord.class.st
index e7c0fab..135c76f 100644
--- a/DebuggingSpy/DSClipboardActionRecord.class.st
+++ b/DebuggingSpy/DSClipboardActionRecord.class.st
@@ -15,6 +15,12 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'testing' }
+DSClipboardActionRecord class >> isAbstract [
+
+	^ self == DSClipboardActionRecord
+]
+
 { #category : 'accessing' }
 DSClipboardActionRecord >> clipboardText [
 
diff --git a/DebuggingSpy/DSCodeActionRecord.class.st b/DebuggingSpy/DSCodeActionRecord.class.st
index bc029a3..98396fe 100644
--- a/DebuggingSpy/DSCodeActionRecord.class.st
+++ b/DebuggingSpy/DSCodeActionRecord.class.st
@@ -13,6 +13,12 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'testing' }
+DSCodeActionRecord class >> isAbstract [
+
+	^ self == DSCodeActionRecord
+]
+
 { #category : 'actions api' }
 DSCodeActionRecord >> record: anEditor [
 
diff --git a/DebuggingSpy/DSDebugPointRecord.class.st b/DebuggingSpy/DSDebugPointRecord.class.st
index ecc792e..dca6329 100644
--- a/DebuggingSpy/DSDebugPointRecord.class.st
+++ b/DebuggingSpy/DSDebugPointRecord.class.st
@@ -24,6 +24,12 @@ DSDebugPointRecord class >> debugpointremoved: event [
 	^ self subclassResponsibility
 ]
 
+{ #category : 'testing' }
+DSDebugPointRecord class >> isAbstract [
+
+	^ self == DSDebugPointRecord
+]
+
 { #category : 'testing' }
 DSDebugPointRecord >> canOpenDebuggers [
 
diff --git a/DebuggingSpy/DSMethodDebugPointRecord.class.st b/DebuggingSpy/DSMethodDebugPointRecord.class.st
index d79380e..34d216d 100644
--- a/DebuggingSpy/DSMethodDebugPointRecord.class.st
+++ b/DebuggingSpy/DSMethodDebugPointRecord.class.st
@@ -47,6 +47,12 @@ DSMethodDebugPointRecord class >> for: anEvent [
 	^ anEvent
 ]
 
+{ #category : 'testing' }
+DSMethodDebugPointRecord class >> isAbstract [
+
+	^ self == DSMethodDebugPointRecord 
+]
+
 { #category : 'accessing' }
 DSMethodDebugPointRecord >> eventName [
 
diff --git a/DebuggingSpy/DSMethodEventRecord.class.st b/DebuggingSpy/DSMethodEventRecord.class.st
index 3651e2e..6869349 100644
--- a/DebuggingSpy/DSMethodEventRecord.class.st
+++ b/DebuggingSpy/DSMethodEventRecord.class.st
@@ -21,6 +21,12 @@ DSMethodEventRecord class >> added: aMethod [
 		  yourself
 ]
 
+{ #category : 'testing' }
+DSMethodEventRecord class >> isAbstract [
+
+	^ self == DSMethodEventRecord
+]
+
 { #category : 'instance creation' }
 DSMethodEventRecord class >> modified: aMethod [
 
diff --git a/DebuggingSpy/DSMouseEventRecord.class.st b/DebuggingSpy/DSMouseEventRecord.class.st
index 5300f4e..b0ed2e2 100644
--- a/DebuggingSpy/DSMouseEventRecord.class.st
+++ b/DebuggingSpy/DSMouseEventRecord.class.st
@@ -16,6 +16,12 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'testing' }
+DSMouseEventRecord class >> isAbstract [
+
+	^ self == DSMouseEventRecord
+]
+
 { #category : 'actions api' }
 DSMouseEventRecord >> record: aWindow [
 
diff --git a/DebuggingSpy/DSWindowEventRecord.class.st b/DebuggingSpy/DSWindowEventRecord.class.st
index 1680639..cc06189 100644
--- a/DebuggingSpy/DSWindowEventRecord.class.st
+++ b/DebuggingSpy/DSWindowEventRecord.class.st
@@ -15,6 +15,12 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'testing' }
+DSWindowEventRecord class >> isAbstract [
+
+	^ self == DSWindowEventRecord
+]
+
 { #category : 'actions api' }
 DSWindowEventRecord >> record: aWindowEvent [
 

From 305073b3dcaea466d3fc8e00dee845431548f1fa Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 18 Feb 2026 11:12:03 +0100
Subject: [PATCH 19/36] feat: filter the records fix: error when opening
 timeline with not enough data

---
 .../DSRecordBrowserPresenter.class.st         | 61 +++++++++++++++----
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index bd66601..cdf8cf2 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -15,7 +15,8 @@ Class {
 		'addedFilesPresenter',
 		'selectedRecordsPresenter',
 		'recorderWindow',
-		'timeline'
+		'timeline',
+		'recordsFilter'
 	],
 	#classInstVars : [
 		'presenterWindow'
@@ -112,12 +113,14 @@ DSRecordBrowserPresenter >> connectPresenters [
 
 	addedFilesPresenter whenSelectionChangedDo: [ :presenter |
 			presenter selectedItem ifNotNil: [
-					selectedRecords := self getColoredRecordsOf: (self getHistoryOf: presenter selectedItem) windows.
-					selectedRecordsPresenter
-						roots: selectedRecords;
-						children: [ :item | OrderedCollection new ].
-					timeline script: [ :canvas | self timelineChart renderIn: canvas ].
-					timeline refresh ] ]
+					self updateSelectedRecords: presenter.
+					self updateTimelineChart ] ].
+
+
+	recordsFilter whenChangedDo: [
+			addedFilesPresenter selectedItem ifNotNil: [
+					self updateSelectedRecords: addedFilesPresenter.
+					self updateTimelineChart ] ]
 ]
 
 { #category : 'layout' }
@@ -150,7 +153,7 @@ DSRecordBrowserPresenter >> filterRecordsButton [
 		  label: 'Filter';
 		  icon: (self iconNamed: #diff);
 		  help: 'Filter the records.';
-		  action: [ self openAddFileDialog ];
+		  action: [ self recordsFilter open ];
 		  yourself
 ]
 
@@ -193,8 +196,6 @@ DSRecordBrowserPresenter >> initializePresenters [
 		           addItem: self stopRecordButton;
 		           addItem: self filterRecordsButton.
 
-	toolbar inspect.
-
 	addedFilesPresenter := self newList
 		                       items: self files;
 		                       display: [ :file | file basenameWithoutExtension ];
@@ -203,10 +204,15 @@ DSRecordBrowserPresenter >> initializePresenters [
 
 	selectedRecordsPresenter := self newTreeTable
 		                            addColumn: (SpStringTableColumn new
-				                             title: 'Event type';
+				                             title: 'Event';
 				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
 				                             evaluated: [ :coloredRecord | coloredRecord record eventName asString ];
 				                             yourself);
+		                            addColumn: (SpStringTableColumn new
+				                             title: 'Event type';
+				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
+				                             evaluated: [ :coloredRecord | coloredRecord record class ];
+				                             yourself);
 		                            addColumn: (SpStringTableColumn new
 				                             title: 'Time';
 				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
@@ -215,7 +221,8 @@ DSRecordBrowserPresenter >> initializePresenters [
 		                            actions: self listRecordActions;
 		                            yourself.
 
-	timeline := self newRoassal
+	timeline := self newRoassal.
+	recordsFilter := self recordsFilter
 ]
 
 { #category : 'operations' }
@@ -261,6 +268,12 @@ DSRecordBrowserPresenter >> openAddFileDialog [
 	newFiles ifNotNil: [ newFiles do: [ :file | self addFile: file asFileReference ] ]
 ]
 
+{ #category : 'accessing' }
+DSRecordBrowserPresenter >> recordsFilter [
+
+	^ recordsFilter ifNil: [ recordsFilter := SpChooserPresenter new sourceItems: DSAbstractEventRecord getRecordClasses ]
+]
+
 { #category : 'initialization' }
 DSRecordBrowserPresenter >> resetBrowser [
 
@@ -325,7 +338,8 @@ DSRecordBrowserPresenter >> timelineChart [
 	names := history windows collect: [ :i | i getWindowType ].
 
 	data := self getTimelinePointsFrom: history.
-
+	data size < 2 ifTrue: [^ nil].
+	
 	chart := RSCompositeChart new.
 	chart addAll: data.
 
@@ -341,6 +355,27 @@ DSRecordBrowserPresenter >> timelineChart [
 	^ chart
 ]
 
+{ #category : 'operations' }
+DSRecordBrowserPresenter >> updateSelectedRecords: aPresenter [
+
+	| records |
+	records := self getColoredRecordsOf: (self getHistoryOf: aPresenter selectedItem) windows.
+	records := records reject: [ :coloredRecord | self recordsFilter chosenItems includes: coloredRecord record class ].
+	selectedRecords := records.
+	selectedRecordsPresenter
+		roots: selectedRecords;
+		children: [ :item | OrderedCollection new ]
+]
+
+{ #category : 'operations' }
+DSRecordBrowserPresenter >> updateTimelineChart [
+
+	| chart |
+	chart := self timelineChart.
+	chart ifNotNil: [ timeline script: [ :canvas | chart renderIn: canvas ] ].
+	timeline refresh
+]
+
 { #category : 'accessing' }
 DSRecordBrowserPresenter >> windowIcon [
 

From 318ba65b5cb9541f3747c9684ed43c9d350d51bf Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 18 Feb 2026 11:41:47 +0100
Subject: [PATCH 20/36] refactoring: records table and text color always white

---
 .../DSRecordBrowserPresenter.class.st         | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index cdf8cf2..759c613 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -202,25 +202,7 @@ DSRecordBrowserPresenter >> initializePresenters [
 		                       actions: self listAddedFilesActions;
 		                       yourself.
 
-	selectedRecordsPresenter := self newTreeTable
-		                            addColumn: (SpStringTableColumn new
-				                             title: 'Event';
-				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
-				                             evaluated: [ :coloredRecord | coloredRecord record eventName asString ];
-				                             yourself);
-		                            addColumn: (SpStringTableColumn new
-				                             title: 'Event type';
-				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
-				                             evaluated: [ :coloredRecord | coloredRecord record class ];
-				                             yourself);
-		                            addColumn: (SpStringTableColumn new
-				                             title: 'Time';
-				                             displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
-				                             evaluated: [ :coloredRecord | coloredRecord record dateTime asTime print24 ]);
-		                            beResizable;
-		                            actions: self listRecordActions;
-		                            yourself.
-
+	selectedRecordsPresenter := self recordsTable.
 	timeline := self newRoassal.
 	recordsFilter := self recordsFilter
 ]
@@ -274,6 +256,33 @@ DSRecordBrowserPresenter >> recordsFilter [
 	^ recordsFilter ifNil: [ recordsFilter := SpChooserPresenter new sourceItems: DSAbstractEventRecord getRecordClasses ]
 ]
 
+{ #category : 'layout' }
+DSRecordBrowserPresenter >> recordsTable [
+
+	^ self newTreeTable
+		  addColumn: (SpStringTableColumn new
+				   title: 'Event';
+				   displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
+				   evaluated: [ :coloredRecord | coloredRecord record eventName asString ];
+				   displayColor: [ :aRecord | Color white ];
+				   yourself);
+		  addColumn: (SpStringTableColumn new
+				   title: 'Event type';
+				   displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
+				   evaluated: [ :coloredRecord | coloredRecord record class asString ];
+				   displayColor: [ :aRecord | Color white ];
+				   yourself);
+		  addColumn: (SpStringTableColumn new
+				   title: 'Time';
+				   displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
+				   evaluated: [ :coloredRecord | coloredRecord record dateTime asTime print24 ];
+				   displayColor: [ :aRecord | Color white ];
+				   yourself);
+		  beResizable;
+		  actions: self listRecordActions;
+		  yourself
+]
+
 { #category : 'initialization' }
 DSRecordBrowserPresenter >> resetBrowser [
 

From 9f8477edbaf801462f411319c0baf3c513d5463e Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 18 Feb 2026 15:47:26 +0100
Subject: [PATCH 21/36] feat: inspect record in table when selected

---
 DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index 759c613..d0e2b0c 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -120,7 +120,10 @@ DSRecordBrowserPresenter >> connectPresenters [
 	recordsFilter whenChangedDo: [
 			addedFilesPresenter selectedItem ifNotNil: [
 					self updateSelectedRecords: addedFilesPresenter.
-					self updateTimelineChart ] ]
+					self updateTimelineChart ] ].
+
+	selectedRecordsPresenter whenSelectionChangedDo: [
+		selectedRecordsPresenter selectedItem ifNotNil: [ selectedRecordsPresenter selectedItem inspect ] ]
 ]
 
 { #category : 'layout' }

From fa08e334260a0d796e7ef1800a314eaba0c3289f Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Thu, 19 Feb 2026 10:17:59 +0100
Subject: [PATCH 22/36] fix: on record inspect

---
 DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
index d0e2b0c..1d594f7 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
@@ -121,9 +121,6 @@ DSRecordBrowserPresenter >> connectPresenters [
 			addedFilesPresenter selectedItem ifNotNil: [
 					self updateSelectedRecords: addedFilesPresenter.
 					self updateTimelineChart ] ].
-
-	selectedRecordsPresenter whenSelectionChangedDo: [
-		selectedRecordsPresenter selectedItem ifNotNil: [ selectedRecordsPresenter selectedItem inspect ] ]
 ]
 
 { #category : 'layout' }
@@ -238,7 +235,7 @@ DSRecordBrowserPresenter >> listRecordActions [
 					  name: 'Inspect';
 					  description: 'Inspect the raw records';
 					  shortcutKey: $i meta;
-					  action: [ selectedRecordsPresenter selectedItem inspect ] ];
+					  action: [ selectedRecordsPresenter selectedItem record inspect ] ];
 		  yourself
 ]
 

From e5a6b5c8894860bb1e54728969aea65e8d9926fb Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Fri, 20 Feb 2026 16:01:14 +0100
Subject: [PATCH 23/36] test: for the browser and the recorder fix: timer that
 was not counting the seconds refactor: DSRecordBrowserPresenter =>
 DSRecordBrowser refactor: some methods from browser going into the browser
 class doc: updating the documentation for browser

---
 .../BaselineOfDebuggingSpy.class.st           |   2 +-
 .../DSRecordBrowserTest.class.st              | 136 ++++++++++++++++++
 .../DSRecorderWindowTest.class.st             |  25 ++++
 DebuggingSpy-Browser-Tests/package.st         |   1 +
 DebuggingSpy/DSSTONFileLogger.class.st        |   6 +
 5 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
 create mode 100644 DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
 create mode 100644 DebuggingSpy-Browser-Tests/package.st

diff --git a/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st b/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
index abdb873..597de7d 100644
--- a/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
+++ b/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
@@ -15,7 +15,7 @@ BaselineOfDebuggingSpy >> baseline: spec [
 			spec postLoadDoIt: #postloadAction.
 			spec package: 'DebuggingSpy'.
 			spec package: 'DebuggingSpy-Tests'.
-			spec package: 'RecordBrowser' ]
+			spec package: 'DebuggingSpy-Browser' ]
 ]
 
 { #category : 'baselines' }
diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
new file mode 100644
index 0000000..025a04a
--- /dev/null
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -0,0 +1,136 @@
+Class {
+	#name : 'DSRecordBrowserTest',
+	#superclass : 'TestCase',
+	#instVars : [
+		'browser',
+		'logger'
+	],
+	#category : 'DebuggingSpy-Browser-Tests',
+	#package : 'DebuggingSpy-Browser-Tests'
+}
+
+{ #category : 'helpers' }
+DSRecordBrowserTest >> filesPresenter [
+
+	^ browser presenterAt: #addedFilesPresenter
+]
+
+{ #category : 'helpers' }
+DSRecordBrowserTest >> generateRecordFile: aNumberOfRecords [
+
+	| recordFileRef records |
+	recordFileRef := logger ensureCreateLoggingFileReference.
+	records := OrderedCollection new.
+	1 to: aNumberOfRecords do: [ :i |
+			records add: (DSMouseEnterWindowRecord new
+					 windowId: 'test' , i asString;
+					 dateTime: (DateAndTime fromSeconds: 50 * i)) ].
+
+	records do: [ :record | DSRecordRegistry current addRecord: record ].
+	^ recordFileRef
+]
+
+{ #category : 'helpers' }
+DSRecordBrowserTest >> selectedRecordsPresenter [
+
+	^ browser presenterAt: #selectedRecordsPresenter
+]
+
+{ #category : 'running' }
+DSRecordBrowserTest >> setUp [
+
+	super setUp.
+
+	DSSpy recordingSession: false.
+	DSSpy testingSession: true.
+	logger := DSSpy logger loggingDirectory: self temporaryDirectory.
+	browser := DSRecordBrowser new
+]
+
+{ #category : 'running' }
+DSRecordBrowserTest >> tearDown [
+
+	DSRecordRegistry current reset.
+	DSSpy resetSpy.
+
+	browser recorderWindow ifNotNil: [ browser recorderWindow owner removeMorph: browser recorderWindow ].
+	super tearDown
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testAddFile [
+
+	| fileRef |
+	fileRef := self generateRecordFile: 42.
+
+	browser addFile: fileRef.
+	self assert: browser files size equals: 1.
+	self assert: self filesPresenter items size equals: 1.
+
+	self assert: self filesPresenter selectedItem equals: fileRef
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testAddFileWhenAlreadyInList [
+
+	| fileRef |
+	fileRef := self generateRecordFile: 42.
+
+	browser addFile: fileRef.
+	browser addFile: fileRef.
+	self assert: browser files size equals: 1.
+	self assert: self filesPresenter items size equals: 1.
+	self assert: self filesPresenter selectedItem equals: fileRef
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testBrowserEmpty [
+
+	self assertEmpty: browser files.
+	self assert: self filesPresenter items size equals: 0.
+	self assert: self filesPresenter selectedItem equals: nil.
+	
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testGetColoredRecordsOf [
+
+	| fileRef history coloredRecords |
+	fileRef := self generateRecordFile: 10.
+	history := DSRecordBrowser getHistoryOf: fileRef.
+	coloredRecords := DSRecordBrowser getColoredRecordsOf: history windows.
+	coloredRecords do: [ :c |
+			self
+				assert: c color
+				equals: (DSRecordBrowser getWindowColorFor: (history windows select: [ :i | i events includes: c record ]) first) ]
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testGetHistoryOf [
+	| fileRef |
+	fileRef := self generateRecordFile: 5.
+	self assert: (DSRecordBrowser getHistoryOf: fileRef) records size equals: 5
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testStartRecording [
+
+	self assert: browser recorderWindow isNil.
+	self deny: DSSpy recordingSession.
+
+	browser startRecording.
+	self assert: DSSpy recordingSession.
+	self deny: browser recorderWindow isNil
+]
+
+{ #category : 'helpers' }
+DSRecordBrowserTest >> timelinePresenter [
+
+	^ browser presenterAt: #timeline
+]
+
+{ #category : 'helpers' }
+DSRecordBrowserTest >> toolbarPresenter [
+
+	^ browser presenterAt: #toolbar
+]
diff --git a/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st b/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
new file mode 100644
index 0000000..e24974e
--- /dev/null
+++ b/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
@@ -0,0 +1,25 @@
+Class {
+	#name : 'DSRecorderWindowTest',
+	#superclass : 'TestCase',
+	#instVars : [
+		'recorder'
+	],
+	#category : 'DebuggingSpy-Browser-Tests',
+	#package : 'DebuggingSpy-Browser-Tests'
+}
+
+{ #category : 'running' }
+DSRecorderWindowTest >> setUp [
+	super setUp.
+	
+	recorder := DSRecorderWindow new.
+]
+
+{ #category : 'tests' }
+DSRecorderWindowTest >> testTimer [
+
+	recorder startTimer.
+	(Delay forMilliseconds: 1000) wait.
+	recorder stopTimer.
+	self assert: recorder timeElapsed equals: 1
+]
diff --git a/DebuggingSpy-Browser-Tests/package.st b/DebuggingSpy-Browser-Tests/package.st
new file mode 100644
index 0000000..b20e695
--- /dev/null
+++ b/DebuggingSpy-Browser-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : 'DebuggingSpy-Browser-Tests' }
diff --git a/DebuggingSpy/DSSTONFileLogger.class.st b/DebuggingSpy/DSSTONFileLogger.class.st
index 4b780d7..778d287 100644
--- a/DebuggingSpy/DSSTONFileLogger.class.st
+++ b/DebuggingSpy/DSSTONFileLogger.class.st
@@ -80,6 +80,12 @@ DSSTONFileLogger >> loggingFileName [
 		  loggingFilename := self defaultLoggingFileName ]
 ]
 
+{ #category : 'accessing' }
+DSSTONFileLogger >> loggingFileName: aFileName [
+
+	loggingFilename := aFileName
+]
+
 { #category : 'accessing' }
 DSSTONFileLogger >> loggingFileReference [
 

From 8ad83d9072502e6658323bdf1034c09255b713b5 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Fri, 20 Feb 2026 16:02:12 +0100
Subject: [PATCH 24/36] refactoring: DSRecordBrowserPresenter ->
 DSRecordBrowser

---
 ...nter.class.st => DSRecordBrowser.class.st} | 145 ++++++++++--------
 .../DSRecorderWindow.class.st                 |  47 ++----
 2 files changed, 89 insertions(+), 103 deletions(-)
 rename DebuggingSpy-Browser/{DSRecordBrowserPresenter.class.st => DSRecordBrowser.class.st} (79%)

diff --git a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
similarity index 79%
rename from DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
rename to DebuggingSpy-Browser/DSRecordBrowser.class.st
index 1d594f7..375f187 100644
--- a/DebuggingSpy-Browser/DSRecordBrowserPresenter.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -6,7 +6,7 @@ Debugging Spy main interface thats includes :
 - an interface that shows the content of a selected file
 "
 Class {
-	#name : 'DSRecordBrowserPresenter',
+	#name : 'DSRecordBrowser',
 	#superclass : 'SpPresenter',
 	#instVars : [
 		'files',
@@ -26,7 +26,37 @@ Class {
 }
 
 { #category : 'color' }
-DSRecordBrowserPresenter class >> getWindowColorFor: aWindowRecord [
+DSRecordBrowser class >> getColoredRecordsOf: aWindowRecordCollection [
+
+	| coloredRecords |
+	coloredRecords := OrderedCollection new.
+	aWindowRecordCollection do: [ :windowRecord |
+			coloredRecords addAll:
+				(windowRecord events collect: [ :record | DSColoredRecord for: record withColor: (self getWindowColorFor: windowRecord) ]) ].
+	coloredRecords sort: [ :i :j | i record dateTime < j record dateTime ].
+	^ coloredRecords
+]
+
+{ #category : 'operations' }
+DSRecordBrowser class >> getHistoryOf: aFileReference [
+
+	^ DSRecordHistory on: (DSSpy materialize: aFileReference)
+]
+
+{ #category : 'operations' }
+DSRecordBrowser class >> getTimelinePointsFrom: aHistory [
+
+	^ aHistory windows collectWithIndex: [ :w :index |
+			  RSTimeLinePlot new
+				  entries: {
+						  w events first dateTime asNanoSeconds.
+						  w events last dateTime asNanoSeconds }
+				  at: index;
+				  color: (self getWindowColorFor: w) ]
+]
+
+{ #category : 'color' }
+DSRecordBrowser class >> getWindowColorFor: aWindowRecord [
 
 	aWindowRecord isBrowser ifTrue: [ ^ Color fromHexString: '#2A2AB7' ].
 	aWindowRecord isInspector ifTrue: [ ^ Color fromHexString: '#FFC300' ].
@@ -43,7 +73,7 @@ DSRecordBrowserPresenter class >> getWindowColorFor: aWindowRecord [
 ]
 
 { #category : 'world menu' }
-DSRecordBrowserPresenter class >> menuCommandOn: aBuilder [
+DSRecordBrowser class >> menuCommandOn: aBuilder [
 	"Adds the DSSpy button on topside bar, the order is 100 just to make sure the DSSpy button is at the end"
 
 	<worldMenu>
@@ -54,26 +84,26 @@ DSRecordBrowserPresenter class >> menuCommandOn: aBuilder [
 ]
 
 { #category : 'accessing' }
-DSRecordBrowserPresenter class >> presenterWindow [
+DSRecordBrowser class >> presenterWindow [
 
 	^ presenterWindow
 ]
 
 { #category : 'accessing' }
-DSRecordBrowserPresenter class >> presenterWindow: aWindow [
+DSRecordBrowser class >> presenterWindow: aWindow [
 
 	presenterWindow := aWindow
 ]
 
 { #category : 'initialization' }
-DSRecordBrowserPresenter class >> resetBrowser [
+DSRecordBrowser class >> resetBrowser [
 
 	<script>
 	presenterWindow := nil
 ]
 
 { #category : 'open/close' }
-DSRecordBrowserPresenter class >> toggleBrowser [
+DSRecordBrowser class >> toggleBrowser [
 
 	| presenter |
 	presenterWindow ifNotNil: [
@@ -87,7 +117,8 @@ DSRecordBrowserPresenter class >> toggleBrowser [
 ]
 
 { #category : 'adding' }
-DSRecordBrowserPresenter >> addFile: aFileReference [
+DSRecordBrowser >> addFile: aFileReference [
+	"Adds a file in the presenter and set is as selected, which updates the records displayed."
 
 	(files includes: aFileReference)
 		ifTrue: [ ^ self inform: 'File already added in the browser !' ]
@@ -98,7 +129,7 @@ DSRecordBrowserPresenter >> addFile: aFileReference [
 ]
 
 { #category : 'layout' }
-DSRecordBrowserPresenter >> addRecordButton [
+DSRecordBrowser >> addRecordButton [
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Add';
@@ -109,22 +140,22 @@ DSRecordBrowserPresenter >> addRecordButton [
 ]
 
 { #category : 'initialization' }
-DSRecordBrowserPresenter >> connectPresenters [
+DSRecordBrowser >> connectPresenters [
+	"Updates the records and the timeline whenever the selected file is changed."
 
 	addedFilesPresenter whenSelectionChangedDo: [ :presenter |
 			presenter selectedItem ifNotNil: [
 					self updateSelectedRecords: presenter.
 					self updateTimelineChart ] ].
 
-
 	recordsFilter whenChangedDo: [
 			addedFilesPresenter selectedItem ifNotNil: [
 					self updateSelectedRecords: addedFilesPresenter.
-					self updateTimelineChart ] ].
+					self updateTimelineChart ] ]
 ]
 
 { #category : 'layout' }
-DSRecordBrowserPresenter >> defaultLayout [
+DSRecordBrowser >> defaultLayout [
 
 	^ SpBoxLayout newVertical
 		  add: toolbar expand: false;
@@ -141,13 +172,13 @@ DSRecordBrowserPresenter >> defaultLayout [
 ]
 
 { #category : 'accessing' }
-DSRecordBrowserPresenter >> files [
+DSRecordBrowser >> files [
 
 	^ files ifNil: [ files := OrderedCollection new ]
 ]
 
 { #category : 'layout' }
-DSRecordBrowserPresenter >> filterRecordsButton [
+DSRecordBrowser >> filterRecordsButton [
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Filter';
@@ -157,38 +188,8 @@ DSRecordBrowserPresenter >> filterRecordsButton [
 		  yourself
 ]
 
-{ #category : 'operations' }
-DSRecordBrowserPresenter >> getColoredRecordsOf: aWindowRecordCollection [
-
-	| coloredRecords |
-	coloredRecords := OrderedCollection new.
-	aWindowRecordCollection do: [ :windowRecord |
-			coloredRecords addAll:
-				(windowRecord events collect: [ :record | DSColoredRecord for: record withColor: (self class getWindowColorFor: windowRecord) ]) ].
-	coloredRecords sort: [ :i :j | i record dateTime < j record dateTime ].
-	^ coloredRecords
-]
-
-{ #category : 'operations' }
-DSRecordBrowserPresenter >> getHistoryOf: aFileReference [
-
-	^ DSRecordHistory on: (DSSpy materialize: aFileReference)
-]
-
-{ #category : 'operations' }
-DSRecordBrowserPresenter >> getTimelinePointsFrom: aHistory [
-
-	^ aHistory windows collectWithIndex: [ :w :index |
-			  RSTimeLinePlot new
-				  entries: {
-						  w events first dateTime asNanoSeconds.
-						  w events last dateTime asNanoSeconds }
-				  at: index;
-				  color: (self class getWindowColorFor: w) ]
-]
-
 { #category : 'initialization' }
-DSRecordBrowserPresenter >> initializePresenters [
+DSRecordBrowser >> initializePresenters [
 
 	toolbar := self newToolbar
 		           addItem: self addRecordButton;
@@ -208,7 +209,7 @@ DSRecordBrowserPresenter >> initializePresenters [
 ]
 
 { #category : 'operations' }
-DSRecordBrowserPresenter >> listAddedFilesActions [
+DSRecordBrowser >> listAddedFilesActions [
 
 	^ SpActionGroup new
 		  addActionWith: [ :anItem |
@@ -222,12 +223,12 @@ DSRecordBrowserPresenter >> listAddedFilesActions [
 					  name: 'Inspect history';
 					  description: 'Inspect the record history';
 					  shortcutKey: $h meta;
-					  action: [ (self getHistoryOf: addedFilesPresenter selectedItem) inspect ] ];
+					  action: [ (self class getHistoryOf: addedFilesPresenter selectedItem) inspect ] ];
 		  yourself
 ]
 
 { #category : 'operations' }
-DSRecordBrowserPresenter >> listRecordActions [
+DSRecordBrowser >> listRecordActions [
 
 	^ SpActionGroup new
 		  addActionWith: [ :anItem |
@@ -240,24 +241,31 @@ DSRecordBrowserPresenter >> listRecordActions [
 ]
 
 { #category : 'operations' }
-DSRecordBrowserPresenter >> openAddFileDialog [
+DSRecordBrowser >> openAddFileDialog [
+	"Opens a dialog where the user can select a file to be addded into the presenter."
 
 	| newFiles |
 	newFiles := StOpenFilePresenter new
-		             beMultipleSelection;
-		             defaultFolder: DSSpy logger loggingDirectory;
-		             openModal.
+		            beMultipleSelection;
+		            defaultFolder: DSSpy logger loggingDirectory;
+		            openModal.
 	newFiles ifNotNil: [ newFiles do: [ :file | self addFile: file asFileReference ] ]
 ]
 
 { #category : 'accessing' }
-DSRecordBrowserPresenter >> recordsFilter [
+DSRecordBrowser >> recorderWindow [
+
+	^ recorderWindow
+]
+
+{ #category : 'accessing' }
+DSRecordBrowser >> recordsFilter [
 
 	^ recordsFilter ifNil: [ recordsFilter := SpChooserPresenter new sourceItems: DSAbstractEventRecord getRecordClasses ]
 ]
 
 { #category : 'layout' }
-DSRecordBrowserPresenter >> recordsTable [
+DSRecordBrowser >> recordsTable [
 
 	^ self newTreeTable
 		  addColumn: (SpStringTableColumn new
@@ -284,13 +292,13 @@ DSRecordBrowserPresenter >> recordsTable [
 ]
 
 { #category : 'initialization' }
-DSRecordBrowserPresenter >> resetBrowser [
+DSRecordBrowser >> resetBrowser [
 
 	<script: 'self resetBrowser'>
 ]
 
 { #category : 'layout' }
-DSRecordBrowserPresenter >> startRecordButton [
+DSRecordBrowser >> startRecordButton [
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Start';
@@ -302,7 +310,7 @@ DSRecordBrowserPresenter >> startRecordButton [
 ]
 
 { #category : 'recording' }
-DSRecordBrowserPresenter >> startRecording [
+DSRecordBrowser >> startRecording [
 	"Starts recording events and instianciates a new RecorderWindow that displays a timer and shows that Debugging Spy is recordering."
 
 	DSSpyInstrumenter instrumentSystem.
@@ -315,7 +323,7 @@ DSRecordBrowserPresenter >> startRecording [
 ]
 
 { #category : 'layout' }
-DSRecordBrowserPresenter >> stopRecordButton [
+DSRecordBrowser >> stopRecordButton [
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Stop';
@@ -327,7 +335,7 @@ DSRecordBrowserPresenter >> stopRecordButton [
 ]
 
 { #category : 'recording' }
-DSRecordBrowserPresenter >> stopRecording [
+DSRecordBrowser >> stopRecording [
 	"Stops the recording session and closes the RecorderWindow."
 
 	DSSpyInstrumenter stopInstrumentation.
@@ -338,15 +346,15 @@ DSRecordBrowserPresenter >> stopRecording [
 ]
 
 { #category : 'layout' }
-DSRecordBrowserPresenter >> timelineChart [
+DSRecordBrowser >> timelineChart [
 
 	| history names chart data |
 	addedFilesPresenter selectedItem ifNil: [ ^ nil ].
 
-	history := self getHistoryOf: addedFilesPresenter selectedItem.
+	history := self class getHistoryOf: addedFilesPresenter selectedItem.
 	names := history windows collect: [ :i | i getWindowType ].
 
-	data := self getTimelinePointsFrom: history.
+	data := self class getTimelinePointsFrom: history.
 	data size < 2 ifTrue: [^ nil].
 	
 	chart := RSCompositeChart new.
@@ -365,10 +373,11 @@ DSRecordBrowserPresenter >> timelineChart [
 ]
 
 { #category : 'operations' }
-DSRecordBrowserPresenter >> updateSelectedRecords: aPresenter [
+DSRecordBrowser >> updateSelectedRecords: aPresenter [
+	"Updates the selected records and processes it to be used with their respective colors."
 
 	| records |
-	records := self getColoredRecordsOf: (self getHistoryOf: aPresenter selectedItem) windows.
+	records := self class getColoredRecordsOf: (self class getHistoryOf: aPresenter selectedItem) windows.
 	records := records reject: [ :coloredRecord | self recordsFilter chosenItems includes: coloredRecord record class ].
 	selectedRecords := records.
 	selectedRecordsPresenter
@@ -377,7 +386,7 @@ DSRecordBrowserPresenter >> updateSelectedRecords: aPresenter [
 ]
 
 { #category : 'operations' }
-DSRecordBrowserPresenter >> updateTimelineChart [
+DSRecordBrowser >> updateTimelineChart [
 
 	| chart |
 	chart := self timelineChart.
@@ -386,13 +395,13 @@ DSRecordBrowserPresenter >> updateTimelineChart [
 ]
 
 { #category : 'accessing' }
-DSRecordBrowserPresenter >> windowIcon [
+DSRecordBrowser >> windowIcon [
 
 	^ self iconNamed: #smallObjects 
 ]
 
 { #category : 'accessing' }
-DSRecordBrowserPresenter >> windowTitle [
+DSRecordBrowser >> windowTitle [
 
 	^ 'Debugging record browser'
 ]
diff --git a/DebuggingSpy-Browser/DSRecorderWindow.class.st b/DebuggingSpy-Browser/DSRecorderWindow.class.st
index c1cf509..fa72b85 100644
--- a/DebuggingSpy-Browser/DSRecorderWindow.class.st
+++ b/DebuggingSpy-Browser/DSRecorderWindow.class.st
@@ -9,7 +9,8 @@ Class {
 		'running',
 		'startTime',
 		'timer',
-		'timeNowMorph'
+		'timeNowMorph',
+		'timeElapsed'
 	],
 	#category : 'DebuggingSpy-Browser',
 	#package : 'DebuggingSpy-Browser'
@@ -34,7 +35,7 @@ DSRecorderWindow >> buildUI [
 
 	stopButton := PluggableButtonMorph new
 		              label: (IconicListItemMorph new icon: (self iconNamed: #stop));
-		              model: DSRecordBrowserPresenter presenterWindow presenter;
+		              model: DSRecordBrowser presenterWindow presenter;
 		              actionSelector: #stopRecording;
 		              position: 125 @ 4;
 		              yourself.
@@ -89,37 +90,6 @@ DSRecorderWindow >> morphicLayerNumber [
 	^ 12
 ]
 
-{ #category : 'initialization' }
-DSRecorderWindow >> obuildUI [
-
-	| recordingIcon stopButton |
-	recordingIcon := ImageMorph new
-		                 image: (self iconNamed: #glamorousRedCircle);
-		                 position: 0 @ 7;
-		                 yourself.
-
-	timerMorph := StringMorph new
-		              contents: '00:00:000';
-		              position: 15 @ 6.
-
-	timeNowMorph := StringMorph new
-		                contents: Time now print24;
-		                position: 75 @ 6.
-
-	stopButton := PluggableButtonMorph new
-		              icon: (self iconNamed: #stop);
-		              position: 128 @ 6;
-		              beIconTop;
-		              "target: self;
-		              actionSelector: #stopRecording;"yourself.
-
-	self
-		addMorph: recordingIcon;
-		addMorph: timerMorph;
-		addMorph: timeNowMorph;
-		addMorph: stopButton
-]
-
 { #category : 'opening' }
 DSRecorderWindow >> openInWorld [
 
@@ -138,11 +108,12 @@ DSRecorderWindow >> startTimer [
 
 	running ifTrue: [ ^ self ].
 
-	startTime := Time millisecondClockValue.
+	startTime := Time current asSeconds.
 	running := true.
 	timer := [
 		         [ running ] whileTrue: [
-				         timerMorph contents: (Time millisecondClockValue - startTime) seconds asString.
+				         timeElapsed := Time current asSeconds - startTime.
+				         timerMorph contents: (Time fromSeconds: timeElapsed) print24.
 				         timeNowMorph contents: Time now print24.
 				         (Delay forMilliseconds: 50) wait ] ] fork
 ]
@@ -152,3 +123,9 @@ DSRecorderWindow >> stopTimer [
 
 	running := false
 ]
+
+{ #category : 'accessing' }
+DSRecorderWindow >> timeElapsed [
+
+	^ timeElapsed
+]

From a7d8bbc2235ade0fa1535d9f6716f1876198bccb Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Fri, 20 Feb 2026 16:11:19 +0100
Subject: [PATCH 25/36] fix: adding browser tests to baseline

---
 BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st b/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
index 597de7d..3f90c67 100644
--- a/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
+++ b/BaselineOfDebuggingSpy/BaselineOfDebuggingSpy.class.st
@@ -15,7 +15,8 @@ BaselineOfDebuggingSpy >> baseline: spec [
 			spec postLoadDoIt: #postloadAction.
 			spec package: 'DebuggingSpy'.
 			spec package: 'DebuggingSpy-Tests'.
-			spec package: 'DebuggingSpy-Browser' ]
+			spec package: 'DebuggingSpy-Browser'.
+			spec package: 'DebuggingSpy-Browser-Tests' ]
 ]
 
 { #category : 'baselines' }

From 9838a45b5b359f0da380dcc0c01f5ab84dae02cb Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Mon, 23 Feb 2026 14:01:21 +0100
Subject: [PATCH 26/36] fix: browser testing

---
 .../DSRecordBrowserTest.class.st                      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index 025a04a..fa117c6 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -20,6 +20,9 @@ DSRecordBrowserTest >> generateRecordFile: aNumberOfRecords [
 
 	| recordFileRef records |
 	recordFileRef := logger ensureCreateLoggingFileReference.
+	Transcript
+		show: recordFileRef;
+		cr.
 	records := OrderedCollection new.
 	1 to: aNumberOfRecords do: [ :i |
 			records add: (DSMouseEnterWindowRecord new
@@ -41,8 +44,8 @@ DSRecordBrowserTest >> setUp [
 
 	super setUp.
 
-	DSSpy recordingSession: false.
 	DSSpy testingSession: true.
+
 	logger := DSSpy logger loggingDirectory: self temporaryDirectory.
 	browser := DSRecordBrowser new
 ]
@@ -51,9 +54,7 @@ DSRecordBrowserTest >> setUp [
 DSRecordBrowserTest >> tearDown [
 
 	DSRecordRegistry current reset.
-	DSSpy resetSpy.
 
-	browser recorderWindow ifNotNil: [ browser recorderWindow owner removeMorph: browser recorderWindow ].
 	super tearDown
 ]
 
@@ -120,7 +121,9 @@ DSRecordBrowserTest >> testStartRecording [
 
 	browser startRecording.
 	self assert: DSSpy recordingSession.
-	self deny: browser recorderWindow isNil
+	self deny: browser recorderWindow isNil.
+
+	browser stopRecording
 ]
 
 { #category : 'helpers' }

From bece7be64fc62e50744fd5ba5e166ea676ae12a6 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Mon, 23 Feb 2026 14:30:11 +0100
Subject: [PATCH 27/36] refacto: browser lazy init and test fixes

---
 .../DSRecordBrowserTest.class.st              |  4 +-
 DebuggingSpy-Browser/DSRecordBrowser.class.st | 40 ++++++++-----------
 .../DSRecorderWindow.class.st                 |  2 +-
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index fa117c6..5b53066 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -54,7 +54,7 @@ DSRecordBrowserTest >> setUp [
 DSRecordBrowserTest >> tearDown [
 
 	DSRecordRegistry current reset.
-
+	browser stopRecording.
 	super tearDown
 ]
 
@@ -122,8 +122,6 @@ DSRecordBrowserTest >> testStartRecording [
 	browser startRecording.
 	self assert: DSSpy recordingSession.
 	self deny: browser recorderWindow isNil.
-
-	browser stopRecording
 ]
 
 { #category : 'helpers' }
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index 375f187..8cc4580 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -19,12 +19,18 @@ Class {
 		'recordsFilter'
 	],
 	#classInstVars : [
-		'presenterWindow'
+		'presenter'
 	],
 	#category : 'DebuggingSpy-Browser',
 	#package : 'DebuggingSpy-Browser'
 }
 
+{ #category : 'accessing' }
+DSRecordBrowser class >> browser [
+
+	^ presenter ifNil: [ presenter := self new ]
+]
+
 { #category : 'color' }
 DSRecordBrowser class >> getColoredRecordsOf: aWindowRecordCollection [
 
@@ -83,37 +89,22 @@ DSRecordBrowser class >> menuCommandOn: aBuilder [
 		action: [ self toggleBrowser ]
 ]
 
-{ #category : 'accessing' }
-DSRecordBrowser class >> presenterWindow [
-
-	^ presenterWindow
-]
-
-{ #category : 'accessing' }
-DSRecordBrowser class >> presenterWindow: aWindow [
-
-	presenterWindow := aWindow
-]
-
 { #category : 'initialization' }
 DSRecordBrowser class >> resetBrowser [
 
 	<script>
-	presenterWindow := nil
+	presenter := nil
 ]
 
 { #category : 'open/close' }
 DSRecordBrowser class >> toggleBrowser [
 
-	| presenter |
-	presenterWindow ifNotNil: [
-			^ presenterWindow isOpen
-				  ifTrue: [ presenterWindow close ]
-				  ifFalse: [ presenterWindow open ] ].
+	presenter ifNotNil: [
+			^ presenter window isOpen
+				  ifTrue: [ presenter window close ]
+				  ifFalse: [ presenter window open ] ].
 
-	presenter := self new.
-	presenter open.
-	presenterWindow := presenter window
+	self browser open
 ]
 
 { #category : 'adding' }
@@ -341,8 +332,9 @@ DSRecordBrowser >> stopRecording [
 	DSSpyInstrumenter stopInstrumentation.
 	(toolbar leftItems at: 2) enabled: true. "Enable the start recording button."
 	(toolbar leftItems at: 3) enabled: false. "Disable the stop recording button."
-	recorderWindow stopTimer.
-	self currentWorld removeMorph: recorderWindow
+	recorderWindow ifNotNil: [
+			recorderWindow stopTimer.
+			self currentWorld removeMorph: recorderWindow ]
 ]
 
 { #category : 'layout' }
diff --git a/DebuggingSpy-Browser/DSRecorderWindow.class.st b/DebuggingSpy-Browser/DSRecorderWindow.class.st
index fa72b85..f9c054f 100644
--- a/DebuggingSpy-Browser/DSRecorderWindow.class.st
+++ b/DebuggingSpy-Browser/DSRecorderWindow.class.st
@@ -35,7 +35,7 @@ DSRecorderWindow >> buildUI [
 
 	stopButton := PluggableButtonMorph new
 		              label: (IconicListItemMorph new icon: (self iconNamed: #stop));
-		              model: DSRecordBrowser presenterWindow presenter;
+		              model: DSRecordBrowser browser;
 		              actionSelector: #stopRecording;
 		              position: 125 @ 4;
 		              yourself.

From 23ded928b2702208bef155b68fb164707ac53ae4 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Mon, 23 Feb 2026 15:25:05 +0100
Subject: [PATCH 28/36] fix: auto serialize and instrumentation after opening
 the recorder

---
 DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st | 9 +++++----
 DebuggingSpy-Browser/DSRecordBrowser.class.st           | 4 ++--
 DebuggingSpy/DSSpyInstrumenter.class.st                 | 3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index 5b53066..940f3cd 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -19,10 +19,8 @@ DSRecordBrowserTest >> filesPresenter [
 DSRecordBrowserTest >> generateRecordFile: aNumberOfRecords [
 
 	| recordFileRef records |
+	browser startRecording.
 	recordFileRef := logger ensureCreateLoggingFileReference.
-	Transcript
-		show: recordFileRef;
-		cr.
 	records := OrderedCollection new.
 	1 to: aNumberOfRecords do: [ :i |
 			records add: (DSMouseEnterWindowRecord new
@@ -108,6 +106,7 @@ DSRecordBrowserTest >> testGetColoredRecordsOf [
 
 { #category : 'tests' }
 DSRecordBrowserTest >> testGetHistoryOf [
+
 	| fileRef |
 	fileRef := self generateRecordFile: 5.
 	self assert: (DSRecordBrowser getHistoryOf: fileRef) records size equals: 5
@@ -117,11 +116,13 @@ DSRecordBrowserTest >> testGetHistoryOf [
 DSRecordBrowserTest >> testStartRecording [
 
 	self assert: browser recorderWindow isNil.
+	self deny: DSRecordRegistry autoSerialize.
 	self deny: DSSpy recordingSession.
 
 	browser startRecording.
 	self assert: DSSpy recordingSession.
-	self deny: browser recorderWindow isNil.
+	self assert: DSRecordRegistry autoSerialize.
+	self deny: browser recorderWindow isNil
 ]
 
 { #category : 'helpers' }
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index 8cc4580..35aaebd 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -304,13 +304,13 @@ DSRecordBrowser >> startRecordButton [
 DSRecordBrowser >> startRecording [
 	"Starts recording events and instianciates a new RecorderWindow that displays a timer and shows that Debugging Spy is recordering."
 
-	DSSpyInstrumenter instrumentSystem.
 	(toolbar leftItems at: 2) enabled: false. "Disable the start recording button."
 	(toolbar leftItems at: 3) enabled: true. "Enable the stop recording button."
 	recorderWindow := DSRecorderWindow new.
 	recorderWindow
 		openInWorld;
-		startTimer
+		startTimer.
+	DSSpyInstrumenter instrumentSystem.
 ]
 
 { #category : 'layout' }
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 14407d3..f2879db 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -23,6 +23,9 @@ DSSpyInstrumenter class >> stopInstrumentation [
 
 	"Stop the recording session"
 	DSSpy recordingSession: false.
+	
+	"Stop the auto serialization"
+	DSRecordRegistry autoSerialize: false.
 
 	"Stop listening to events for recording"
 	SystemAnnouncer uniqueInstance unsubscribe: DSSpy.

From 11e058a5956faa2af8220a4519e3a849803e8f6f Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Tue, 24 Feb 2026 10:30:41 +0100
Subject: [PATCH 29/36] fix: browser tests and git rebase

---
 .../DSRecordBrowserTest.class.st              | 42 ++++++++--
 DebuggingSpy-Browser/DSRecordBrowser.class.st | 84 +++++++++++--------
 .../DSRecorderWindow.class.st                 |  2 +-
 DebuggingSpy/DSSTONFileLogger.class.st        |  6 ++
 DebuggingSpy/DSSpyInstrumenter.class.st       |  3 +
 5 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index fa117c6..1669749 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -19,11 +19,10 @@ DSRecordBrowserTest >> filesPresenter [
 DSRecordBrowserTest >> generateRecordFile: aNumberOfRecords [
 
 	| recordFileRef records |
-	recordFileRef := logger ensureCreateLoggingFileReference.
-	Transcript
-		show: recordFileRef;
-		cr.
+	browser startRecording.
+	recordFileRef := self updateLoggerFileName.
 	records := OrderedCollection new.
+
 	1 to: aNumberOfRecords do: [ :i |
 			records add: (DSMouseEnterWindowRecord new
 					 windowId: 'test' , i asString;
@@ -47,6 +46,8 @@ DSRecordBrowserTest >> setUp [
 	DSSpy testingSession: true.
 
 	logger := DSSpy logger loggingDirectory: self temporaryDirectory.
+	self updateLoggerFileName.
+
 	browser := DSRecordBrowser new
 ]
 
@@ -54,6 +55,7 @@ DSRecordBrowserTest >> setUp [
 DSRecordBrowserTest >> tearDown [
 
 	DSRecordRegistry current reset.
+	browser stopRecording.
 
 	super tearDown
 ]
@@ -113,17 +115,33 @@ DSRecordBrowserTest >> testGetHistoryOf [
 	self assert: (DSRecordBrowser getHistoryOf: fileRef) records size equals: 5
 ]
 
+{ #category : 'tests' }
+DSRecordBrowserTest >> testRemoveFile [
+
+	| fileRef1 fileRef2 |
+	fileRef1 := self generateRecordFile: 42.
+	fileRef2 := self generateRecordFile: 42.
+
+	browser addFile: fileRef1.
+	browser addFile: fileRef2.
+	browser removeFile: fileRef1.
+
+	self assert: browser files size equals: 1.
+	self assert: self filesPresenter items size equals: 1.
+	self assert: self filesPresenter selectedItem equals: fileRef2
+]
+
 { #category : 'tests' }
 DSRecordBrowserTest >> testStartRecording [
 
 	self assert: browser recorderWindow isNil.
+	self deny: DSRecordRegistry autoSerialize.
 	self deny: DSSpy recordingSession.
 
 	browser startRecording.
 	self assert: DSSpy recordingSession.
+	self assert: DSRecordRegistry autoSerialize.
 	self deny: browser recorderWindow isNil.
-
-	browser stopRecording
 ]
 
 { #category : 'helpers' }
@@ -137,3 +155,15 @@ DSRecordBrowserTest >> toolbarPresenter [
 
 	^ browser presenterAt: #toolbar
 ]
+
+{ #category : 'helpers' }
+DSRecordBrowserTest >> updateLoggerFileName [
+	"Changes the logging file name, needs to be called everytime a new file is created for the logger to be updated for future logs.
+Using a UUID ensures that multiple files created at the same date and time dont have the same file name."
+
+	| fr |
+	logger loggingFileName: UUID new asString.
+	fr := logger ensureCreateLoggingFileReference.
+	logger loggingFileReference: fr.
+	^ fr
+]
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index 375f187..ada4041 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -19,12 +19,18 @@ Class {
 		'recordsFilter'
 	],
 	#classInstVars : [
-		'presenterWindow'
+		'presenter'
 	],
 	#category : 'DebuggingSpy-Browser',
 	#package : 'DebuggingSpy-Browser'
 }
 
+{ #category : 'accessing' }
+DSRecordBrowser class >> browser [
+
+	^ presenter ifNil: [ presenter := self new ]
+]
+
 { #category : 'color' }
 DSRecordBrowser class >> getColoredRecordsOf: aWindowRecordCollection [
 
@@ -83,40 +89,24 @@ DSRecordBrowser class >> menuCommandOn: aBuilder [
 		action: [ self toggleBrowser ]
 ]
 
-{ #category : 'accessing' }
-DSRecordBrowser class >> presenterWindow [
-
-	^ presenterWindow
-]
-
-{ #category : 'accessing' }
-DSRecordBrowser class >> presenterWindow: aWindow [
-
-	presenterWindow := aWindow
-]
-
 { #category : 'initialization' }
 DSRecordBrowser class >> resetBrowser [
 
 	<script>
-	presenterWindow := nil
+	presenter := nil
 ]
 
 { #category : 'open/close' }
 DSRecordBrowser class >> toggleBrowser [
 
-	| presenter |
-	presenterWindow ifNotNil: [
-			^ presenterWindow isOpen
-				  ifTrue: [ presenterWindow close ]
-				  ifFalse: [ presenterWindow open ] ].
-
-	presenter := self new.
-	presenter open.
-	presenterWindow := presenter window
+	presenter ifNotNil: [
+			^ presenter window isOpen
+				  ifTrue: [ presenter window close ]
+				  ifFalse: [ presenter window open ] ].
+	self browser open
 ]
 
-{ #category : 'adding' }
+{ #category : 'files' }
 DSRecordBrowser >> addFile: aFileReference [
 	"Adds a file in the presenter and set is as selected, which updates the records displayed."
 
@@ -144,9 +134,8 @@ DSRecordBrowser >> connectPresenters [
 	"Updates the records and the timeline whenever the selected file is changed."
 
 	addedFilesPresenter whenSelectionChangedDo: [ :presenter |
-			presenter selectedItem ifNotNil: [
-					self updateSelectedRecords: presenter.
-					self updateTimelineChart ] ].
+			self updateSelectedRecords: presenter.
+			self updateTimelineChart ].
 
 	recordsFilter whenChangedDo: [
 			addedFilesPresenter selectedItem ifNotNil: [
@@ -215,15 +204,24 @@ DSRecordBrowser >> listAddedFilesActions [
 		  addActionWith: [ :anItem |
 				  anItem
 					  name: 'Inspect';
+					  iconName: #inspect;
 					  description: 'Inspect the raw records';
 					  shortcutKey: $i meta;
 					  action: [ (DSSpy materialize: addedFilesPresenter selectedItem) inspect ] ];
 		  addActionWith: [ :anItem |
 				  anItem
 					  name: 'Inspect history';
+					  iconName: #history;
 					  description: 'Inspect the record history';
 					  shortcutKey: $h meta;
 					  action: [ (self class getHistoryOf: addedFilesPresenter selectedItem) inspect ] ];
+		  addActionWith: [ :anItem |
+				  anItem
+					  name: 'Remove';
+					  iconName: #remove;
+					  description: 'Remove the record from list';
+					  shortcutKey: $x meta;
+					  action: [ self removeFile: addedFilesPresenter selectedItem ] ];
 		  yourself
 ]
 
@@ -234,6 +232,7 @@ DSRecordBrowser >> listRecordActions [
 		  addActionWith: [ :anItem |
 				  anItem
 					  name: 'Inspect';
+					  iconName: #inspect;
 					  description: 'Inspect the raw records';
 					  shortcutKey: $i meta;
 					  action: [ selectedRecordsPresenter selectedItem record inspect ] ];
@@ -291,6 +290,16 @@ DSRecordBrowser >> recordsTable [
 		  yourself
 ]
 
+{ #category : 'files' }
+DSRecordBrowser >> removeFile: aFileReference [
+
+	files := files reject: [ :fileReference | fileReference = aFileReference ].
+	addedFilesPresenter items: self files.
+	addedFilesPresenter selectItem: (files isEmpty
+			 ifTrue: [ nil ]
+			 ifFalse: [ files last ])
+]
+
 { #category : 'initialization' }
 DSRecordBrowser >> resetBrowser [
 
@@ -313,13 +322,13 @@ DSRecordBrowser >> startRecordButton [
 DSRecordBrowser >> startRecording [
 	"Starts recording events and instianciates a new RecorderWindow that displays a timer and shows that Debugging Spy is recordering."
 
-	DSSpyInstrumenter instrumentSystem.
 	(toolbar leftItems at: 2) enabled: false. "Disable the start recording button."
 	(toolbar leftItems at: 3) enabled: true. "Enable the stop recording button."
 	recorderWindow := DSRecorderWindow new.
 	recorderWindow
 		openInWorld;
-		startTimer
+		startTimer.
+	DSSpyInstrumenter instrumentSystem
 ]
 
 { #category : 'layout' }
@@ -341,8 +350,9 @@ DSRecordBrowser >> stopRecording [
 	DSSpyInstrumenter stopInstrumentation.
 	(toolbar leftItems at: 2) enabled: true. "Enable the start recording button."
 	(toolbar leftItems at: 3) enabled: false. "Disable the stop recording button."
-	recorderWindow stopTimer.
-	self currentWorld removeMorph: recorderWindow
+	recorderWindow ifNotNil: [
+			recorderWindow stopTimer.
+			self currentWorld removeMorph: recorderWindow ]
 ]
 
 { #category : 'layout' }
@@ -355,8 +365,8 @@ DSRecordBrowser >> timelineChart [
 	names := history windows collect: [ :i | i getWindowType ].
 
 	data := self class getTimelinePointsFrom: history.
-	data size < 2 ifTrue: [^ nil].
-	
+	data size < 2 ifTrue: [ ^ nil ].
+
 	chart := RSCompositeChart new.
 	chart addAll: data.
 
@@ -377,8 +387,10 @@ DSRecordBrowser >> updateSelectedRecords: aPresenter [
 	"Updates the selected records and processes it to be used with their respective colors."
 
 	| records |
-	records := self class getColoredRecordsOf: (self class getHistoryOf: aPresenter selectedItem) windows.
-	records := records reject: [ :coloredRecord | self recordsFilter chosenItems includes: coloredRecord record class ].
+	records := OrderedCollection new.
+	aPresenter selectedItem ifNotNil: [
+			records := self class getColoredRecordsOf: (self class getHistoryOf: aPresenter selectedItem) windows.
+			records := records reject: [ :coloredRecord | self recordsFilter chosenItems includes: coloredRecord record class ] ].
 	selectedRecords := records.
 	selectedRecordsPresenter
 		roots: selectedRecords;
@@ -390,7 +402,7 @@ DSRecordBrowser >> updateTimelineChart [
 
 	| chart |
 	chart := self timelineChart.
-	chart ifNotNil: [ timeline script: [ :canvas | chart renderIn: canvas ] ].
+	chart ifNil: [ timeline script: [ :canvas |  ] ] ifNotNil: [ timeline script: [ :canvas | chart renderIn: canvas ] ].
 	timeline refresh
 ]
 
diff --git a/DebuggingSpy-Browser/DSRecorderWindow.class.st b/DebuggingSpy-Browser/DSRecorderWindow.class.st
index fa72b85..f9c054f 100644
--- a/DebuggingSpy-Browser/DSRecorderWindow.class.st
+++ b/DebuggingSpy-Browser/DSRecorderWindow.class.st
@@ -35,7 +35,7 @@ DSRecorderWindow >> buildUI [
 
 	stopButton := PluggableButtonMorph new
 		              label: (IconicListItemMorph new icon: (self iconNamed: #stop));
-		              model: DSRecordBrowser presenterWindow presenter;
+		              model: DSRecordBrowser browser;
 		              actionSelector: #stopRecording;
 		              position: 125 @ 4;
 		              yourself.
diff --git a/DebuggingSpy/DSSTONFileLogger.class.st b/DebuggingSpy/DSSTONFileLogger.class.st
index 778d287..c43d04a 100644
--- a/DebuggingSpy/DSSTONFileLogger.class.st
+++ b/DebuggingSpy/DSSTONFileLogger.class.st
@@ -93,6 +93,12 @@ DSSTONFileLogger >> loggingFileReference [
 		  loggingFileReference := self ensureCreateLoggingFileReference ]
 ]
 
+{ #category : 'accessing' }
+DSSTONFileLogger >> loggingFileReference: aFileReference [
+
+	^ loggingFileReference := aFileReference
+]
+
 { #category : 'initialization' }
 DSSTONFileLogger >> reset [
 
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 14407d3..f2879db 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -23,6 +23,9 @@ DSSpyInstrumenter class >> stopInstrumentation [
 
 	"Stop the recording session"
 	DSSpy recordingSession: false.
+	
+	"Stop the auto serialization"
+	DSRecordRegistry autoSerialize: false.
 
 	"Stop listening to events for recording"
 	SystemAnnouncer uniqueInstance unsubscribe: DSSpy.

From 9fd34a518d3278a94e33de51adcc74b294f9866e Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Tue, 24 Feb 2026 10:41:59 +0100
Subject: [PATCH 30/36] fix: recorder window was opened but never closed in
 tests

---
 DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st | 5 +++--
 DebuggingSpy-Browser/DSRecordBrowser.class.st           | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index 1669749..21a75ae 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -19,7 +19,8 @@ DSRecordBrowserTest >> filesPresenter [
 DSRecordBrowserTest >> generateRecordFile: aNumberOfRecords [
 
 	| recordFileRef records |
-	browser startRecording.
+	DSSpy recordingSession ifFalse: [ browser startRecording ].
+
 	recordFileRef := self updateLoggerFileName.
 	records := OrderedCollection new.
 
@@ -55,7 +56,7 @@ DSRecordBrowserTest >> setUp [
 DSRecordBrowserTest >> tearDown [
 
 	DSRecordRegistry current reset.
-	browser stopRecording.
+	DSSpy recordingSession ifTrue: [ browser stopRecording ].
 
 	super tearDown
 ]
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index ada4041..92cbee6 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -350,9 +350,8 @@ DSRecordBrowser >> stopRecording [
 	DSSpyInstrumenter stopInstrumentation.
 	(toolbar leftItems at: 2) enabled: true. "Enable the start recording button."
 	(toolbar leftItems at: 3) enabled: false. "Disable the stop recording button."
-	recorderWindow ifNotNil: [
-			recorderWindow stopTimer.
-			self currentWorld removeMorph: recorderWindow ]
+	recorderWindow stopTimer.
+	self currentWorld removeMorph: recorderWindow
 ]
 
 { #category : 'layout' }

From 4cf47b1dce562d36ae9d66208d934528dcdf742d Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Mon, 2 Mar 2026 14:52:53 +0100
Subject: [PATCH 31/36] fix: update with PR changes feat: adding more tests for
 each browser feature refactor: removing ColoredRecord class; refactoring
 comment: adding more comments where needed

---
 .../DSRecordBrowserTest.class.st              | 200 +++++++---
 .../DSRecorderWindowTest.class.st             |  36 +-
 DebuggingSpy-Browser/DSColoredRecord.class.st |  46 ---
 DebuggingSpy-Browser/DSRecordBrowser.class.st | 346 ++++++++++--------
 .../DSRecorderWindow.class.st                 | 131 -------
 DebuggingSpy-Browser/DSTimerWindow.class.st   | 153 ++++++++
 DebuggingSpy/DSAbstractBrowserRecord.class.st |   2 +-
 .../DSAbstractDebugPointEventRecord.class.st  |   2 +-
 .../DSAbstractDebuggerActionRecord.class.st   |   2 +-
 DebuggingSpy/DSAbstractEventRecord.class.st   |   7 +-
 .../DSAbstractExtendedRecord.class.st         |   2 +-
 DebuggingSpy/DSAbstractHaltRecord.class.st    |   2 +-
 .../DSAbstractSindarinActionRecord.class.st   |   2 +-
 DebuggingSpy/DSAbstractTaskRecord.class.st    |   2 +-
 DebuggingSpy/DSClipboardActionRecord.class.st |   2 +-
 DebuggingSpy/DSCodeActionRecord.class.st      |   2 +-
 DebuggingSpy/DSDebugPointRecord.class.st      |   2 +-
 .../DSMethodDebugPointRecord.class.st         |   2 +-
 DebuggingSpy/DSMethodEventRecord.class.st     |   2 +-
 DebuggingSpy/DSMouseEventRecord.class.st      |   2 +-
 DebuggingSpy/DSWindowEventRecord.class.st     |   2 +-
 DebuggingSpy/DSWindowRecord.class.st          |   2 +-
 22 files changed, 535 insertions(+), 414 deletions(-)
 delete mode 100644 DebuggingSpy-Browser/DSColoredRecord.class.st
 delete mode 100644 DebuggingSpy-Browser/DSRecorderWindow.class.st
 create mode 100644 DebuggingSpy-Browser/DSTimerWindow.class.st

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index 3474932..f4f86bf 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -12,52 +12,75 @@ Class {
 { #category : 'helpers' }
 DSRecordBrowserTest >> filesPresenter [
 
-	^ browser presenterAt: #addedFilesPresenter
+	^ browser presenterAt: #fileListPresenter
 ]
 
 { #category : 'helpers' }
-DSRecordBrowserTest >> generateRecordFile: aNumberOfRecords [
+DSRecordBrowserTest >> generateRecordsFile [
+	"Generates a file of random records and returns its file reference."
 
-	| recordFileRef records |
-	DSSpy recordingSession ifFalse: [ browser startRecording ].
+	| recordFileRef writeStream randomNbOfRecords |
+	randomNbOfRecords := Random new nextInteger: 10.
 
-	recordFileRef := self updateLoggerFileName.
-	records := OrderedCollection new.
+	recordFileRef := self temporaryDirectory / ('ds-spy-test-' , UUID new asString).
+	recordFileRef ensureCreateFile.
+	writeStream := recordFileRef writeStream.
 
-	1 to: aNumberOfRecords do: [ :i |
-			records add: (DSMouseEnterWindowRecord new
-					 windowId: 'test' , i asString;
-					 dateTime: (DateAndTime fromSeconds: 50 * i)) ].
+	writeStream nextPut: $[.
+
+	1 to: randomNbOfRecords do: [ :index |
+			writeStream nextPutAll: (STON toString: (self getRecordForIndex: index)).
+
+			index = randomNbOfRecords ifFalse: [
+					writeStream nextPut: $,.
+					writeStream crlf ] ].
+
+	writeStream nextPut: $].
+
+	writeStream close.
 
-	records do: [ :record | DSRecordRegistry current addRecord: record ].
 	^ recordFileRef
 ]
 
 { #category : 'helpers' }
-DSRecordBrowserTest >> selectedRecordsPresenter [
+DSRecordBrowserTest >> getRecordForIndex: aNumber [
+	"Generates a record with specified number as dateTime (in seconds) and as windowId"
 
-	^ browser presenterAt: #selectedRecordsPresenter
+	^ self recordClass new
+		  dateTime: (DateAndTime fromSeconds: aNumber);
+		  windowId: aNumber;
+		  yourself
 ]
 
-{ #category : 'running' }
-DSRecordBrowserTest >> setUp [
+{ #category : 'helpers' }
+DSRecordBrowserTest >> recordClass [
 
-	super setUp.
+	^ DSMouseEnterWindowRecord
+]
 
-	DSSpy testingSession: true.
+{ #category : 'helpers' }
+DSRecordBrowserTest >> recordsFilterPresenter [
+
+	^ browser presenterAt: #recordsFilter
+]
+
+{ #category : 'helpers' }
+DSRecordBrowserTest >> recordsTablePresenter [
 
-	logger := DSSpy logger loggingDirectory: self temporaryDirectory.
-	self updateLoggerFileName.
+	^ browser presenterAt: #recordsTablePresenter
+]
 
+{ #category : 'running' }
+DSRecordBrowserTest >> setUp [
+
+	super setUp.
 	browser := DSRecordBrowser new
 ]
 
 { #category : 'running' }
 DSRecordBrowserTest >> tearDown [
 
-	DSRecordRegistry current reset.
-	DSSpy recordingSession ifTrue: [ browser stopRecording ].
-
+	DSRecordBrowser uniqueInstance window isOpen ifTrue: [ DSRecordBrowser uniqueInstance window close ].
 	super tearDown
 ]
 
@@ -65,7 +88,7 @@ DSRecordBrowserTest >> tearDown [
 DSRecordBrowserTest >> testAddFile [
 
 	| fileRef |
-	fileRef := self generateRecordFile: 42.
+	fileRef := self generateRecordsFile.
 
 	browser addFile: fileRef.
 	self assert: browser files size equals: 1.
@@ -78,7 +101,7 @@ DSRecordBrowserTest >> testAddFile [
 DSRecordBrowserTest >> testAddFileWhenAlreadyInList [
 
 	| fileRef |
-	fileRef := self generateRecordFile: 42.
+	fileRef := self generateRecordsFile.
 
 	browser addFile: fileRef.
 	browser addFile: fileRef.
@@ -97,32 +120,80 @@ DSRecordBrowserTest >> testBrowserEmpty [
 ]
 
 { #category : 'tests' }
-DSRecordBrowserTest >> testGetColoredRecordsOf [
+DSRecordBrowserTest >> testClosingBrowser [
+
+	DSRecordBrowser toggleBrowser.
+	DSRecordBrowser toggleBrowser.
+	self deny: DSRecordBrowser uniqueInstance window isOpen
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testCreatingAndOpeningBrowser [
+
+	self deny: DSRecordBrowser uniqueInstance window isOpen.
+	DSRecordBrowser toggleBrowser.
+
+	self assert: DSRecordBrowser uniqueInstance window isOpen
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testFilteringAClassOfRecords [
+
+	| fileRef history |
+	fileRef := self generateRecordsFile.
+	history := browser getHistoryFrom: fileRef.
+
+	browser addFile: fileRef.
+	self assert: self recordsTablePresenter roots size equals: history records size.
+
+	self recordsFilterPresenter sourceList selectItem: self recordClass.
+	self recordsFilterPresenter addSelected.
+	
+	self assert: self recordsTablePresenter roots size equals: 0 "Since there is only one type of records in the generated file"
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testFilteringAllRecords [
+
+	| fileRef history |
+	fileRef := self generateRecordsFile.
+	history := browser getHistoryFrom: fileRef.
 
-	| fileRef history coloredRecords |
-	fileRef := self generateRecordFile: 10.
-	history := DSRecordBrowser getHistoryOf: fileRef.
-	coloredRecords := DSRecordBrowser getColoredRecordsOf: history windows.
-	coloredRecords do: [ :c |
-			self
-				assert: c color
-				equals: (DSRecordBrowser getWindowColorFor: (history windows select: [ :i | i events includes: c record ]) first) ]
+	browser addFile: fileRef.
+	self assert: self recordsTablePresenter roots size equals: history records size.
+
+	self recordsFilterPresenter addAll.
+	self assert: self recordsTablePresenter roots size equals: 0
 ]
 
 { #category : 'tests' }
-DSRecordBrowserTest >> testGetHistoryOf [
+DSRecordBrowserTest >> testGetHistoryFrom [
 
 	| fileRef |
-	fileRef := self generateRecordFile: 5.
-	self assert: (DSRecordBrowser getHistoryOf: fileRef) records size equals: 5
+	fileRef := self generateRecordsFile.
+	self assert: (browser getHistoryFrom: fileRef) class equals: DSRecordHistory
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testGetRecordColorAssociationsFrom [
+
+	| fileRef history colorAssociations |
+	fileRef := self generateRecordsFile.
+	history := browser getHistoryFrom: fileRef.
+	colorAssociations := browser getRecordColorAssociationsFrom: history windows.
+
+	history windows do: [ :window |
+			window events do: [ :record |
+					self assert: (colorAssociations anySatisfy: [ :association |
+							 association key = record and: association value = (browser getWindowColorFrom: window) ]) ] ]
 ]
 
 { #category : 'tests' }
 DSRecordBrowserTest >> testRemoveFile [
 
 	| fileRef1 fileRef2 |
-	fileRef1 := self generateRecordFile: 42.
-	fileRef2 := self generateRecordFile: 42.
+	fileRef1 := self generateRecordsFile.
+	fileRef2 := self generateRecordsFile.
 
 	browser addFile: fileRef1.
 	browser addFile: fileRef2.
@@ -133,6 +204,20 @@ DSRecordBrowserTest >> testRemoveFile [
 	self assert: self filesPresenter selectedItem equals: fileRef2
 ]
 
+{ #category : 'tests' }
+DSRecordBrowserTest >> testRemoveLastFile [
+
+	| fileRef1 |
+	fileRef1 := self generateRecordsFile.
+
+	browser addFile: fileRef1.
+	browser removeFile: fileRef1.
+
+	self assert: browser files size equals: 0.
+	self assert: self filesPresenter items size equals: 0.
+	self assert: self filesPresenter selectedItem equals: nil
+]
+
 { #category : 'tests' }
 DSRecordBrowserTest >> testStartRecording [
 
@@ -144,28 +229,37 @@ DSRecordBrowserTest >> testStartRecording [
 	self assert: DSSpy recordingSession.
 	self assert: DSRecordRegistry autoSerialize.
 	self deny: browser recorderWindow isNil.
+
+	browser stopRecording
 ]
 
-{ #category : 'helpers' }
-DSRecordBrowserTest >> timelinePresenter [
+{ #category : 'tests' }
+DSRecordBrowserTest >> testUpdateRecordsTable [
 
-	^ browser presenterAt: #timeline
+	| fileRef history presenterMock |
+	fileRef := self generateRecordsFile.
+	history := browser getHistoryFrom: fileRef.
+	presenterMock := MockObject new on: #selectedItem respond: fileRef.
+	browser updateRecordsTable: presenterMock.
+
+	self recordsTablePresenter roots do: [ :association |
+		self assert: (history records anySatisfy: [ :record | record uuid = association key uuid ]) ]
 ]
 
-{ #category : 'helpers' }
-DSRecordBrowserTest >> toolbarPresenter [
+{ #category : 'tests' }
+DSRecordBrowserTest >> testUpdateRecordsTableWhenAddingFile [
+
+	| fileRef history |
+	fileRef := self generateRecordsFile.
+	history := browser getHistoryFrom: fileRef.
 
-	^ browser presenterAt: #toolbar
+	browser addFile: fileRef.
+
+	self assert: self recordsTablePresenter roots size equals: history records size
 ]
 
 { #category : 'helpers' }
-DSRecordBrowserTest >> updateLoggerFileName [
-	"Changes the logging file name, needs to be called everytime a new file is created for the logger to be updated for future logs.
-Using a UUID ensures that multiple files created at the same date and time dont have the same file name."
-
-	| fr |
-	logger loggingFileName: UUID new asString.
-	fr := logger ensureCreateLoggingFileReference.
-	logger loggingFileReference: fr.
-	^ fr
+DSRecordBrowserTest >> timelinePresenter [
+
+	^ browser presenterAt: #graphicTimeline 
 ]
diff --git a/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st b/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
index e24974e..d74bc8f 100644
--- a/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
@@ -2,7 +2,7 @@ Class {
 	#name : 'DSRecorderWindowTest',
 	#superclass : 'TestCase',
 	#instVars : [
-		'recorder'
+		'window'
 	],
 	#category : 'DebuggingSpy-Browser-Tests',
 	#package : 'DebuggingSpy-Browser-Tests'
@@ -12,14 +12,40 @@ Class {
 DSRecorderWindowTest >> setUp [
 	super setUp.
 	
-	recorder := DSRecorderWindow new.
+	window := DSTimerWindow new.
+]
+
+{ #category : 'tests' }
+DSRecorderWindowTest >> testEmptyTimerWindow [
+
+	self assert: (Time readFrom: self timerMorph contents readStream) seconds equals: 0
+]
+
+{ #category : 'tests' }
+DSRecorderWindowTest >> testTimeNow [
+
+	self assert: (Time readFrom: self timeNowMorph contents readStream) asSeconds equals: Time now asSeconds
 ]
 
 { #category : 'tests' }
 DSRecorderWindowTest >> testTimer [
 
-	recorder startTimer.
+	window startTimer.
 	(Delay forMilliseconds: 1000) wait.
-	recorder stopTimer.
-	self assert: recorder timeElapsed equals: 1
+	window stopTimer.
+	self assert: window elapsedTime equals: 1
+]
+
+{ #category : 'layout' }
+DSRecorderWindowTest >> timeNowMorph [
+	"Returns the window's timeNowMorph"
+
+	^ window readSlot: (DSTimerWindow slotNamed: #timeNowMorph)
+]
+
+{ #category : 'layout' }
+DSRecorderWindowTest >> timerMorph [
+	"Returns the window's timerMorph."
+
+	^ window readSlot: (DSTimerWindow slotNamed: #timerMorph)
 ]
diff --git a/DebuggingSpy-Browser/DSColoredRecord.class.st b/DebuggingSpy-Browser/DSColoredRecord.class.st
deleted file mode 100644
index 1d4472b..0000000
--- a/DebuggingSpy-Browser/DSColoredRecord.class.st
+++ /dev/null
@@ -1,46 +0,0 @@
-"
-I am representing a DSSpy record, which associates a color to be displayed.
-"
-Class {
-	#name : 'DSColoredRecord',
-	#superclass : 'Object',
-	#instVars : [
-		'record',
-		'color'
-	],
-	#category : 'DebuggingSpy-Browser',
-	#package : 'DebuggingSpy-Browser'
-}
-
-{ #category : 'initialization' }
-DSColoredRecord class >> for: aRecord withColor: aColor [
-
-	^ self new
-		  record: aRecord;
-		  color: aColor;
-		  yourself
-]
-
-{ #category : 'accessing' }
-DSColoredRecord >> color [
-
-	^ color
-]
-
-{ #category : 'accessing' }
-DSColoredRecord >> color: aColor [
-
-	color := aColor
-]
-
-{ #category : 'accessing' }
-DSColoredRecord >> record [
-
-	^ record
-]
-
-{ #category : 'accessing' }
-DSColoredRecord >> record: aRecord [
-
-	record := aRecord
-]
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index ada4041..497628a 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -10,77 +10,25 @@ Class {
 	#superclass : 'SpPresenter',
 	#instVars : [
 		'files',
-		'selectedRecords',
-		'toolbar',
-		'addedFilesPresenter',
-		'selectedRecordsPresenter',
-		'recorderWindow',
-		'timeline',
-		'recordsFilter'
+		'recordsTablePresenter',
+		'timerWindow',
+		'graphicTimeline',
+		'recordsFilter',
+		'toolbarPresenter',
+		'fileListPresenter',
+		'startRecordButtonPresenter',
+		'stopRecordButtonPresenter'
 	],
 	#classInstVars : [
-		'presenter'
+		'uniqueInstance'
 	],
 	#category : 'DebuggingSpy-Browser',
 	#package : 'DebuggingSpy-Browser'
 }
 
-{ #category : 'accessing' }
-DSRecordBrowser class >> browser [
-
-	^ presenter ifNil: [ presenter := self new ]
-]
-
-{ #category : 'color' }
-DSRecordBrowser class >> getColoredRecordsOf: aWindowRecordCollection [
-
-	| coloredRecords |
-	coloredRecords := OrderedCollection new.
-	aWindowRecordCollection do: [ :windowRecord |
-			coloredRecords addAll:
-				(windowRecord events collect: [ :record | DSColoredRecord for: record withColor: (self getWindowColorFor: windowRecord) ]) ].
-	coloredRecords sort: [ :i :j | i record dateTime < j record dateTime ].
-	^ coloredRecords
-]
-
-{ #category : 'operations' }
-DSRecordBrowser class >> getHistoryOf: aFileReference [
-
-	^ DSRecordHistory on: (DSSpy materialize: aFileReference)
-]
-
-{ #category : 'operations' }
-DSRecordBrowser class >> getTimelinePointsFrom: aHistory [
-
-	^ aHistory windows collectWithIndex: [ :w :index |
-			  RSTimeLinePlot new
-				  entries: {
-						  w events first dateTime asNanoSeconds.
-						  w events last dateTime asNanoSeconds }
-				  at: index;
-				  color: (self getWindowColorFor: w) ]
-]
-
-{ #category : 'color' }
-DSRecordBrowser class >> getWindowColorFor: aWindowRecord [
-
-	aWindowRecord isBrowser ifTrue: [ ^ Color fromHexString: '#2A2AB7' ].
-	aWindowRecord isInspector ifTrue: [ ^ Color fromHexString: '#FFC300' ].
-	aWindowRecord isDebugger ifTrue: [ ^ Color fromHexString: '#C41E3D' ].
-	
-	aWindowRecord isPlayground ifTrue: [ ^ Color fromHexString: '#70B77E' ].
-	aWindowRecord isBreakpointBrowser ifTrue: [ ^ Color fromHexString: '#7C238C' ].
-	aWindowRecord isCritiqueBrowser ifTrue: [ ^ Color fromHexString: '#A45C15' ].
-	aWindowRecord isEpicea ifTrue: [ ^ Color fromHexString: '#345e54' ].
-	aWindowRecord isIceberg ifTrue: [ ^ Color fromHexString: '#2B5BA9' ].
-	aWindowRecord isRewriter ifTrue: [ ^ Color fromHexString: '#292929' ].
-
-	^ Color gray
-]
-
 { #category : 'world menu' }
 DSRecordBrowser class >> menuCommandOn: aBuilder [
-	"Adds the DSSpy button on topside bar, the order is 100 just to make sure the DSSpy button is at the end"
+	"Adds the DSSpy button on topside bar."
 
 	<worldMenu>
 	(aBuilder item: #DSSpy)
@@ -91,19 +39,27 @@ DSRecordBrowser class >> menuCommandOn: aBuilder [
 
 { #category : 'initialization' }
 DSRecordBrowser class >> resetBrowser [
+	"Removes the actual browser then another one will be created the next time it needs to be opened."
 
 	<script>
-	presenter := nil
+	uniqueInstance := nil
 ]
 
 { #category : 'open/close' }
 DSRecordBrowser class >> toggleBrowser [
+	"Opens the browser or closes it depending on its state. If it needs to be created, then creates and opens it. See uniqueInstance method."
+
+	uniqueInstance ifNotNil: [
+			^ uniqueInstance window isOpen
+				  ifTrue: [ uniqueInstance window close ]
+				  ifFalse: [ uniqueInstance window open ] ].
+	self uniqueInstance open
+]
+
+{ #category : 'accessing' }
+DSRecordBrowser class >> uniqueInstance [
 
-	presenter ifNotNil: [
-			^ presenter window isOpen
-				  ifTrue: [ presenter window close ]
-				  ifFalse: [ presenter window open ] ].
-	self browser open
+	^ uniqueInstance ifNil: [ uniqueInstance := self new ]
 ]
 
 { #category : 'files' }
@@ -111,15 +67,16 @@ DSRecordBrowser >> addFile: aFileReference [
 	"Adds a file in the presenter and set is as selected, which updates the records displayed."
 
 	(files includes: aFileReference)
-		ifTrue: [ ^ self inform: 'File already added in the browser !' ]
+		ifTrue: [ ^ self inform: 'File already added !' ]
 		ifFalse: [
 				files add: aFileReference.
-				addedFilesPresenter items: files.
-				addedFilesPresenter selectItem: aFileReference ]
+				fileListPresenter items: files.
+				fileListPresenter selectItem: aFileReference ]
 ]
 
 { #category : 'layout' }
 DSRecordBrowser >> addRecordButton [
+	"Layout button that opens a file selecting window."
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Add';
@@ -133,33 +90,42 @@ DSRecordBrowser >> addRecordButton [
 DSRecordBrowser >> connectPresenters [
 	"Updates the records and the timeline whenever the selected file is changed."
 
-	addedFilesPresenter whenSelectionChangedDo: [ :presenter |
-			self updateSelectedRecords: presenter.
-			self updateTimelineChart ].
+	fileListPresenter whenSelectionChangedDo: [ :presenter |
+			fileListPresenter selectedItem ifNotNil: [
+					self updateRecordsTable: presenter.
+					self updateTimelineChart ] ].
 
-	recordsFilter whenChangedDo: [
-			addedFilesPresenter selectedItem ifNotNil: [
-					self updateSelectedRecords: addedFilesPresenter.
-					self updateTimelineChart ] ]
+	recordsFilter whenChangedDo: [ fileListPresenter selectedItem ifNotNil: [ self updateRecordsTable: fileListPresenter ] ]
 ]
 
 { #category : 'layout' }
 DSRecordBrowser >> defaultLayout [
 
 	^ SpBoxLayout newVertical
-		  add: toolbar expand: false;
+		  add: toolbarPresenter expand: false;
 		  add: (SpPanedLayout newHorizontal
 				   positionOfSlider: 30 percent;
-				   add: addedFilesPresenter;
+				   add: fileListPresenter;
 				   add: (SpBoxLayout newTopToBottom
 						    add: (SpTabLayout new
-								     add: selectedRecordsPresenter label: 'Records';
-								     add: timeline label: 'Timeline';
+								     add: recordsTablePresenter label: 'Records';
+								     add: graphicTimeline label: 'Timeline';
 								     yourself);
 						    yourself);
 				   yourself)
 ]
 
+{ #category : 'layout' }
+DSRecordBrowser >> fileList [
+	"Instanciates a new presenter for the added files list."
+
+	^ self newList
+		  items: self files;
+		  display: [ :file | file basenameWithoutExtension ];
+		  actions: self listAddedFilesActions;
+		  yourself
+]
+
 { #category : 'accessing' }
 DSRecordBrowser >> files [
 
@@ -168,37 +134,81 @@ DSRecordBrowser >> files [
 
 { #category : 'layout' }
 DSRecordBrowser >> filterRecordsButton [
+	"Instanciates a new layout button that opens the records filter window."
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Filter';
 		  icon: (self iconNamed: #diff);
 		  help: 'Filter the records.';
-		  action: [ self recordsFilter open ];
+		  action: [ recordsFilter open ];
 		  yourself
 ]
 
-{ #category : 'initialization' }
-DSRecordBrowser >> initializePresenters [
+{ #category : 'helpers' }
+DSRecordBrowser >> getHistoryFrom: aFileReference [
+
+	^ DSRecordHistory on: (DSSpy materialize: aFileReference)
+]
+
+{ #category : 'helpers' }
+DSRecordBrowser >> getRecordColorAssociationsFrom: aWindowRecordCollection [
+	"Returns a dictionary associating each reacord with its window corresponding color, sorted by each reacord dateTime."
 
-	toolbar := self newToolbar
-		           addItem: self addRecordButton;
-		           addItem: self startRecordButton;
-		           addItem: self stopRecordButton;
-		           addItem: self filterRecordsButton.
+	| recordColorsDictionary |
+	recordColorsDictionary := Dictionary new.
 
-	addedFilesPresenter := self newList
-		                       items: self files;
-		                       display: [ :file | file basenameWithoutExtension ];
-		                       actions: self listAddedFilesActions;
-		                       yourself.
+	aWindowRecordCollection do: [ :windowRecord |
+		windowRecord events do: [ :record | recordColorsDictionary at: record put: (self getWindowColorFrom: windowRecord) ] ].
 
-	selectedRecordsPresenter := self recordsTable.
-	timeline := self newRoassal.
+	^ recordColorsDictionary associations sorted: [ :recordA :recordB | recordA key dateTime < recordB key dateTime ]
+]
+
+{ #category : 'helpers' }
+DSRecordBrowser >> getTimelinePointsFrom: aHistory [
+	"Returns a list of plots for the timeline chart."
+
+	^ aHistory windows collectWithIndex: [ :w :index |
+			  RSTimeLinePlot new
+				  entries: {
+						  w events first dateTime asNanoSeconds.
+						  w events last dateTime asNanoSeconds }
+				  at: index;
+				  color: (self getWindowColorFrom: w) ]
+]
+
+{ #category : 'color' }
+DSRecordBrowser >> getWindowColorFrom: aWindowRecord [
+	"Returns the window associated color, and the default color otherwise."
+
+	aWindowRecord isBrowser ifTrue: [ ^ Color fromHexString: '#2A2AB7' ].
+	aWindowRecord isInspector ifTrue: [ ^ Color fromHexString: '#FFC300' ].
+	aWindowRecord isDebugger ifTrue: [ ^ Color fromHexString: '#C41E3D' ].
+
+	aWindowRecord isPlayground ifTrue: [ ^ Color fromHexString: '#70B77E' ].
+	aWindowRecord isBreakpointBrowser ifTrue: [ ^ Color fromHexString: '#7C238C' ].
+	aWindowRecord isCritiqueBrowser ifTrue: [ ^ Color fromHexString: '#A45C15' ].
+	aWindowRecord isEpicea ifTrue: [ ^ Color fromHexString: '#345e54' ].
+	aWindowRecord isIceberg ifTrue: [ ^ Color fromHexString: '#2B5BA9' ].
+	aWindowRecord isRewriter ifTrue: [ ^ Color fromHexString: '#292929' ].
+
+	^ Color gray
+]
+
+{ #category : 'initialization' }
+DSRecordBrowser >> initializePresenters [
+
+	startRecordButtonPresenter := self startRecordButton.
+	stopRecordButtonPresenter := self stopRecordButton.
+	toolbarPresenter := self toolbar.
+	fileListPresenter := self fileList.
+	recordsTablePresenter := self recordsTable.
+	graphicTimeline := self newRoassal.
 	recordsFilter := self recordsFilter
 ]
 
 { #category : 'operations' }
 DSRecordBrowser >> listAddedFilesActions [
+	"List actions for the added files in browser, such as inspecting raw records, inspecting history, or removing the selected file from the list."
 
 	^ SpActionGroup new
 		  addActionWith: [ :anItem |
@@ -207,35 +217,21 @@ DSRecordBrowser >> listAddedFilesActions [
 					  iconName: #inspect;
 					  description: 'Inspect the raw records';
 					  shortcutKey: $i meta;
-					  action: [ (DSSpy materialize: addedFilesPresenter selectedItem) inspect ] ];
+					  action: [ (DSSpy materialize: fileListPresenter selectedItem) inspect ] ];
 		  addActionWith: [ :anItem |
 				  anItem
 					  name: 'Inspect history';
 					  iconName: #history;
 					  description: 'Inspect the record history';
 					  shortcutKey: $h meta;
-					  action: [ (self class getHistoryOf: addedFilesPresenter selectedItem) inspect ] ];
+					  action: [ (self getHistoryFrom: fileListPresenter selectedItem) inspect ] ];
 		  addActionWith: [ :anItem |
 				  anItem
 					  name: 'Remove';
 					  iconName: #remove;
 					  description: 'Remove the record from list';
 					  shortcutKey: $x meta;
-					  action: [ self removeFile: addedFilesPresenter selectedItem ] ];
-		  yourself
-]
-
-{ #category : 'operations' }
-DSRecordBrowser >> listRecordActions [
-
-	^ SpActionGroup new
-		  addActionWith: [ :anItem |
-				  anItem
-					  name: 'Inspect';
-					  iconName: #inspect;
-					  description: 'Inspect the raw records';
-					  shortcutKey: $i meta;
-					  action: [ selectedRecordsPresenter selectedItem record inspect ] ];
+					  action: [ self removeFile: fileListPresenter selectedItem ] ];
 		  yourself
 ]
 
@@ -254,13 +250,13 @@ DSRecordBrowser >> openAddFileDialog [
 { #category : 'accessing' }
 DSRecordBrowser >> recorderWindow [
 
-	^ recorderWindow
+	^ timerWindow
 ]
 
-{ #category : 'accessing' }
+{ #category : 'layout' }
 DSRecordBrowser >> recordsFilter [
 
-	^ recordsFilter ifNil: [ recordsFilter := SpChooserPresenter new sourceItems: DSAbstractEventRecord getRecordClasses ]
+	^ SpChooserPresenter new sourceItems: DSAbstractEventRecord getNonAbstractSubClasses 
 ]
 
 { #category : 'layout' }
@@ -269,41 +265,48 @@ DSRecordBrowser >> recordsTable [
 	^ self newTreeTable
 		  addColumn: (SpStringTableColumn new
 				   title: 'Event';
-				   displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
-				   evaluated: [ :coloredRecord | coloredRecord record eventName asString ];
+				   displayBackgroundColor: [ :association | association value ];
+				   evaluated: [ :association | association key eventName asString ];
 				   displayColor: [ :aRecord | Color white ];
 				   yourself);
 		  addColumn: (SpStringTableColumn new
 				   title: 'Event type';
-				   displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
-				   evaluated: [ :coloredRecord | coloredRecord record class asString ];
+				   displayBackgroundColor: [ :association | association value ];
+				   evaluated: [ :association | association key class asString ];
 				   displayColor: [ :aRecord | Color white ];
 				   yourself);
 		  addColumn: (SpStringTableColumn new
 				   title: 'Time';
-				   displayBackgroundColor: [ :coloredRecord | coloredRecord color ];
-				   evaluated: [ :coloredRecord | coloredRecord record dateTime asTime print24 ];
+				   displayBackgroundColor: [ :association | association value ];
+				   evaluated: [ :association | association key dateTime asTime print24 ];
 				   displayColor: [ :aRecord | Color white ];
 				   yourself);
 		  beResizable;
-		  actions: self listRecordActions;
+		  actions: self recordsTableActions;
 		  yourself
 ]
 
-{ #category : 'files' }
-DSRecordBrowser >> removeFile: aFileReference [
+{ #category : 'operations' }
+DSRecordBrowser >> recordsTableActions [
+	"List actions that can be done on a record in the table, such as inspecting it."
 
-	files := files reject: [ :fileReference | fileReference = aFileReference ].
-	addedFilesPresenter items: self files.
-	addedFilesPresenter selectItem: (files isEmpty
-			 ifTrue: [ nil ]
-			 ifFalse: [ files last ])
+	^ SpActionGroup new
+		  addActionWith: [ :anItem |
+				  anItem
+					  name: 'Inspect';
+					  iconName: #inspect;
+					  description: 'Inspect the raw records';
+					  shortcutKey: $i meta;
+					  action: [ recordsTablePresenter selectedItem key inspect ] ];
+		  yourself
 ]
 
-{ #category : 'initialization' }
-DSRecordBrowser >> resetBrowser [
+{ #category : 'files' }
+DSRecordBrowser >> removeFile: aFileReference [
 
-	<script: 'self resetBrowser'>
+	files := files reject: [ :fileReference | fileReference = aFileReference ].
+	fileListPresenter items: self files.
+	fileListPresenter selectItem: (files ifNotEmpty: [ files last ])
 ]
 
 { #category : 'layout' }
@@ -322,13 +325,12 @@ DSRecordBrowser >> startRecordButton [
 DSRecordBrowser >> startRecording [
 	"Starts recording events and instianciates a new RecorderWindow that displays a timer and shows that Debugging Spy is recordering."
 
-	(toolbar leftItems at: 2) enabled: false. "Disable the start recording button."
-	(toolbar leftItems at: 3) enabled: true. "Enable the stop recording button."
-	recorderWindow := DSRecorderWindow new.
-	recorderWindow
+	timerWindow := DSTimerWindow new.
+	timerWindow 
 		openInWorld;
 		startTimer.
-	DSSpyInstrumenter instrumentSystem
+	DSSpyInstrumenter instrumentSystem.
+	self updateToolbar
 ]
 
 { #category : 'layout' }
@@ -348,23 +350,21 @@ DSRecordBrowser >> stopRecording [
 	"Stops the recording session and closes the RecorderWindow."
 
 	DSSpyInstrumenter stopInstrumentation.
-	(toolbar leftItems at: 2) enabled: true. "Enable the start recording button."
-	(toolbar leftItems at: 3) enabled: false. "Disable the stop recording button."
-	recorderWindow ifNotNil: [
-			recorderWindow stopTimer.
-			self currentWorld removeMorph: recorderWindow ]
+	timerWindow stopTimer.
+	self currentWorld removeMorph: timerWindow.
+	self updateToolbar
 ]
 
 { #category : 'layout' }
 DSRecordBrowser >> timelineChart [
 
 	| history names chart data |
-	addedFilesPresenter selectedItem ifNil: [ ^ nil ].
+	fileListPresenter selectedItem ifNil: [ ^ nil ].
 
-	history := self class getHistoryOf: addedFilesPresenter selectedItem.
+	history := self getHistoryFrom: fileListPresenter selectedItem.
 	names := history windows collect: [ :i | i getWindowType ].
 
-	data := self class getTimelinePointsFrom: history.
+	data := self getTimelinePointsFrom: history.
 	data size < 2 ifTrue: [ ^ nil ].
 
 	chart := RSCompositeChart new.
@@ -376,34 +376,58 @@ DSRecordBrowser >> timelineChart [
 		useNiceLabel;
 		numberOfTicks: history windows size // 2;
 		useDiagonalLabel;
-		labelConversion: [ :v | (DateAndTime fromSeconds: v // 1000000000) asTime ].
+		labelConversion: [ :v | (DateAndTime fromSeconds: v // 1000000000) asTime ]. 
+		
+		"Plots are instancied using their dateTime as nano seconds to prevent events that last less than a second to be hided, so we convert them into seconds to get the label."
 
 	chart build.
 	^ chart
 ]
 
+{ #category : 'layout' }
+DSRecordBrowser >> toolbar [
+	"Instanciates a new toolbar to be displayed on layout."
+
+	^ self newToolbar
+		  addItem: self addRecordButton;
+		  addItem: startRecordButtonPresenter;
+		  addItem: stopRecordButtonPresenter;
+		  addItem: self filterRecordsButton
+]
+
 { #category : 'operations' }
-DSRecordBrowser >> updateSelectedRecords: aPresenter [
-	"Updates the selected records and processes it to be used with their respective colors."
+DSRecordBrowser >> updateRecordsTable: filesPresenter [
+	"Updates the records presenter and add to each record its corresponding color."
+
+	| fileRef recordColorAssociations |
+	recordColorAssociations := Array new.
+	fileRef := filesPresenter selectedItem.
 
-	| records |
-	records := OrderedCollection new.
-	aPresenter selectedItem ifNotNil: [
-			records := self class getColoredRecordsOf: (self class getHistoryOf: aPresenter selectedItem) windows.
-			records := records reject: [ :coloredRecord | self recordsFilter chosenItems includes: coloredRecord record class ] ].
-	selectedRecords := records.
-	selectedRecordsPresenter
-		roots: selectedRecords;
-		children: [ :item | OrderedCollection new ]
+	fileRef ifNotNil: [
+			recordColorAssociations := self getRecordColorAssociationsFrom: (self getHistoryFrom: fileRef) windows.
+			recordColorAssociations := recordColorAssociations reject: [ :association |
+				                           recordsFilter chosenItems includes: association key class ] ].
+
+	recordsTablePresenter roots: recordColorAssociations 
 ]
 
 { #category : 'operations' }
 DSRecordBrowser >> updateTimelineChart [
+	"Regenerates the timeline chart using the selected record's data"
 
 	| chart |
 	chart := self timelineChart.
-	chart ifNil: [ timeline script: [ :canvas |  ] ] ifNotNil: [ timeline script: [ :canvas | chart renderIn: canvas ] ].
-	timeline refresh
+	chart
+		ifNil: [ graphicTimeline script: [ :canvas |  ] ]
+		ifNotNil: [ graphicTimeline script: [ :canvas | chart renderIn: canvas ] ].
+	graphicTimeline refresh
+]
+
+{ #category : 'layout' }
+DSRecordBrowser >> updateToolbar [
+
+	startRecordButtonPresenter enabled: DSSpy recordingSession not.
+	stopRecordButtonPresenter enabled: DSSpy recordingSession
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy-Browser/DSRecorderWindow.class.st b/DebuggingSpy-Browser/DSRecorderWindow.class.st
deleted file mode 100644
index f9c054f..0000000
--- a/DebuggingSpy-Browser/DSRecorderWindow.class.st
+++ /dev/null
@@ -1,131 +0,0 @@
-"
-This class is a window displaying some informations while DebuggingSpy is recording.
-"
-Class {
-	#name : 'DSRecorderWindow',
-	#superclass : 'SystemWindow',
-	#instVars : [
-		'timerMorph',
-		'running',
-		'startTime',
-		'timer',
-		'timeNowMorph',
-		'timeElapsed'
-	],
-	#category : 'DebuggingSpy-Browser',
-	#package : 'DebuggingSpy-Browser'
-}
-
-{ #category : 'initialization' }
-DSRecorderWindow >> buildUI [
-
-	| recordingIcon stopButton |
-	recordingIcon := ImageMorph new
-		                 image: (self iconNamed: #glamorousRedCircle);
-		                 position: 0 @ 7;
-		                 yourself.
-
-	timerMorph := StringMorph new
-		              contents: '00:00:000';
-		              position: 15 @ 6.
-
-	timeNowMorph := StringMorph new
-		                contents: Time now print24;
-		                position: 75 @ 6.
-
-	stopButton := PluggableButtonMorph new
-		              label: (IconicListItemMorph new icon: (self iconNamed: #stop));
-		              model: DSRecordBrowser browser;
-		              actionSelector: #stopRecording;
-		              position: 125 @ 4;
-		              yourself.
-
-	self
-		addMorph: recordingIcon;
-		addMorph: timerMorph;
-		addMorph: timeNowMorph;
-		addMorph: stopButton
-]
-
-{ #category : 'resize/collapse' }
-DSRecorderWindow >> collapseOrExpand [
-
-	^ self
-]
-
-{ #category : 'initialization' }
-DSRecorderWindow >> initialize [
-
-	super initialize.
-	running := false.
-	self minimumExtent: self size.
-	self initializeProperties.
-	self buildUI
-]
-
-{ #category : 'initialization' }
-DSRecorderWindow >> initializeProperties [
-
-	self
-		setLabel: 'DSSpy recorder';
-		extent: self size;
-		beSticky;
-		makeUnclosable;
-		removeLabelArea;
-		removeBoxes;
-		beUnresizeable
-]
-
-{ #category : 'accessing' }
-DSRecorderWindow >> margin [
-	"Space around the window"
-
-	^ 5 @ 32
-]
-
-{ #category : 'wiw support' }
-DSRecorderWindow >> morphicLayerNumber [
-	"To ensure the recorder window is always displayed at screen and cannot be covered"
-
-	^ 12
-]
-
-{ #category : 'opening' }
-DSRecorderWindow >> openInWorld [
-
-	super openInWorld.
-	self position: self currentWorld extent - self extent - self margin
-]
-
-{ #category : 'accessing' }
-DSRecorderWindow >> size [
-
-	^ 150 @ 30
-]
-
-{ #category : 'timer' }
-DSRecorderWindow >> startTimer [
-
-	running ifTrue: [ ^ self ].
-
-	startTime := Time current asSeconds.
-	running := true.
-	timer := [
-		         [ running ] whileTrue: [
-				         timeElapsed := Time current asSeconds - startTime.
-				         timerMorph contents: (Time fromSeconds: timeElapsed) print24.
-				         timeNowMorph contents: Time now print24.
-				         (Delay forMilliseconds: 50) wait ] ] fork
-]
-
-{ #category : 'timer' }
-DSRecorderWindow >> stopTimer [
-
-	running := false
-]
-
-{ #category : 'accessing' }
-DSRecorderWindow >> timeElapsed [
-
-	^ timeElapsed
-]
diff --git a/DebuggingSpy-Browser/DSTimerWindow.class.st b/DebuggingSpy-Browser/DSTimerWindow.class.st
new file mode 100644
index 0000000..efb4d62
--- /dev/null
+++ b/DebuggingSpy-Browser/DSTimerWindow.class.st
@@ -0,0 +1,153 @@
+"
+This class is a window displaying some informations while DebuggingSpy is recording.
+"
+Class {
+	#name : 'DSTimerWindow',
+	#superclass : 'SystemWindow',
+	#instVars : [
+		'timerMorph',
+		'running',
+		'startTime',
+		'timer',
+		'timeNowMorph'
+	],
+	#category : 'DebuggingSpy-Browser',
+	#package : 'DebuggingSpy-Browser'
+}
+
+{ #category : 'initialization' }
+DSTimerWindow >> buildUI [
+	"Builds the windows UI that contains : an icon that shows that Debugging Spy is recording, a chronometer, a timer that shows actual time and a stop recording button."
+
+	timerMorph := self timerMorph.
+	timeNowMorph := self timeNowMorph.
+
+	self
+		addMorph: self recordingIcon;
+		addMorph: timerMorph;
+		addMorph: timeNowMorph;
+		addMorph: self stopButton
+]
+
+{ #category : 'resize/collapse' }
+DSTimerWindow >> collapseOrExpand [
+
+	^ self
+]
+
+{ #category : 'timer' }
+DSTimerWindow >> elapsedTime [
+	"Returns the elapsed time since the timer's start."
+
+	^ Time current asSeconds - startTime
+]
+
+{ #category : 'initialization' }
+DSTimerWindow >> initialize [
+
+	super initialize.
+	running := false.
+	self minimumExtent: self size.
+	self initializeProperties.
+	self buildUI
+]
+
+{ #category : 'initialization' }
+DSTimerWindow >> initializeProperties [
+
+	self
+		setLabel: 'DSSpy recorder';
+		extent: self size;
+		beSticky;
+		makeUnclosable;
+		removeLabelArea;
+		removeBoxes;
+		beUnresizeable
+]
+
+{ #category : 'accessing' }
+DSTimerWindow >> margin [
+	"Space around the window"
+
+	^ 5 @ 32
+]
+
+{ #category : 'wiw support' }
+DSTimerWindow >> morphicLayerNumber [
+	"To ensure the recorder window is always displayed at screen and cannot be covered"
+
+	^ 12
+]
+
+{ #category : 'opening' }
+DSTimerWindow >> openInWorld [
+
+	super openInWorld.
+	self position: self currentWorld extent - self extent - self margin
+]
+
+{ #category : 'layout' }
+DSTimerWindow >> recordingIcon [
+	"Instanciates a new icon that shows that Debugging Spy is recording."
+
+	^ ImageMorph new
+		  image: (self iconNamed: #glamorousRedCircle);
+		  position: 0 @ 7;
+		  yourself
+]
+
+{ #category : 'accessing' }
+DSTimerWindow >> size [
+
+	^ 150 @ 30
+]
+
+{ #category : 'timer' }
+DSTimerWindow >> startTimer [
+
+	running ifTrue: [ ^ self ].
+
+	startTime := Time current asSeconds.
+	running := true.
+	timer := [
+		         [ running ] whileTrue: [
+				         timerMorph contents: (Time fromSeconds: self elapsedTime) print24.
+				         timeNowMorph contents: Time now print24.
+				         (Delay forMilliseconds: 50) wait ] ] fork
+]
+
+{ #category : 'layout' }
+DSTimerWindow >> stopButton [
+	"Instanciates a new morph button that stops the recording and closes the window when clicked."
+
+	^ PluggableButtonMorph new
+		  label: (IconicListItemMorph new icon: (self iconNamed: #stop));
+		  model: DSRecordBrowser uniqueInstance;
+		  actionSelector: #stopRecording;
+		  position: 125 @ 4;
+		  yourself
+]
+
+{ #category : 'timer' }
+DSTimerWindow >> stopTimer [
+
+	running := false
+]
+
+{ #category : 'layout' }
+DSTimerWindow >> timeNowMorph [
+	"Instanciates a new morph that shows the actual time."
+
+	^ StringMorph new
+		  contents: Time now print24;
+		  position: 75 @ 6
+]
+
+{ #category : 'layout' }
+DSTimerWindow >> timerMorph [
+	"Insanciates a new morph that contains the seconds timer on the window."
+
+	^ StringMorph new
+		  contents: '00:00:000';
+		  position: 15 @ 6
+]
diff --git a/DebuggingSpy/DSAbstractBrowserRecord.class.st b/DebuggingSpy/DSAbstractBrowserRecord.class.st
index 62bf207..3564384 100644
--- a/DebuggingSpy/DSAbstractBrowserRecord.class.st
+++ b/DebuggingSpy/DSAbstractBrowserRecord.class.st
@@ -12,7 +12,7 @@ Class {
 { #category : 'testing' }
 DSAbstractBrowserRecord class >> isAbstract [
 
-	^ self == DSAbstractBrowserRecord
+	^ self = DSAbstractBrowserRecord
 ]
 
 { #category : 'actions api' }
diff --git a/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st b/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
index 25a9e12..5ddcfd3 100644
--- a/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
@@ -21,7 +21,7 @@ Class {
 { #category : 'testing' }
 DSAbstractDebugPointEventRecord class >> isAbstract [
 
-	^ self == DSAbstractDebugPointEventRecord
+	^ self = DSAbstractDebugPointEventRecord
 ]
 
 { #category : 'converting' }
diff --git a/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st b/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
index f6dc99f..e9b7d4e 100644
--- a/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
+++ b/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
@@ -12,5 +12,5 @@ Class {
 { #category : 'testing' }
 DSAbstractDebuggerActionRecord class >> isAbstract [
 
-	^ self == DSAbstractDebuggerActionRecord
+	^ self = DSAbstractDebuggerActionRecord
 ]
diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index 5dab13d..2ca3c1b 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -24,11 +24,12 @@ DSAbstractEventRecord class >> for: anObject [
 ]
 
 { #category : 'accessing' }
-DSAbstractEventRecord class >> getRecordClasses [
+DSAbstractEventRecord class >> getNonAbstractSubClasses [
+	"Returns a list of all non-abstract subclasses, representing all record classes."
 
 	| classes |
-	classes := (self subclasses reject: [ :c | c isAbstract ]) asOrderedCollection.
-	self subclasses do: [ :subclass | classes addAll: subclass getRecordClasses ].
+	classes := (self subclasses reject: [ :subclass | subclass isAbstract ]) asOrderedCollection.
+	self subclasses do: [ :subclass | classes addAll: subclass getNonAbstractSubClasses ].
 
 	^ classes
 ]
diff --git a/DebuggingSpy/DSAbstractExtendedRecord.class.st b/DebuggingSpy/DSAbstractExtendedRecord.class.st
index fd4bca8..fbe7276 100644
--- a/DebuggingSpy/DSAbstractExtendedRecord.class.st
+++ b/DebuggingSpy/DSAbstractExtendedRecord.class.st
@@ -20,7 +20,7 @@ DSAbstractExtendedRecord class >> for: anObject [
 { #category : 'testing' }
 DSAbstractExtendedRecord class >> isAbstract [
 
-	^ self == DSAbstractExtendedRecord
+	^ self = DSAbstractExtendedRecord
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSAbstractHaltRecord.class.st b/DebuggingSpy/DSAbstractHaltRecord.class.st
index b0bef19..6ee292d 100644
--- a/DebuggingSpy/DSAbstractHaltRecord.class.st
+++ b/DebuggingSpy/DSAbstractHaltRecord.class.st
@@ -16,7 +16,7 @@ Class {
 { #category : 'testing' }
 DSAbstractHaltRecord class >> isAbstract [
 
-	^ self == DSAbstractHaltRecord
+	^ self = DSAbstractHaltRecord
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSAbstractSindarinActionRecord.class.st b/DebuggingSpy/DSAbstractSindarinActionRecord.class.st
index b134a9a..d61e330 100644
--- a/DebuggingSpy/DSAbstractSindarinActionRecord.class.st
+++ b/DebuggingSpy/DSAbstractSindarinActionRecord.class.st
@@ -12,5 +12,5 @@ Class {
 { #category : 'testing' }
 DSAbstractSindarinActionRecord class >> isAbstract [
 
-	^ self == DSAbstractSindarinActionRecord
+	^ self = DSAbstractSindarinActionRecord
 ]
diff --git a/DebuggingSpy/DSAbstractTaskRecord.class.st b/DebuggingSpy/DSAbstractTaskRecord.class.st
index 5713acc..72e8f90 100644
--- a/DebuggingSpy/DSAbstractTaskRecord.class.st
+++ b/DebuggingSpy/DSAbstractTaskRecord.class.st
@@ -18,7 +18,7 @@ Class {
 { #category : 'testing' }
 DSAbstractTaskRecord class >> isAbstract [
 
-	^ self == DSAbstractTaskRecord
+	^ self = DSAbstractTaskRecord
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSClipboardActionRecord.class.st b/DebuggingSpy/DSClipboardActionRecord.class.st
index 135c76f..fa424c4 100644
--- a/DebuggingSpy/DSClipboardActionRecord.class.st
+++ b/DebuggingSpy/DSClipboardActionRecord.class.st
@@ -18,7 +18,7 @@ Class {
 { #category : 'testing' }
 DSClipboardActionRecord class >> isAbstract [
 
-	^ self == DSClipboardActionRecord
+	^ self = DSClipboardActionRecord
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSCodeActionRecord.class.st b/DebuggingSpy/DSCodeActionRecord.class.st
index 98396fe..099a922 100644
--- a/DebuggingSpy/DSCodeActionRecord.class.st
+++ b/DebuggingSpy/DSCodeActionRecord.class.st
@@ -16,7 +16,7 @@ Class {
 { #category : 'testing' }
 DSCodeActionRecord class >> isAbstract [
 
-	^ self == DSCodeActionRecord
+	^ self = DSCodeActionRecord
 ]
 
 { #category : 'actions api' }
diff --git a/DebuggingSpy/DSDebugPointRecord.class.st b/DebuggingSpy/DSDebugPointRecord.class.st
index dca6329..bb706cd 100644
--- a/DebuggingSpy/DSDebugPointRecord.class.st
+++ b/DebuggingSpy/DSDebugPointRecord.class.st
@@ -27,7 +27,7 @@ DSDebugPointRecord class >> debugpointremoved: event [
 { #category : 'testing' }
 DSDebugPointRecord class >> isAbstract [
 
-	^ self == DSDebugPointRecord
+	^ self = DSDebugPointRecord
 ]
 
 { #category : 'testing' }
diff --git a/DebuggingSpy/DSMethodDebugPointRecord.class.st b/DebuggingSpy/DSMethodDebugPointRecord.class.st
index 34d216d..33051fc 100644
--- a/DebuggingSpy/DSMethodDebugPointRecord.class.st
+++ b/DebuggingSpy/DSMethodDebugPointRecord.class.st
@@ -50,7 +50,7 @@ DSMethodDebugPointRecord class >> for: anEvent [
 { #category : 'testing' }
 DSMethodDebugPointRecord class >> isAbstract [
 
-	^ self == DSMethodDebugPointRecord 
+	^ self = DSMethodDebugPointRecord 
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSMethodEventRecord.class.st b/DebuggingSpy/DSMethodEventRecord.class.st
index 6869349..f6ad772 100644
--- a/DebuggingSpy/DSMethodEventRecord.class.st
+++ b/DebuggingSpy/DSMethodEventRecord.class.st
@@ -24,7 +24,7 @@ DSMethodEventRecord class >> added: aMethod [
 { #category : 'testing' }
 DSMethodEventRecord class >> isAbstract [
 
-	^ self == DSMethodEventRecord
+	^ self = DSMethodEventRecord
 ]
 
 { #category : 'instance creation' }
diff --git a/DebuggingSpy/DSMouseEventRecord.class.st b/DebuggingSpy/DSMouseEventRecord.class.st
index b0ed2e2..3b34266 100644
--- a/DebuggingSpy/DSMouseEventRecord.class.st
+++ b/DebuggingSpy/DSMouseEventRecord.class.st
@@ -19,7 +19,7 @@ Class {
 { #category : 'testing' }
 DSMouseEventRecord class >> isAbstract [
 
-	^ self == DSMouseEventRecord
+	^ self = DSMouseEventRecord
 ]
 
 { #category : 'actions api' }
diff --git a/DebuggingSpy/DSWindowEventRecord.class.st b/DebuggingSpy/DSWindowEventRecord.class.st
index cc06189..151b470 100644
--- a/DebuggingSpy/DSWindowEventRecord.class.st
+++ b/DebuggingSpy/DSWindowEventRecord.class.st
@@ -18,7 +18,7 @@ Class {
 { #category : 'testing' }
 DSWindowEventRecord class >> isAbstract [
 
-	^ self == DSWindowEventRecord
+	^ self = DSWindowEventRecord
 ]
 
 { #category : 'actions api' }
diff --git a/DebuggingSpy/DSWindowRecord.class.st b/DebuggingSpy/DSWindowRecord.class.st
index d0f895c..8e50f9c 100644
--- a/DebuggingSpy/DSWindowRecord.class.st
+++ b/DebuggingSpy/DSWindowRecord.class.st
@@ -106,7 +106,7 @@ DSWindowRecord >> events: anObject [
 { #category : 'accessing' }
 DSWindowRecord >> getWindowType [
 
-	toolInfos ifNotNil: [ ^ toolInfos first toolClassName ].
+	toolInfos ifNotNil: [ toolInfos ifNotEmpty: [ ^ toolInfos first toolClassName ] ].
 	type isString ifTrue: [ ^ type ].
 	^ 'External Window'
 ]

From ebc3aba31b23b94137eb130d29997b9fb1ab4457 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Mon, 2 Mar 2026 15:41:33 +0100
Subject: [PATCH 32/36] fix: in browser opening/closing tests

---
 DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index f4f86bf..4f8b72f 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -80,7 +80,7 @@ DSRecordBrowserTest >> setUp [
 { #category : 'running' }
 DSRecordBrowserTest >> tearDown [
 
-	DSRecordBrowser uniqueInstance window isOpen ifTrue: [ DSRecordBrowser uniqueInstance window close ].
+	DSRecordBrowser resetBrowser.
 	super tearDown
 ]
 
@@ -130,10 +130,9 @@ DSRecordBrowserTest >> testClosingBrowser [
 { #category : 'tests' }
 DSRecordBrowserTest >> testCreatingAndOpeningBrowser [
 
-	self deny: DSRecordBrowser uniqueInstance window isOpen.
 	DSRecordBrowser toggleBrowser.
-
-	self assert: DSRecordBrowser uniqueInstance window isOpen
+	self assert: DSRecordBrowser uniqueInstance window isOpen.
+	DSRecordBrowser toggleBrowser
 ]
 
 { #category : 'tests' }

From 2f28082b0d7980dbd16b0a9685e8229ab87af7e9 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 4 Mar 2026 10:15:04 +0100
Subject: [PATCH 33/36] =?UTF-8?q?fix:=20PR=20changes=20test:=20adding=20mo?=
 =?UTF-8?q?re=20tests=20for=20timerWindow=20|=C2=A0generating=20random=20r?=
 =?UTF-8?q?ecords=20for=20tests=20refactor:=20recorderWindow=20->=20timerW?=
 =?UTF-8?q?indow=20comment:=20adding=20comments=20where=20needed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DSRecordBrowserTest.class.st              | 41 ++++++++----
 .../DSRecorderWindowTest.class.st             | 51 ---------------
 .../DSTimerWindowTest.class.st                | 54 +++++++++++++++
 DebuggingSpy-Browser/DSRecordBrowser.class.st | 65 ++++++++++---------
 DebuggingSpy-Browser/DSTimerWindow.class.st   | 53 +++++++--------
 5 files changed, 138 insertions(+), 126 deletions(-)
 delete mode 100644 DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
 create mode 100644 DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index 4f8b72f..c5c6de8 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -2,8 +2,7 @@ Class {
 	#name : 'DSRecordBrowserTest',
 	#superclass : 'TestCase',
 	#instVars : [
-		'browser',
-		'logger'
+		'browser'
 	],
 	#category : 'DebuggingSpy-Browser-Tests',
 	#package : 'DebuggingSpy-Browser-Tests'
@@ -46,16 +45,16 @@ DSRecordBrowserTest >> generateRecordsFile [
 DSRecordBrowserTest >> getRecordForIndex: aNumber [
 	"Generates a record with specified number as dateTime (in seconds) and as windowId"
 
-	^ self recordClass new
+	^ (self recordClasses at: (Random new nextInteger: self recordClasses size)) new
 		  dateTime: (DateAndTime fromSeconds: aNumber);
 		  windowId: aNumber;
 		  yourself
 ]
 
 { #category : 'helpers' }
-DSRecordBrowserTest >> recordClass [
+DSRecordBrowserTest >> recordClasses [
 
-	^ DSMouseEnterWindowRecord
+	^ DSAbstractBrowserRecord getNonAbstractSubClasses
 ]
 
 { #category : 'helpers' }
@@ -116,7 +115,7 @@ DSRecordBrowserTest >> testBrowserEmpty [
 	self assertEmpty: browser files.
 	self assert: self filesPresenter items size equals: 0.
 	self assert: self filesPresenter selectedItem equals: nil.
-	
+	self assert: self recordsTablePresenter roots size equals: 0
 ]
 
 { #category : 'tests' }
@@ -138,17 +137,18 @@ DSRecordBrowserTest >> testCreatingAndOpeningBrowser [
 { #category : 'tests' }
 DSRecordBrowserTest >> testFilteringAClassOfRecords [
 
-	| fileRef history |
+	| fileRef history filteredClass |
 	fileRef := self generateRecordsFile.
 	history := browser getHistoryFrom: fileRef.
 
 	browser addFile: fileRef.
 	self assert: self recordsTablePresenter roots size equals: history records size.
 
-	self recordsFilterPresenter sourceList selectItem: self recordClass.
+	filteredClass := self recordsFilterPresenter sourceList items first.
+	self recordsFilterPresenter sourceList selectItem: filteredClass.
 	self recordsFilterPresenter addSelected.
-	
-	self assert: self recordsTablePresenter roots size equals: 0 "Since there is only one type of records in the generated file"
+
+	self recordsTablePresenter roots do: [ :association | self deny: association key class equals: filteredClass ]
 ]
 
 { #category : 'tests' }
@@ -184,7 +184,7 @@ DSRecordBrowserTest >> testGetRecordColorAssociationsFrom [
 	history windows do: [ :window |
 			window events do: [ :record |
 					self assert: (colorAssociations anySatisfy: [ :association |
-							 association key = record and: association value = (browser getWindowColorFrom: window) ]) ] ]
+							 association key = record and: [ association value = (browser getWindowColorFrom: window) ] ]) ] ]
 ]
 
 { #category : 'tests' }
@@ -220,16 +220,29 @@ DSRecordBrowserTest >> testRemoveLastFile [
 { #category : 'tests' }
 DSRecordBrowserTest >> testStartRecording [
 
-	self assert: browser recorderWindow isNil.
+	self assert: browser timerWindow isNil.
 	self deny: DSRecordRegistry autoSerialize.
 	self deny: DSSpy recordingSession.
 
 	browser startRecording.
 	self assert: DSSpy recordingSession.
 	self assert: DSRecordRegistry autoSerialize.
-	self deny: browser recorderWindow isNil.
+	self deny: browser timerWindow isNil.
+
+	browser stopRecording.
+	self deny: (self currentWorld submorphs includes: browser timerWindow)
+]
+
+{ #category : 'tests' }
+DSRecordBrowserTest >> testStopRecording [
+
+	| timerWindow |
+	browser startRecording.
+	timerWindow := browser timerWindow.
+	browser stopRecording.
 
-	browser stopRecording
+	self deny: (self currentWorld submorphs includes: timerWindow).
+	self assert: browser timerWindow isNil
 ]
 
 { #category : 'tests' }
diff --git a/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st b/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
deleted file mode 100644
index d74bc8f..0000000
--- a/DebuggingSpy-Browser-Tests/DSRecorderWindowTest.class.st
+++ /dev/null
@@ -1,51 +0,0 @@
-Class {
-	#name : 'DSRecorderWindowTest',
-	#superclass : 'TestCase',
-	#instVars : [
-		'window'
-	],
-	#category : 'DebuggingSpy-Browser-Tests',
-	#package : 'DebuggingSpy-Browser-Tests'
-}
-
-{ #category : 'running' }
-DSRecorderWindowTest >> setUp [
-	super setUp.
-	
-	window := DSTimerWindow new.
-]
-
-{ #category : 'tests' }
-DSRecorderWindowTest >> testEmptyTimerWindow [
-
-	self assert: (Time readFrom: self timerMorph contents readStream) seconds equals: 0
-]
-
-{ #category : 'tests' }
-DSRecorderWindowTest >> testTimeNow [
-
-	self assert: (Time readFrom: self timeNowMorph contents readStream) asSeconds equals: Time now asSeconds
-]
-
-{ #category : 'tests' }
-DSRecorderWindowTest >> testTimer [
-
-	window startTimer.
-	(Delay forMilliseconds: 1000) wait.
-	window stopTimer.
-	self assert: window elapsedTime equals: 1
-]
-
-{ #category : 'layout' }
-DSRecorderWindowTest >> timeNowMorph [
-	"Returns the window's timeNowMorph"
-
-	^ window readSlot: (DSTimerWindow slotNamed: #timeNowMorph)
-]
-
-{ #category : 'layout' }
-DSRecorderWindowTest >> timerMorph [
-	"Returns the window's timerMorph."
-
-	^ window readSlot: (DSTimerWindow slotNamed: #timerMorph)
-]
diff --git a/DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st b/DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st
new file mode 100644
index 0000000..7b6726b
--- /dev/null
+++ b/DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st
@@ -0,0 +1,54 @@
+Class {
+	#name : 'DSTimerWindowTest',
+	#superclass : 'TestCase',
+	#instVars : [
+		'timerWindow'
+	],
+	#category : 'DebuggingSpy-Browser-Tests',
+	#package : 'DebuggingSpy-Browser-Tests'
+}
+
+{ #category : 'layout' }
+DSTimerWindowTest >> currentTimeMorph [
+	"Returns the window's timeNowMorph"
+
+	^ timerWindow readSlot: (DSTimerWindow slotNamed: #currentTimeMorph)
+]
+
+{ #category : 'running' }
+DSTimerWindowTest >> setUp [
+	super setUp.
+	
+	timerWindow := DSTimerWindow new.
+]
+
+{ #category : 'tests' }
+DSTimerWindowTest >> testElapsedTime [
+
+	timerWindow startTimer.
+	DSSpy recordingSession: true.
+
+	(Delay forMilliseconds: 1000) wait.
+
+	DSSpy recordingSession: false.
+	self assert: timerWindow elapsedTime equals: 1
+]
+
+{ #category : 'tests' }
+DSTimerWindowTest >> testEmptyTimerMorph [
+
+	self assert: (Time readFrom: self timerMorph contents readStream) seconds equals: 0
+]
+
+{ #category : 'tests' }
+DSTimerWindowTest >> testTimeNowMorph [
+
+	self assert: (Time readFrom: self currentTimeMorph contents readStream) asSeconds equals: Time now asSeconds
+]
+
+{ #category : 'layout' }
+DSTimerWindowTest >> timerMorph [
+	"Returns the window's timerMorph."
+
+	^ timerWindow readSlot: (DSTimerWindow slotNamed: #timerMorph)
+]
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index 497628a..863bc17 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -1,9 +1,8 @@
 "
-Debugging Spy main interface thats includes :
-- an interface that could be opened with a button on the topside bar 
-- a button that adds files to the list displayed on the interface
-- a button to start the instrumentation and another to stop it
-- an interface that shows the content of a selected file
+Debugging Spy main interface which includes :
+- an opening button on the topside bar of the Pharo IDE
+- buttons to start/stop the system instrumentation
+- a window to visualize data from recording files
 "
 Class {
 	#name : 'DSRecordBrowser',
@@ -47,7 +46,7 @@ DSRecordBrowser class >> resetBrowser [
 
 { #category : 'open/close' }
 DSRecordBrowser class >> toggleBrowser [
-	"Opens the browser or closes it depending on its state. If it needs to be created, then creates and opens it. See uniqueInstance method."
+	"Opens the browser or closes it depending on its state. If it needs to be created, then creates and opens it."
 
 	uniqueInstance ifNotNil: [
 			^ uniqueInstance window isOpen
@@ -58,6 +57,7 @@ DSRecordBrowser class >> toggleBrowser [
 
 { #category : 'accessing' }
 DSRecordBrowser class >> uniqueInstance [
+	"Returns the unique browser instance and instanciates it if needed."
 
 	^ uniqueInstance ifNil: [ uniqueInstance := self new ]
 ]
@@ -76,7 +76,7 @@ DSRecordBrowser >> addFile: aFileReference [
 
 { #category : 'layout' }
 DSRecordBrowser >> addRecordButton [
-	"Layout button that opens a file selecting window."
+	"Layout button which opens a window for selecting files."
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Add';
@@ -117,7 +117,7 @@ DSRecordBrowser >> defaultLayout [
 
 { #category : 'layout' }
 DSRecordBrowser >> fileList [
-	"Instanciates a new presenter for the added files list."
+	"Instanciates a new presenter with a list of added files."
 
 	^ self newList
 		  items: self files;
@@ -134,25 +134,26 @@ DSRecordBrowser >> files [
 
 { #category : 'layout' }
 DSRecordBrowser >> filterRecordsButton [
-	"Instanciates a new layout button that opens the records filter window."
+	"Instanciates a new layout button which opens the records' filter window."
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Filter';
 		  icon: (self iconNamed: #diff);
-		  help: 'Filter the records.';
+		  help: 'Filter records.';
 		  action: [ recordsFilter open ];
 		  yourself
 ]
 
 { #category : 'helpers' }
 DSRecordBrowser >> getHistoryFrom: aFileReference [
+	"Returns the generated history using the specified file reference which should countains DSSpy records."
 
 	^ DSRecordHistory on: (DSSpy materialize: aFileReference)
 ]
 
 { #category : 'helpers' }
 DSRecordBrowser >> getRecordColorAssociationsFrom: aWindowRecordCollection [
-	"Returns a dictionary associating each reacord with its window corresponding color, sorted by each reacord dateTime."
+	"Returns a dictionary associating each record with its window's corresponding color, sorted by record's dateTime."
 
 	| recordColorsDictionary |
 	recordColorsDictionary := Dictionary new.
@@ -208,7 +209,7 @@ DSRecordBrowser >> initializePresenters [
 
 { #category : 'operations' }
 DSRecordBrowser >> listAddedFilesActions [
-	"List actions for the added files in browser, such as inspecting raw records, inspecting history, or removing the selected file from the list."
+	"Returns a list of actions for the list of added files. Action are: inspecting raw records, inspecting history, or removing the selected file from the list."
 
 	^ SpActionGroup new
 		  addActionWith: [ :anItem |
@@ -237,7 +238,7 @@ DSRecordBrowser >> listAddedFilesActions [
 
 { #category : 'operations' }
 DSRecordBrowser >> openAddFileDialog [
-	"Opens a dialog where the user can select a file to be addded into the presenter."
+	"Opens a dialog where the user can select a file to add in the browser."
 
 	| newFiles |
 	newFiles := StOpenFilePresenter new
@@ -247,20 +248,16 @@ DSRecordBrowser >> openAddFileDialog [
 	newFiles ifNotNil: [ newFiles do: [ :file | self addFile: file asFileReference ] ]
 ]
 
-{ #category : 'accessing' }
-DSRecordBrowser >> recorderWindow [
-
-	^ timerWindow
-]
-
 { #category : 'layout' }
 DSRecordBrowser >> recordsFilter [
+	"Instanciates a new chooser that displays every record classes that could be used to filter records in table."
 
-	^ SpChooserPresenter new sourceItems: DSAbstractEventRecord getNonAbstractSubClasses 
+	^ SpChooserPresenter new sourceItems: DSAbstractEventRecord getNonAbstractSubClasses
 ]
 
 { #category : 'layout' }
 DSRecordBrowser >> recordsTable [
+	"Instanciates a new records table that displays data based on the selected file's records."
 
 	^ self newTreeTable
 		  addColumn: (SpStringTableColumn new
@@ -288,7 +285,7 @@ DSRecordBrowser >> recordsTable [
 
 { #category : 'operations' }
 DSRecordBrowser >> recordsTableActions [
-	"List actions that can be done on a record in the table, such as inspecting it."
+	"Return a list of actions which can be done on a record from the table. For example, inspect the selected record."
 
 	^ SpActionGroup new
 		  addActionWith: [ :anItem |
@@ -303,6 +300,7 @@ DSRecordBrowser >> recordsTableActions [
 
 { #category : 'files' }
 DSRecordBrowser >> removeFile: aFileReference [
+	"Removes the selected file from the list and updates the selected item depending on the list number of elements."
 
 	files := files reject: [ :fileReference | fileReference = aFileReference ].
 	fileListPresenter items: self files.
@@ -311,6 +309,7 @@ DSRecordBrowser >> removeFile: aFileReference [
 
 { #category : 'layout' }
 DSRecordBrowser >> startRecordButton [
+	"Instanciates a button that starts the DSSpy recording when clicked."
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Start';
@@ -323,10 +322,10 @@ DSRecordBrowser >> startRecordButton [
 
 { #category : 'recording' }
 DSRecordBrowser >> startRecording [
-	"Starts recording events and instianciates a new RecorderWindow that displays a timer and shows that Debugging Spy is recordering."
+	"Starts recording events and instianciates a timerWindow which displays a timer and shows that Debugging Spy is recordering."
 
 	timerWindow := DSTimerWindow new.
-	timerWindow 
+	timerWindow
 		openInWorld;
 		startTimer.
 	DSSpyInstrumenter instrumentSystem.
@@ -335,6 +334,7 @@ DSRecordBrowser >> startRecording [
 
 { #category : 'layout' }
 DSRecordBrowser >> stopRecordButton [
+	"Instanciates a button that stops the DSSpy record when clicked."
 
 	^ SpToolbarButtonPresenter new
 		  label: 'Stop';
@@ -347,16 +347,17 @@ DSRecordBrowser >> stopRecordButton [
 
 { #category : 'recording' }
 DSRecordBrowser >> stopRecording [
-	"Stops the recording session and closes the RecorderWindow."
+	"Stops the recording session and closes the timer window."
 
 	DSSpyInstrumenter stopInstrumentation.
-	timerWindow stopTimer.
 	self currentWorld removeMorph: timerWindow.
-	self updateToolbar
+	self updateToolbar.
+	timerWindow := nil
 ]
 
 { #category : 'layout' }
 DSRecordBrowser >> timelineChart [
+	"Returns a chart that represents a timeline using the file list presenter's data for its plots."
 
 	| history names chart data |
 	fileListPresenter selectedItem ifNil: [ ^ nil ].
@@ -376,14 +377,18 @@ DSRecordBrowser >> timelineChart [
 		useNiceLabel;
 		numberOfTicks: history windows size // 2;
 		useDiagonalLabel;
-		labelConversion: [ :v | (DateAndTime fromSeconds: v // 1000000000) asTime ]. 
-		
-		"Plots are instancied using their dateTime as nano seconds to prevent events that last less than a second to be hided, so we convert them into seconds to get the label."
+		labelConversion: [ :v | (DateAndTime fromSeconds: v // 1000000000) asTime ]. "Plots are instancied using their dateTime as nano seconds to prevent events which last less than a second to be hided, so we convert them into seconds to get the label."
 
 	chart build.
 	^ chart
 ]
 
+{ #category : 'accessing' }
+DSRecordBrowser >> timerWindow [
+
+	^ timerWindow
+]
+
 { #category : 'layout' }
 DSRecordBrowser >> toolbar [
 	"Instanciates a new toolbar to be displayed on layout."
@@ -397,7 +402,7 @@ DSRecordBrowser >> toolbar [
 
 { #category : 'operations' }
 DSRecordBrowser >> updateRecordsTable: filesPresenter [
-	"Updates the records presenter and add to each record its corresponding color."
+	"Updates the records' table presenter and add to each record its corresponding color."
 
 	| fileRef recordColorAssociations |
 	recordColorAssociations := Array new.
diff --git a/DebuggingSpy-Browser/DSTimerWindow.class.st b/DebuggingSpy-Browser/DSTimerWindow.class.st
index efb4d62..a91e056 100644
--- a/DebuggingSpy-Browser/DSTimerWindow.class.st
+++ b/DebuggingSpy-Browser/DSTimerWindow.class.st
@@ -1,15 +1,13 @@
 "
-This class is a window displaying some informations while DebuggingSpy is recording.
+I am a window displaying timer while DebuggingSpy is recording.
 "
 Class {
 	#name : 'DSTimerWindow',
 	#superclass : 'SystemWindow',
 	#instVars : [
 		'timerMorph',
-		'running',
 		'startTime',
-		'timer',
-		'timeNowMorph'
+		'currentTimeMorph'
 	],
 	#category : 'DebuggingSpy-Browser',
 	#package : 'DebuggingSpy-Browser'
@@ -17,15 +15,15 @@ Class {
 
 { #category : 'initialization' }
 DSTimerWindow >> buildUI [
-	"Builds the windows UI that contains : an icon that shows that Debugging Spy is recording, a chronometer, a timer that shows actual time and a stop recording button."
+	"Builds the windows UI, it contains : an icon which shows that Debugging Spy is recording, a chronometer, a timer with current time and a stop recording button."
 
 	timerMorph := self timerMorph.
-	timeNowMorph := self timeNowMorph.
+	currentTimeMorph := self currentTimeMorph.
 
 	self
 		addMorph: self recordingIcon;
 		addMorph: timerMorph;
-		addMorph: timeNowMorph;
+		addMorph: currentTimeMorph;
 		addMorph: self stopButton
 ]
 
@@ -35,6 +33,15 @@ DSTimerWindow >> collapseOrExpand [
 	^ self
 ]
 
+{ #category : 'layout' }
+DSTimerWindow >> currentTimeMorph [
+	"Instanciates a new morph that shows the actual time."
+
+	^ StringMorph new
+		  contents: Time now print24;
+		  position: 75 @ 6
+]
+
 { #category : 'timer' }
 DSTimerWindow >> elapsedTime [
 	"Returns the elapsed time since the timer's start."
@@ -46,7 +53,6 @@ DSTimerWindow >> elapsedTime [
 DSTimerWindow >> initialize [
 
 	super initialize.
-	running := false.
 	self minimumExtent: self size.
 	self initializeProperties.
 	self buildUI
@@ -56,7 +62,7 @@ DSTimerWindow >> initialize [
 DSTimerWindow >> initializeProperties [
 
 	self
-		setLabel: 'DSSpy recorder';
+		setLabel: 'DSSpy timer';
 		extent: self size;
 		beSticky;
 		makeUnclosable;
@@ -104,16 +110,16 @@ DSTimerWindow >> size [
 
 { #category : 'timer' }
 DSTimerWindow >> startTimer [
+	"Starts a new process for the timer."
 
-	running ifTrue: [ ^ self ].
+	DSSpy recordingSession ifTrue: [ ^ self ].
 
 	startTime := Time current asSeconds.
-	running := true.
-	timer := [
-		         [ running ] whileTrue: [
-				         timerMorph contents: (Time fromSeconds: self elapsedTime) print24.
-				         timeNowMorph contents: Time now print24.
-				         (Delay forMilliseconds: 50) wait ] ] fork
+	[
+		[ DSSpy recordingSession ] whileTrue: [
+				timerMorph contents: (Time fromSeconds: self elapsedTime) print24.
+				currentTimeMorph contents: Time now print24.
+				(Delay forMilliseconds: 50) wait ] ] fork
 ]
 
 { #category : 'layout' }
@@ -128,21 +134,6 @@ DSTimerWindow >> stopButton [
 		  yourself
 ]
 
-{ #category : 'timer' }
-DSTimerWindow >> stopTimer [
-
-	running := false
-]
-
-{ #category : 'layout' }
-DSTimerWindow >> timeNowMorph [
-	"Instanciates a new morph that shows the actual time."
-
-	^ StringMorph new
-		  contents: Time now print24;
-		  position: 75 @ 6
-]
-
 { #category : 'layout' }
 DSTimerWindow >> timerMorph [
 	"Insanciates a new morph that contains the seconds timer on the window."

From b1fccaad43a50fcd75cf3d157e27fcde1d7c7616 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 4 Mar 2026 10:59:54 +0100
Subject: [PATCH 34/36] fix: current time is always updated, and timer works
 only when recording refactor: getRecordColorAssociationsFrom now uses a
 collection of associations

---
 .../DSTimerWindowTest.class.st                |  2 +-
 DebuggingSpy-Browser/DSRecordBrowser.class.st | 16 ++++++------
 DebuggingSpy-Browser/DSTimerWindow.class.st   | 25 ++++++++++++-------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st b/DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st
index 7b6726b..c4a1038 100644
--- a/DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st
@@ -25,8 +25,8 @@ DSTimerWindowTest >> setUp [
 { #category : 'tests' }
 DSTimerWindowTest >> testElapsedTime [
 
-	timerWindow startTimer.
 	DSSpy recordingSession: true.
+	timerWindow startTimer.
 
 	(Delay forMilliseconds: 1000) wait.
 
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index 863bc17..09863d5 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -153,15 +153,16 @@ DSRecordBrowser >> getHistoryFrom: aFileReference [
 
 { #category : 'helpers' }
 DSRecordBrowser >> getRecordColorAssociationsFrom: aWindowRecordCollection [
-	"Returns a dictionary associating each record with its window's corresponding color, sorted by record's dateTime."
+	"Returns a sorted collection associating each record with its window's corresponding color, sorted by record's dateTime."
 
-	| recordColorsDictionary |
-	recordColorsDictionary := Dictionary new.
+	| recordColorsAssociations |
+	recordColorsAssociations := OrderedCollection new.
 
 	aWindowRecordCollection do: [ :windowRecord |
-		windowRecord events do: [ :record | recordColorsDictionary at: record put: (self getWindowColorFrom: windowRecord) ] ].
+			recordColorsAssociations addAll:
+				(windowRecord events collect: [ :record | Association key: record value: (self getWindowColorFrom: windowRecord) ]) ].
 
-	^ recordColorsDictionary associations sorted: [ :recordA :recordB | recordA key dateTime < recordB key dateTime ]
+	^ recordColorsAssociations sorted: [ :recordA :recordB | recordA key dateTime < recordB key dateTime ]
 ]
 
 { #category : 'helpers' }
@@ -325,10 +326,9 @@ DSRecordBrowser >> startRecording [
 	"Starts recording events and instianciates a timerWindow which displays a timer and shows that Debugging Spy is recordering."
 
 	timerWindow := DSTimerWindow new.
-	timerWindow
-		openInWorld;
-		startTimer.
+	timerWindow openInWorld.
 	DSSpyInstrumenter instrumentSystem.
+	timerWindow startTimer.
 	self updateToolbar
 ]
 
diff --git a/DebuggingSpy-Browser/DSTimerWindow.class.st b/DebuggingSpy-Browser/DSTimerWindow.class.st
index a91e056..ddd9997 100644
--- a/DebuggingSpy-Browser/DSTimerWindow.class.st
+++ b/DebuggingSpy-Browser/DSTimerWindow.class.st
@@ -46,6 +46,7 @@ DSTimerWindow >> currentTimeMorph [
 DSTimerWindow >> elapsedTime [
 	"Returns the elapsed time since the timer's start."
 
+	startTime ifNil: [ ^ 0 ].
 	^ Time current asSeconds - startTime
 ]
 
@@ -55,7 +56,8 @@ DSTimerWindow >> initialize [
 	super initialize.
 	self minimumExtent: self size.
 	self initializeProperties.
-	self buildUI
+	self buildUI.
+	self initializeTimers
 ]
 
 { #category : 'initialization' }
@@ -71,6 +73,17 @@ DSTimerWindow >> initializeProperties [
 		beUnresizeable
 ]
 
+{ #category : 'initialization' }
+DSTimerWindow >> initializeTimers [
+	"Creates a new process that displays the current time even if the timer is not started. The timer would be updated whenever the record session starts."
+
+	[
+		[ true ] whileTrue: [
+				DSSpy recordingSession ifTrue: [ timerMorph contents: (Time fromSeconds: self elapsedTime) print24 ].
+				currentTimeMorph contents: Time now print24.
+				(Delay forMilliseconds: 50) wait ] ] fork
+]
+
 { #category : 'accessing' }
 DSTimerWindow >> margin [
 	"Space around the window"
@@ -112,14 +125,8 @@ DSTimerWindow >> size [
 DSTimerWindow >> startTimer [
 	"Starts a new process for the timer."
 
-	DSSpy recordingSession ifTrue: [ ^ self ].
-
-	startTime := Time current asSeconds.
-	[
-		[ DSSpy recordingSession ] whileTrue: [
-				timerMorph contents: (Time fromSeconds: self elapsedTime) print24.
-				currentTimeMorph contents: Time now print24.
-				(Delay forMilliseconds: 50) wait ] ] fork
+	DSSpy recordingSession ifFalse: [ ^ self ].
+	startTime := Time current asSeconds
 ]
 
 { #category : 'layout' }

From a542e1b81dd785c9f9525c54ffd0f05dcedd0d39 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 4 Mar 2026 11:03:44 +0100
Subject: [PATCH 35/36] fix: browser needs window to be opened

---
 DebuggingSpy-Browser/DSRecordBrowser.class.st | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index 09863d5..568a175 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -49,9 +49,10 @@ DSRecordBrowser class >> toggleBrowser [
 	"Opens the browser or closes it depending on its state. If it needs to be created, then creates and opens it."
 
 	uniqueInstance ifNotNil: [
-			^ uniqueInstance window isOpen
-				  ifTrue: [ uniqueInstance window close ]
-				  ifFalse: [ uniqueInstance window open ] ].
+			uniqueInstance hasWindow ifTrue: [
+					^ uniqueInstance window isOpen
+						  ifTrue: [ uniqueInstance window close ]
+						  ifFalse: [ uniqueInstance window open ] ] ].
 	self uniqueInstance open
 ]
 

From bf80a0cb66c93f5e106ce768e49cc0c0e1de3126 Mon Sep 17 00:00:00 2001
From: Nicolas Potel <nicolas.potel@inria.fr>
Date: Wed, 4 Mar 2026 11:28:10 +0100
Subject: [PATCH 36/36] refactoring: getNonAbstractSubclasses ->
 getLeafSubClasses

---
 .../DSRecordBrowserTest.class.st                      |  2 +-
 DebuggingSpy-Browser/DSRecordBrowser.class.st         |  2 +-
 DebuggingSpy/DSAbstractEventRecord.class.st           | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
index c5c6de8..b70981d 100644
--- a/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
+++ b/DebuggingSpy-Browser-Tests/DSRecordBrowserTest.class.st
@@ -54,7 +54,7 @@ DSRecordBrowserTest >> getRecordForIndex: aNumber [
 { #category : 'helpers' }
 DSRecordBrowserTest >> recordClasses [
 
-	^ DSAbstractBrowserRecord getNonAbstractSubClasses
+	^ DSAbstractBrowserRecord getLeafSubClasses
 ]
 
 { #category : 'helpers' }
diff --git a/DebuggingSpy-Browser/DSRecordBrowser.class.st b/DebuggingSpy-Browser/DSRecordBrowser.class.st
index 568a175..aeaff2b 100644
--- a/DebuggingSpy-Browser/DSRecordBrowser.class.st
+++ b/DebuggingSpy-Browser/DSRecordBrowser.class.st
@@ -254,7 +254,7 @@ DSRecordBrowser >> openAddFileDialog [
 DSRecordBrowser >> recordsFilter [
 	"Instanciates a new chooser that displays every record classes that could be used to filter records in table."
 
-	^ SpChooserPresenter new sourceItems: DSAbstractEventRecord getNonAbstractSubClasses
+	^ SpChooserPresenter new sourceItems: DSAbstractEventRecord getLeafSubClasses
 ]
 
 { #category : 'layout' }
diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index 2ca3c1b..9e0f049 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -24,12 +24,17 @@ DSAbstractEventRecord class >> for: anObject [
 ]
 
 { #category : 'accessing' }
-DSAbstractEventRecord class >> getNonAbstractSubClasses [
+DSAbstractEventRecord class >> getLeafSubClasses [
 	"Returns a list of all non-abstract subclasses, representing all record classes."
 
 	| classes |
-	classes := (self subclasses reject: [ :subclass | subclass isAbstract ]) asOrderedCollection.
-	self subclasses do: [ :subclass | classes addAll: subclass getNonAbstractSubClasses ].
+	classes := OrderedCollection new.
+	self subclasses do: [ :subclass |
+			subclass subclasses isEmpty
+				ifTrue: [ classes add: subclass ]
+				ifFalse: [
+						subclass = DSDoItRecord ifTrue: [ classes add: subclass ].
+						classes addAll: subclass getLeafSubClasses ] ].
 
 	^ classes
 ]