From 36024fea0a1e8feb017f86864c439d49bd24b267 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 8 Dec 2025 15:09:31 +0100
Subject: [PATCH 01/49] fix(WindowEvents): delete records linked to openning

---
 .../DSAbstractDebugPointEventRecord.class.st  |  1 -
 DebuggingSpy/DSAbstractEventRecord.class.st   |  3 +-
 .../DSPlaygroundOpenedRecord.class.st         | 20 -----------
 DebuggingSpy/DSPlaygroundReadRecord.class.st  | 26 --------------
 DebuggingSpy/DSPlaygroundRecord.class.st      | 21 -----------
 DebuggingSpy/DSPlaygroundWriteRecord.class.st | 25 -------------
 DebuggingSpy/DSSpyInstrumenter.class.st       | 35 ++-----------------
 7 files changed, 4 insertions(+), 127 deletions(-)
 delete mode 100644 DebuggingSpy/DSPlaygroundOpenedRecord.class.st
 delete mode 100644 DebuggingSpy/DSPlaygroundReadRecord.class.st
 delete mode 100644 DebuggingSpy/DSPlaygroundRecord.class.st
 delete mode 100644 DebuggingSpy/DSPlaygroundWriteRecord.class.st

diff --git a/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st b/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
index 2863995..7957707 100644
--- a/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractDebugPointEventRecord.class.st
@@ -9,7 +9,6 @@ Class {
 		'target',
 		'behaviors',
 		'arguments',
-		'link',
 		'enabled',
 		'eventName',
 		'debugPointHash'
diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index 5e6924f..3913fc4 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -7,7 +7,8 @@ Class {
 	#instVars : [
 		'dateTime',
 		'windowId',
-		'uuid'
+		'uuid',
+		'link'
 	],
 	#category : 'DebuggingSpy-Records',
 	#package : 'DebuggingSpy',
diff --git a/DebuggingSpy/DSPlaygroundOpenedRecord.class.st b/DebuggingSpy/DSPlaygroundOpenedRecord.class.st
deleted file mode 100644
index 3a42b99..0000000
--- a/DebuggingSpy/DSPlaygroundOpenedRecord.class.st
+++ /dev/null
@@ -1,20 +0,0 @@
-"
-I record that a StPlayground opened.
-"
-Class {
-	#name : 'DSPlaygroundOpenedRecord',
-	#superclass : 'DSPlaygroundRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSPlaygroundOpenedRecord >> eventName [
-	^'Playground open' 
-]
-
-{ #category : 'accessing - structure variables' }
-DSPlaygroundOpenedRecord >> glyph [
-	^'P'
-]
diff --git a/DebuggingSpy/DSPlaygroundReadRecord.class.st b/DebuggingSpy/DSPlaygroundReadRecord.class.st
deleted file mode 100644
index 17e2ab7..0000000
--- a/DebuggingSpy/DSPlaygroundReadRecord.class.st
+++ /dev/null
@@ -1,26 +0,0 @@
-"
-I record that a mouse entered a StPlayground's code, which may indicate that the developer is reading the code.
-"
-Class {
-	#name : 'DSPlaygroundReadRecord',
-	#superclass : 'DSPlaygroundRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSPlaygroundReadRecord >> context [
-	^'Reading code'
-]
-
-{ #category : 'accessing' }
-DSPlaygroundReadRecord >> eventName [
-
-	^ 'Playground read'
-]
-
-{ #category : 'accessing - structure variables' }
-DSPlaygroundReadRecord >> glyph [
-	^'PR'
-]
diff --git a/DebuggingSpy/DSPlaygroundRecord.class.st b/DebuggingSpy/DSPlaygroundRecord.class.st
deleted file mode 100644
index 0f7931f..0000000
--- a/DebuggingSpy/DSPlaygroundRecord.class.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-I record events that happens in a StPlayground.
-I do not really serve any purpose as an abstract class, but I'm just there to provide quick access to my subclasses' instances.
-"
-Class {
-	#name : 'DSPlaygroundRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing - structure variables' }
-DSPlaygroundRecord >> glyphColor [ 
-	^Color blue darker
-]
-
-{ #category : 'actions api' }
-DSPlaygroundRecord >> record: aPresenter [
-	super record: aPresenter window window
-]
diff --git a/DebuggingSpy/DSPlaygroundWriteRecord.class.st b/DebuggingSpy/DSPlaygroundWriteRecord.class.st
deleted file mode 100644
index 2ba6af7..0000000
--- a/DebuggingSpy/DSPlaygroundWriteRecord.class.st
+++ /dev/null
@@ -1,25 +0,0 @@
-"
-I record that the developer is typing in an StPlayground.
-"
-Class {
-	#name : 'DSPlaygroundWriteRecord',
-	#superclass : 'DSPlaygroundRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSPlaygroundWriteRecord >> context [
-	^'Writing code'
-]
-
-{ #category : 'accessing' }
-DSPlaygroundWriteRecord >> eventName [
-	^'Playground write' 
-]
-
-{ #category : 'accessing - structure variables' }
-DSPlaygroundWriteRecord >> glyph [
-	^'PW'
-]
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index c8e5a06..05c562a 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -113,22 +113,6 @@ DSSpyInstrumenter >> instrumentDebuggerCommands [
 	
 ]
 
-{ #category : 'debugger' }
-DSSpyInstrumenter >> instrumentDebuggerOpening [
-
-	StDebugger compile: 'initializeWindow: aWindowPresenter
-	
-	super initializeWindow: aWindowPresenter.
-	aWindowPresenter
-		initialPosition: self settings lastKnownPosition;
-		whenClosedDo: [ self clear ].
-
-	self settings initializeWindow: aWindowPresenter.
-	self initializeShortcuts: aWindowPresenter.
-	
-	[DSDebuggerOpeningRecord for: self ] on: Error do:[:err| DSSpy log: err key: #DEBUGGER_STACK ]	'
-]
-
 { #category : 'debugger' }
 DSSpyInstrumenter >> instrumentDebuggerStack [
 
@@ -316,17 +300,6 @@ DSSpyInstrumenter >> instrumentNavigateAttribute [
 				do: [ :err | DSSpy log: #ERROR key: #INSPECTOR_OBSERVE ] ] ]'
 ]
 
-{ #category : 'playground' }
-DSSpyInstrumenter >> instrumentPlaygroundCode [
-
-	StPlaygroundPresenter class compile: 'open 
-	<script>
-	|pg|
-	pg := (self newApplication: StPharoApplication current) open.
-	[DSPlaygroundOpenedRecord for: pg] on: Error do:[:err| DSSpy log: err key: #PLAYGROUND_OPEN ].
-	^pg'
-]
-
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentRubEditorCopySelection [
 
@@ -653,7 +626,6 @@ DSSpyInstrumenter >> instrumentSystem [
 	self logHaltAndBreakpointEvents.
 	self logInspectorInteractions.
 	self logMouseEvents.
-	"self logPlaygroundOpenings."
 	self listenToWindowEvents.
 	self listenToMethodChanges
 ]
@@ -678,6 +650,8 @@ DSSpyInstrumenter >> listenToMethodChanges [
 DSSpyInstrumenter >> listenToWindowEvents [
 
 	self currentWorld announcer when: WindowOpened send: #logWindowOpened: to: DSSpy.
+	self currentWorld announcer when: WindowClosed send: #logWindowClosed: to: DSSpy.
+	self currentWorld announcer when: WindowActivated send: #logWindowActivated: to: DSSpy
 ]
 
 { #category : 'system-instrumentation' }
@@ -737,11 +711,6 @@ DSSpyInstrumenter >> logMouseEvents [
 	self instrumentRubScrollTextMorphMouseEnter
 ]
 
-{ #category : 'system-instrumentation' }
-DSSpyInstrumenter >> logPlaygroundOpenings [
-	self instrumentPlaygroundCode
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logTextEditorsClipbardActions [
 

From 58278ae26de7f90f48401051017fc71ac4275aa6 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Tue, 9 Dec 2025 11:46:40 +0100
Subject: [PATCH 02/49] refactor(printIt): use MetaLink to instrument printIt
 methods, still wip

---
 DebuggingSpy/DSCodeActionRecord.class.st |  13 +-
 DebuggingSpy/DSSpyInstrumenter.class.st  | 167 +++--------------------
 2 files changed, 27 insertions(+), 153 deletions(-)

diff --git a/DebuggingSpy/DSCodeActionRecord.class.st b/DebuggingSpy/DSCodeActionRecord.class.st
index 56a4ef7..28cf574 100644
--- a/DebuggingSpy/DSCodeActionRecord.class.st
+++ b/DebuggingSpy/DSCodeActionRecord.class.st
@@ -13,13 +13,22 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'accessing' }
+DSCodeActionRecord class >> link [
+	^ MetaLink new
+		metaObject: self;
+		selector: #for:;
+		arguments: #(object);
+		control: #before
+]
+
 { #category : 'actions api' }
 DSCodeActionRecord >> record: aCodeString [
 
-	selectedString := DSSpy recordSourceCode
+	"selectedString := DSSpy recordSourceCode
 		                  ifTrue: [ aCodeString ]
 		                  ifFalse: [ 
-		                  DSSpy recordSourceCodeDisabledErrorMessage ]
+		                  DSSpy recordSourceCodeDisabledErrorMessage ]"
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 05c562a..7c56f06 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -16,22 +16,6 @@ DSSpyInstrumenter class >> instrumentSystem [
 	DSRecordRegistry autoSerialize: true
 ]
 
-{ #category : 'browsers' }
-DSSpyInstrumenter >> instrumentClyFullBrowser [
-
-	ClyFullBrowserMorph compile: 'newWindowTitle
-	| newTitle |
-	
-	packageView selection isEmpty ifTrue: [ ^self systemScope description].	
-	
-	newTitle := self buildTitleFromSelections.
-	self systemScope isCurrentImage ifFalse: [ 
-		newTitle := newTitle , '' in '', self systemScope description ].
-
-	[DSFullBrowseRecord for: self] on: Error do: [DSSpy log: #ERROR key: #BROWSE].
-	^newTitle'
-]
-
 { #category : 'browsers' }
 DSSpyInstrumenter >> instrumentClyQueryBrowser [
 
@@ -47,33 +31,6 @@ DSSpyInstrumenter >> instrumentClyQueryBrowser [
 	^title'
 ]
 
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentClyTextEditorPrintIt [
-
-	ClyTextEditor compile: 'printIt
-	"Treat the current text selection as an expression; evaluate it. Insert the 
-	description of the result of evaluation after the selection and then make 
-	this description the new text selection."
-
-	| pointerArea |
-	[DSPrintItRecord for: self selectionString] on: Error do:[:e| DSSpy log: #ERROR key: #ACTION_PRINTIT ].
-	self evaluateSelectionAndDo: [ :result |
-		| popoverPresenter |
-		pointerArea := textArea cursor boundsInWorld.
-
-		popoverPresenter := SpPopoverPresenter new presenter:
-			                    (SpCodePopoverPrintPresenter
-				                     newCode: self
-				                     object: result).
-		popoverPresenter relativeTo: (SpPresenter new
-				 layout: SpBoxLayout new;
-				 build;
-				 yourself).
-		popoverPresenter bePositionRight.
-		popoverPresenter popupPointingTo: pointerArea.
-		popoverPresenter takeKeyboardFocus ]'
-]
-
 { #category : 'debugger' }
 DSSpyInstrumenter >> instrumentCodePresenter [
 
@@ -300,6 +257,15 @@ DSSpyInstrumenter >> instrumentNavigateAttribute [
 				do: [ :err | DSSpy log: #ERROR key: #INSPECTOR_OBSERVE ] ] ]'
 ]
 
+{ #category : 'as yet unclassified' }
+DSSpyInstrumenter >> instrumentPrintIt [
+	"Instruments different printIt methods"
+
+	RubSmalltalkEditor link: DSPrintItRecord link toAST: (RubSmalltalkEditor >> #printIt) ast.
+	ClyTextEditor link: DSPrintItRecord link toAST: (ClyTextEditor >> #printIt) ast.
+	SpCodePrintItCommand link: DSPrintItRecord link toAST: (SpCodePrintItCommand >> #execute) ast
+]
+
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentRubEditorCopySelection [
 
@@ -313,34 +279,6 @@ RubTextEditor compile: 'copySelection
 '
 ]
 
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentRubEditorDebugIt [
-
-RubSmalltalkEditor compile: 'debug: aStream
-	| method receiver context |
-	[DSDebugItRecord for: aStream contents] on: Error do:[:e| DSSpy log: #ERROR key: #ACTION_DEBUGIT ].
-	receiver := self doItReceiver.
-	context := self doItContext.
-	method := self compile: aStream for: receiver in: context.
-	method ifNil: [ ^self ].
-	method isReturnSpecial
-		ifTrue: [ self inform: ''Nothing to debug, the expression is optimized''.
-			^ self ].
-	 self debug: method receiver: receiver in: context'
-]
-
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentRubEditorDoIt [
-
-	RubSmalltalkEditor compile: 'doIt
-	"Set the context to include pool vars of the model.  Then evaluate."
-	[ DSDoItRecord for: self selectionString]
-			on: Error
-			do: [ :e | 
-				DSSpy log: #ERROR key: #ACTION_PRINTIT ].
-	^ self evaluateSelection'
-]
-
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentRubEditorPaste [
 
@@ -354,27 +292,6 @@ DSSpyInstrumenter >> instrumentRubEditorPaste [
 	'
 ]
 
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentRubEditorPrintIt [
-
-	RubSmalltalkEditor compile: 'printIt
-	"Treat the current text selection as an expression; evaluate it. Insert the
-	description of the result of evaluation after the selection and then make
-	this description the new text selection."
-	
-	| printString |
-
-	self
-		evaluateSelectionAndDo: [ :result | 
-			[DSPrintItRecord for: result 
-			] on: Error do:[:e| DSSpy log: #ERROR key: #ACTION_PRINTIT ].
-			printString := [ result printString ]
-				on: Error
-				do: [ ''<error in printString: try ''''Inspect it'''' to debug>'' ].
-				
-			self afterSelectionInsertAndSelect: printString ]'
-]
-
 { #category : 'mouse events' }
 DSSpyInstrumenter >> instrumentRubScrollTextMorphHandleMouseOver [
 
@@ -527,38 +444,6 @@ DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
 	
 ]
 
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentSpCodeDebugIt [
-
-	SpCodeDebugItCommand compile: 'execute
-
-	| selection |
-	selection := self selectedTextOrLine.
-	selection ifEmpty: [ ^ '''' ].
-	[ 
-	DSDebugItRecord for:  
-			selection ]
-		on: Error
-		do: [ :e | 
-			DSSpy log: #ERROR key: #ACTION_DEBUGIT ].
-	self debug: selection readStream'
-]
-
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentSpCodeDoIt [
-
-	SpCodeDoItCommand compile: 'execute
-
-	"Treat the current text selection as an expression; evaluate it."
-
-	self evaluateSelectionAndDo: [ :result | 
-		[ 
-		DSDoItRecord for: self selectedTextOrLine ]
-			on: Error
-			do: [ :e | 
-				DSSpy log: #ERROR key: #ACTION_DOIT ] ]'
-]
-
 { #category : 'interactions' }
 DSSpyInstrumenter >> instrumentSpCodeDoItAndGoForInspector [
 
@@ -603,31 +488,18 @@ DSSpyInstrumenter >> instrumentSpCodeDoItAndGoForPlayground [
 	activationBlock value: value'
 ]
 
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentSpCodePrintIt [
-
-	SpCodePrintItCommand compile: 'execute
-	"Treat the current text selection as an expression; evaluate it. Insert the 
-	description of the result of evaluation after the selection and then make 
-	this description the new text selection."
-
-	self evaluateSelectionAndDo: [ :result | 
-		[DSPrintItRecord for: self selectedTextOrLine] on: Error do:[:e| DSSpy log: #ERROR key: #ACTION_PRINTIT ].
-		self printObject: result ]'
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> instrumentSystem [
 	"self instrumentDebuggerOpening."
-	self logTextEditorsClipbardActions.
+	"self logTextEditorsClipbardActions."
 	"self logClyBrowsersOpenings."
 	self logCodeInteractions.
-	self logDebuggerInteractions.
+	"self logDebuggerInteractions.
 	self logHaltAndBreakpointEvents.
 	self logInspectorInteractions.
 	self logMouseEvents.
 	self listenToWindowEvents.
-	self listenToMethodChanges
+	self listenToMethodChanges"
 ]
 
 { #category : 'debugpoints  ' }
@@ -656,22 +528,15 @@ DSSpyInstrumenter >> listenToWindowEvents [
 
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logClyBrowsersOpenings [
-	self instrumentClyQueryBrowser.
-	self instrumentClyFullBrowser 
+	self instrumentClyQueryBrowser
 ]
 
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logCodeInteractions [
 
-	self instrumentClyTextEditorPrintIt.
-	self instrumentRubEditorDebugIt.
-	self instrumentRubEditorDoIt.
-	self instrumentRubEditorPrintIt.
-	self instrumentSpCodeDebugIt.
-	self instrumentSpCodeDoIt.
-	self instrumentSpCodePrintIt.
-	self instrumentSpCodeDoItAndGoForInspector.
-	self instrumentSpCodeDoItAndGoForPlayground
+	self instrumentPrintIt.
+	"self instrumentDebugIt.
+	self instrumentDoIt"
 ]
 
 { #category : 'system-instrumentation' }

From 16f78ced1f136998deab7974d043f940254e117f Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Thu, 11 Dec 2025 10:37:23 +0100
Subject: [PATCH 03/49] wip

---
 DebuggingSpy/DSCodeActionRecord.class.st | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DebuggingSpy/DSCodeActionRecord.class.st b/DebuggingSpy/DSCodeActionRecord.class.st
index 28cf574..1a26069 100644
--- a/DebuggingSpy/DSCodeActionRecord.class.st
+++ b/DebuggingSpy/DSCodeActionRecord.class.st
@@ -18,7 +18,7 @@ DSCodeActionRecord class >> link [
 	^ MetaLink new
 		metaObject: self;
 		selector: #for:;
-		arguments: #(object);
+		arguments: #(arguments);
 		control: #before
 ]
 

From b8279a2cea6e1cdc05ac2131ba67dfe81872265e Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Thu, 11 Dec 2025 11:32:18 +0100
Subject: [PATCH 04/49] feat(DSCodeActionRecord): add a way to get the selected
 string

---
 DebuggingSpy/ClyTextEditor.extension.st        |  7 +++++++
 DebuggingSpy/DSCodeActionRecord.class.st       | 10 +++++-----
 DebuggingSpy/RubSmalltalkEditor.extension.st   |  7 +++++++
 DebuggingSpy/SpCodePrintItCommand.extension.st |  7 +++++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 DebuggingSpy/ClyTextEditor.extension.st
 create mode 100644 DebuggingSpy/RubSmalltalkEditor.extension.st
 create mode 100644 DebuggingSpy/SpCodePrintItCommand.extension.st

diff --git a/DebuggingSpy/ClyTextEditor.extension.st b/DebuggingSpy/ClyTextEditor.extension.st
new file mode 100644
index 0000000..e48eb9c
--- /dev/null
+++ b/DebuggingSpy/ClyTextEditor.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'ClyTextEditor' }
+
+{ #category : '*DebuggingSpy' }
+ClyTextEditor >> recordSelectedString [ 
+
+	^ self selection string
+]
diff --git a/DebuggingSpy/DSCodeActionRecord.class.st b/DebuggingSpy/DSCodeActionRecord.class.st
index 1a26069..cd2f11d 100644
--- a/DebuggingSpy/DSCodeActionRecord.class.st
+++ b/DebuggingSpy/DSCodeActionRecord.class.st
@@ -18,17 +18,17 @@ DSCodeActionRecord class >> link [
 	^ MetaLink new
 		metaObject: self;
 		selector: #for:;
-		arguments: #(arguments);
+		arguments: #(receiver);
 		control: #before
 ]
 
 { #category : 'actions api' }
-DSCodeActionRecord >> record: aCodeString [
+DSCodeActionRecord >> record: anObject [
 
-	"selectedString := DSSpy recordSourceCode
-		                  ifTrue: [ aCodeString ]
+	selectedString := DSSpy recordSourceCode
+		                  ifTrue: [ anObject recordSelectedString ]
 		                  ifFalse: [ 
-		                  DSSpy recordSourceCodeDisabledErrorMessage ]"
+		                  DSSpy recordSourceCodeDisabledErrorMessage ]
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/RubSmalltalkEditor.extension.st b/DebuggingSpy/RubSmalltalkEditor.extension.st
new file mode 100644
index 0000000..02559d1
--- /dev/null
+++ b/DebuggingSpy/RubSmalltalkEditor.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'RubSmalltalkEditor' }
+
+{ #category : '*DebuggingSpy' }
+RubSmalltalkEditor >> recordSelectedString [
+
+	^ self selection string
+]
diff --git a/DebuggingSpy/SpCodePrintItCommand.extension.st b/DebuggingSpy/SpCodePrintItCommand.extension.st
new file mode 100644
index 0000000..4fc2ee8
--- /dev/null
+++ b/DebuggingSpy/SpCodePrintItCommand.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'SpCodePrintItCommand' }
+
+{ #category : '*DebuggingSpy' }
+SpCodePrintItCommand >> recordSelectedString [ 
+
+	^ self selectedTextOrLine 
+]

From dd8c27a8f242e63819149ee0f42ccaf7a4e27026 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Thu, 11 Dec 2025 11:57:08 +0100
Subject: [PATCH 05/49] feat: add instrumentation of printIt, debugIt, doIt

---
 DebuggingSpy/DSSpyInstrumenter.class.st       | 20 +++++++++++++++++--
 .../SpCodePrintItCommand.extension.st         |  7 -------
 .../SpCodeSelectionCommand.extension.st       |  7 +++++++
 3 files changed, 25 insertions(+), 9 deletions(-)
 delete mode 100644 DebuggingSpy/SpCodePrintItCommand.extension.st
 create mode 100644 DebuggingSpy/SpCodeSelectionCommand.extension.st

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 7c56f06..683049a 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -60,6 +60,14 @@ DSSpyInstrumenter >> instrumentCodePresenter [
 				do: [ DSSpy log: #ERROR key: #PLAYGROUND_READ ] ]'
 ]
 
+{ #category : 'as yet unclassified' }
+DSSpyInstrumenter >> instrumentDebugIt [
+	"Instruments different printIt methods"
+
+	RubSmalltalkEditor link: DSDebugItRecord link toAST: (RubSmalltalkEditor >> #debugIt) ast.
+	SpCodePrintItCommand link: DSDebugItRecord link toAST: (SpCodeDebugItCommand >> #execute) ast
+]
+
 { #category : 'debugger' }
 DSSpyInstrumenter >> instrumentDebuggerCommands [
 	StDebugger class compile:
@@ -93,6 +101,14 @@ stackTable := self newList.
 	stackHeader label: ''Stack'''
 ]
 
+{ #category : 'as yet unclassified' }
+DSSpyInstrumenter >> instrumentDoIt [
+	"Instruments different printIt methods"
+
+	RubSmalltalkEditor link: DSDoItRecord link toAST: (RubSmalltalkEditor >> #doIt) ast.
+	SpCodePrintItCommand link: DSDoItRecord link toAST: (SpCodeDoItCommand >> #execute) ast
+]
+
 { #category : 'debugpoints  ' }
 DSSpyInstrumenter >> instrumentExceptionSignalling [
 
@@ -535,8 +551,8 @@ DSSpyInstrumenter >> logClyBrowsersOpenings [
 DSSpyInstrumenter >> logCodeInteractions [
 
 	self instrumentPrintIt.
-	"self instrumentDebugIt.
-	self instrumentDoIt"
+	self instrumentDebugIt.
+	self instrumentDoIt
 ]
 
 { #category : 'system-instrumentation' }
diff --git a/DebuggingSpy/SpCodePrintItCommand.extension.st b/DebuggingSpy/SpCodePrintItCommand.extension.st
deleted file mode 100644
index 4fc2ee8..0000000
--- a/DebuggingSpy/SpCodePrintItCommand.extension.st
+++ /dev/null
@@ -1,7 +0,0 @@
-Extension { #name : 'SpCodePrintItCommand' }
-
-{ #category : '*DebuggingSpy' }
-SpCodePrintItCommand >> recordSelectedString [ 
-
-	^ self selectedTextOrLine 
-]
diff --git a/DebuggingSpy/SpCodeSelectionCommand.extension.st b/DebuggingSpy/SpCodeSelectionCommand.extension.st
new file mode 100644
index 0000000..391ed7f
--- /dev/null
+++ b/DebuggingSpy/SpCodeSelectionCommand.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'SpCodeSelectionCommand' }
+
+{ #category : '*DebuggingSpy' }
+SpCodeSelectionCommand >> recordSelectedString [ 
+
+	^ self selectedTextOrLine 
+]

From cd42e7d8fb502b8af3c6cdea244900e2a1aa5c4d Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Fri, 12 Dec 2025 13:48:59 +0100
Subject: [PATCH 06/49] refactor: copy and paste instrumentation

---
 DebuggingSpy/DSAbstractEventRecord.class.st   |   3 +-
 DebuggingSpy/DSClipboardActionRecord.class.st |  21 ++-
 DebuggingSpy/DSCodeActionRecord.class.st      |   4 +-
 DebuggingSpy/DSInspectItRecord.class.st       |  13 ++
 DebuggingSpy/DSRecordHistory.class.st         |   2 +-
 DebuggingSpy/DSSpyInstrumenter.class.st       | 128 +++++-------------
 6 files changed, 66 insertions(+), 105 deletions(-)
 create mode 100644 DebuggingSpy/DSInspectItRecord.class.st

diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index 3913fc4..5e6924f 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -7,8 +7,7 @@ Class {
 	#instVars : [
 		'dateTime',
 		'windowId',
-		'uuid',
-		'link'
+		'uuid'
 	],
 	#category : 'DebuggingSpy-Records',
 	#package : 'DebuggingSpy',
diff --git a/DebuggingSpy/DSClipboardActionRecord.class.st b/DebuggingSpy/DSClipboardActionRecord.class.st
index 6b3f0fb..71bf458 100644
--- a/DebuggingSpy/DSClipboardActionRecord.class.st
+++ b/DebuggingSpy/DSClipboardActionRecord.class.st
@@ -15,6 +15,16 @@ Class {
 	#tag : 'Records'
 }
 
+{ #category : 'accessing' }
+DSClipboardActionRecord class >> link [
+
+	^ MetaLink new
+		  metaObject: self;
+		  selector: #for:;
+		  arguments: #( receiver );
+		  control: #before
+]
+
 { #category : 'accessing' }
 DSClipboardActionRecord >> clipboardText [
 
@@ -40,8 +50,11 @@ DSClipboardActionRecord >> editorClassName: anObject [
 ]
 
 { #category : 'actions api' }
-DSClipboardActionRecord >> record: recordInfo [
-	clipboardText  := DSSpy recordClipboardContent ifTrue: [ recordInfo first] ifFalse: ['RecordClipboarContent disabled'].
-	windowId := recordInfo second.
-	editorClassName := recordInfo third
+DSClipboardActionRecord >> record: anEditor [
+
+	clipboardText := DSSpy recordClipboardContent
+		                 ifTrue: [ anEditor selection asString ]
+		                 ifFalse: [ 'RecordClipboarContent disabled' ].
+	windowId := anEditor textArea window hash.
+	editorClassName := anEditor class name
 ]
diff --git a/DebuggingSpy/DSCodeActionRecord.class.st b/DebuggingSpy/DSCodeActionRecord.class.st
index cd2f11d..8a30fad 100644
--- a/DebuggingSpy/DSCodeActionRecord.class.st
+++ b/DebuggingSpy/DSCodeActionRecord.class.st
@@ -23,10 +23,10 @@ DSCodeActionRecord class >> link [
 ]
 
 { #category : 'actions api' }
-DSCodeActionRecord >> record: anObject [
+DSCodeActionRecord >> record: anEditor [
 
 	selectedString := DSSpy recordSourceCode
-		                  ifTrue: [ anObject recordSelectedString ]
+		                  ifTrue: [ anEditor recordSelectedString ]
 		                  ifFalse: [ 
 		                  DSSpy recordSourceCodeDisabledErrorMessage ]
 ]
diff --git a/DebuggingSpy/DSInspectItRecord.class.st b/DebuggingSpy/DSInspectItRecord.class.st
new file mode 100644
index 0000000..0f94f80
--- /dev/null
+++ b/DebuggingSpy/DSInspectItRecord.class.st
@@ -0,0 +1,13 @@
+Class {
+	#name : 'DSInspectItRecord',
+	#superclass : 'DSCodeActionRecord',
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSInspectItRecord >> eventName [
+
+	^ 'Inspect it'
+]
diff --git a/DebuggingSpy/DSRecordHistory.class.st b/DebuggingSpy/DSRecordHistory.class.st
index ab21aaa..3065941 100644
--- a/DebuggingSpy/DSRecordHistory.class.st
+++ b/DebuggingSpy/DSRecordHistory.class.st
@@ -527,7 +527,7 @@ DSRecordHistory >> processRecords: array [
 	"Windows"
 	self buildWindowHistory.
 	self buildWindows.
-	self buildWindowJumps.
+	"self buildWindowJumps."
 	self reconstructWindowsToolInfo.
 	
 	"Check data consistency (raises a warning that can be proceeded)"
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 683049a..d2f9368 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -60,9 +60,16 @@ DSSpyInstrumenter >> instrumentCodePresenter [
 				do: [ DSSpy log: #ERROR key: #PLAYGROUND_READ ] ]'
 ]
 
-{ #category : 'as yet unclassified' }
+{ #category : 'system' }
+DSSpyInstrumenter >> instrumentCopySelection [
+
+	RubTextEditor link: DSClipboardCopyRecord link toAST: (RubTextEditor >> #copySelection) ast.
+	RubSmalltalkEditor link: DSClipboardCopyRecord link toAST: (RubSmalltalkEditor >> #copySelection) ast
+]
+
+{ #category : 'interactions' }
 DSSpyInstrumenter >> instrumentDebugIt [
-	"Instruments different printIt methods"
+	"Instruments different debugIt methods"
 
 	RubSmalltalkEditor link: DSDebugItRecord link toAST: (RubSmalltalkEditor >> #debugIt) ast.
 	SpCodePrintItCommand link: DSDebugItRecord link toAST: (SpCodeDebugItCommand >> #execute) ast
@@ -101,9 +108,9 @@ stackTable := self newList.
 	stackHeader label: ''Stack'''
 ]
 
-{ #category : 'as yet unclassified' }
+{ #category : 'interactions' }
 DSSpyInstrumenter >> instrumentDoIt [
-	"Instruments different printIt methods"
+	"Instruments different doIt methods"
 
 	RubSmalltalkEditor link: DSDoItRecord link toAST: (RubSmalltalkEditor >> #doIt) ast.
 	SpCodePrintItCommand link: DSDoItRecord link toAST: (SpCodeDoItCommand >> #execute) ast
@@ -161,6 +168,14 @@ DSSpyInstrumenter >> instrumentHaltHits [
 	super signal'.
 ]
 
+{ #category : 'interactions' }
+DSSpyInstrumenter >> instrumentInspectIt [
+	"Instruments different inspectIt methods"
+
+	RubSmalltalkEditor link: DSInspectItRecord link toAST: (RubSmalltalkEditor >> #inspectIt) ast.
+	SpCodePrintItCommand link: DSInspectItRecord link toAST: (SpCodeInspectItCommand >> #execute) ast
+]
+
 { #category : 'inspector' }
 DSSpyInstrumenter >> instrumentInspectMethodsOfClass [
 
@@ -273,7 +288,14 @@ DSSpyInstrumenter >> instrumentNavigateAttribute [
 				do: [ :err | DSSpy log: #ERROR key: #INSPECTOR_OBSERVE ] ] ]'
 ]
 
-{ #category : 'as yet unclassified' }
+{ #category : 'system' }
+DSSpyInstrumenter >> instrumentPaste [
+
+	RubTextEditor link: DSClipboardPasteRecord link toAST: (RubTextEditor >> #paste) ast.
+	RubSmalltalkEditor link: DSClipboardPasteRecord link toAST: (RubSmalltalkEditor >> #paste) ast
+]
+
+{ #category : 'interactions' }
 DSSpyInstrumenter >> instrumentPrintIt [
 	"Instruments different printIt methods"
 
@@ -282,32 +304,6 @@ DSSpyInstrumenter >> instrumentPrintIt [
 	SpCodePrintItCommand link: DSPrintItRecord link toAST: (SpCodePrintItCommand >> #execute) ast
 ]
 
-{ #category : 'system' }
-DSSpyInstrumenter >> instrumentRubEditorCopySelection [
-
-RubTextEditor compile: 'copySelection
-"Copy the current selection and store it in the paste buffer, unless a caret.  Undoer & Redoer: undoCutCopy"
-
-	self lineSelectAndEmptyCheck: [^ self].
-	self clipboardTextPut: self selection.
-	DSClipboardCopyRecord for: {self selection . self textArea window hash . self class name}.
-	self editingState previousInterval: self selectionInterval.
-'
-]
-
-{ #category : 'system' }
-DSSpyInstrumenter >> instrumentRubEditorPaste [
-
-	RubTextEditor compile: 'paste
-	"Paste the text from the shared buffer over the current selection and 
-	redisplay if necessary.  Undoer & Redoer: undoAndReselect."
-
-	self replace: self selectionInterval with: self clipboardText and:
-		[self selectAt: self pointIndex].
-	DSClipboardPasteRecord for: {self clipboardText . self textArea window hash. self class name}.
-	'
-]
-
 { #category : 'mouse events' }
 DSSpyInstrumenter >> instrumentRubScrollTextMorphHandleMouseOver [
 
@@ -323,63 +319,6 @@ DSSpyInstrumenter >> instrumentRubScrollTextMorphMouseEnter [
 	^super mouseEnter: evt'
 ]
 
-{ #category : 'system' }
-DSSpyInstrumenter >> instrumentRubSmalltalkEditorCopySelection [
-
-RubSmalltalkEditor compile: 'copySelection
-"Copy the current selection and store it in the paste buffer, unless a caret.  Undoer & Redoer: undoCutCopy"
-
-	| node escapingCharacter selection |
-	"Research of selected node for eventual nesting of comment or string."
-	self lineSelectAndEmptyCheck: [ ^ self ].
-	node := self bestNodeInTextArea.
-	escapingCharacter := self getEscapeCharacterFromAst: node.
-
-	selection := (escapingCharacter notNil and: [ "The node, if a comment or a string, should entirely contain the selection.
-		We convert the node source interval to an open interval to ignore the node delimiters." 
-		              node sourceInterval asOpenInterval includesAll:
-			              self selectionInterval ])
-		             ifTrue: [ 
-		             self selection asString unescapeCharacter:
-			             escapingCharacter ]
-		             ifFalse: [ self selection asString ].
-	self clipboardTextPut: selection.
-	self editingState previousInterval: self selectionInterval.
-	DSClipboardCopyRecord for: { 
-			selection.
-			self textArea window hash.
-			self class name }
-'
-]
-
-{ #category : 'system' }
-DSSpyInstrumenter >> instrumentRubSmalltalkEditorPaste [
-	
-RubSmalltalkEditor compile:'paste
-	"Paste the text from the shared buffer over the current selection and 
-	redisplay if necessary.  Undoer & Redoer: undoAndReselect."
-	| node character escapedText |
-	"This method is specialized for Pharo code.
-	If paste happens in the context of a comment or a string, the pasted contents should be properly escaped."
-	
-	"Get the AST node corresponding to where we are going to paste.
-	If there is a selection, cut it off, because pasting it will over-write it, and get the AST node at the cut position.
-	This is specially important when the selection spans multiple scopes (e.g., it starts inside a comment and finished in the middle of another)."
-	node := self bestNodeInTextAreaWithoutSelection.
-
-	"The pasted text could be inserted in some context requiring escaping, e.g., a comment, a string.
-	If so, get the escaping character, and escape the pasted text before pasting it."
-	character := self getEscapeCharacterFromAst: node.
-	escapedText := (self shouldEscapeCharacter: character)
-		  ifTrue: [ self escapeCharacter: character inString: self clipboardText ]
-		  ifFalse: [ self clipboardText ].
-	
-	self replace: self selectionInterval with: escapedText and:
-		[self selectAt: self pointIndex].
-	
-	DSClipboardPasteRecord for: {escapedText . self textArea window hash . self class name}.'
-]
-
 { #category : 'mouse events' }
 DSSpyInstrumenter >> instrumentScrollingByDraggingSlider [
 	
@@ -507,10 +446,9 @@ DSSpyInstrumenter >> instrumentSpCodeDoItAndGoForPlayground [
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> instrumentSystem [
 	"self instrumentDebuggerOpening."
-	"self logTextEditorsClipbardActions."
-	"self logClyBrowsersOpenings."
-	self logCodeInteractions.
-	"self logDebuggerInteractions.
+
+	self logTextEditorsClipbardActions.
+	self logCodeInteractions "self logClyBrowsersOpenings." "self logDebuggerInteractions.
 	self logHaltAndBreakpointEvents.
 	self logInspectorInteractions.
 	self logMouseEvents.
@@ -595,10 +533,8 @@ DSSpyInstrumenter >> logMouseEvents [
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logTextEditorsClipbardActions [
 
-	self instrumentRubEditorCopySelection.
-	self instrumentRubEditorPaste.
-	self instrumentRubSmalltalkEditorCopySelection.
-	self instrumentRubSmalltalkEditorPaste.
+	self instrumentCopySelection.
+	self instrumentPaste
 ]
 
 { #category : 'system-instrumentation' }

From 761a7faa9f7142122a2aabc5e2eb404f38cfef53 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Fri, 12 Dec 2025 15:47:00 +0100
Subject: [PATCH 07/49] refactor: record Do It and Go

---
 DebuggingSpy/DSSpyInstrumenter.class.st             | 11 ++++++++++-
 DebuggingSpy/StPlaygroundPagePresenter.extension.st |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index d2f9368..8374e35 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -116,6 +116,14 @@ DSSpyInstrumenter >> instrumentDoIt [
 	SpCodePrintItCommand link: DSDoItRecord link toAST: (SpCodeDoItCommand >> #execute) ast
 ]
 
+{ #category : 'interactions' }
+DSSpyInstrumenter >> instrumentDoItAndGo [
+	"Instruments different doEvaluateAndGo methods"
+
+	StObjectContextPresenter link: DSDoItAndGoRecord link toAST: (StObjectContextPresenter >> #doEvaluateAndGo) ast.
+	StPlaygroundPagePresenter link: DSDoItAndGoRecord link toAST: (StPlaygroundPagePresenter >> #doEvaluateAndGo) ast
+]
+
 { #category : 'debugpoints  ' }
 DSSpyInstrumenter >> instrumentExceptionSignalling [
 
@@ -490,7 +498,8 @@ DSSpyInstrumenter >> logCodeInteractions [
 
 	self instrumentPrintIt.
 	self instrumentDebugIt.
-	self instrumentDoIt
+	self instrumentDoIt.
+	self instrumentDoItAndGo
 ]
 
 { #category : 'system-instrumentation' }
diff --git a/DebuggingSpy/StPlaygroundPagePresenter.extension.st b/DebuggingSpy/StPlaygroundPagePresenter.extension.st
index a287c65..ec9d676 100644
--- a/DebuggingSpy/StPlaygroundPagePresenter.extension.st
+++ b/DebuggingSpy/StPlaygroundPagePresenter.extension.st
@@ -5,3 +5,9 @@ StPlaygroundPagePresenter >> forceDisableLoading [
 
 	loading := false
 ]
+
+{ #category : '*DebuggingSpy' }
+StPlaygroundPagePresenter >> recordSelectedString [ 
+
+	^ self selectedTextOrLine 
+]

From 07430ab292f0a484337973c14a12ccf619ab7cd0 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Fri, 12 Dec 2025 15:47:58 +0100
Subject: [PATCH 08/49] refactor: remove old instrumentation of Do It and Go

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 44 -------------------------
 1 file changed, 44 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 8374e35..f688420 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -407,50 +407,6 @@ DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
 	
 ]
 
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentSpCodeDoItAndGoForInspector [
-
-	StObjectContextPresenter compile: 'doEvaluateAndGo
-	| value |
-
-	[ 
-		DSDoItAndGoRecord for: self evaluator selectedTextOrLine ]
-			on: Error
-			do: [ :e | 
-				DSSpy log: #ERROR key: #DOITANDGO ].
-	
-	activationBlock ifNil: [ ^ self ].
-
-	value := self evaluator 
-		evaluate: self evaluator selectedTextOrLine
-		onCompileError: [ ^ self ]
-		onError: [ :e | e pass ].
-	
-	activationBlock value: (StEvaluatedSelectionModel newValue: value)'
-]
-
-{ #category : 'interactions' }
-DSSpyInstrumenter >> instrumentSpCodeDoItAndGoForPlayground [
-
-	StPlaygroundPagePresenter compile: 'doEvaluateAndGo
-	| value |
-	
-	[ 
-		DSDoItAndGoRecord for: text selectedTextOrLine ]
-			on: Error
-			do: [ :e | 
-				DSSpy log: #ERROR key: #DOITANDGO ].
-	
-	activationBlock ifNil: [ ^ self ].
-
-	value := text
-		evaluate: text selectedTextOrLine
-		onCompileError: [ ^ self ]
-		onError: [ :e | e pass ].
-
-	activationBlock value: value'
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> instrumentSystem [
 	"self instrumentDebuggerOpening."

From 7081d1350736bc4cbcde1f4247812846d4d6ccb6 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 15 Dec 2025 14:53:02 +0100
Subject: [PATCH 09/49] feat(DSSpyInstrumenter): add a method to stop the
 instrumentation

---
 DebuggingSpy/DSSpy.class.st             | 8 ++------
 DebuggingSpy/DSSpyInstrumenter.class.st | 9 +++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/DebuggingSpy/DSSpy.class.st b/DebuggingSpy/DSSpy.class.st
index 8959e6f..351f859 100644
--- a/DebuggingSpy/DSSpy.class.st
+++ b/DebuggingSpy/DSSpy.class.st
@@ -124,18 +124,14 @@ DSSpy class >> logWindowClosed: anEvent [
 DSSpy class >> logWindowOpened: anEvent [
 
 	| window |
+	
 	window := anEvent window.
 	[ DSToolWindowOpenedEventRecord for: window ]
 		on: Error
 		do: [ self log: #ERROR key: #WINDOW_TOOL_OPENED ].
 	[ DSWindowOpenedRecord for: anEvent ]
 		on: Error
-		do: [ self log: #ERROR key: #WINDOW_OPENED ].
-	window announcer
-		when: WindowActivated
-		send: #logWindowActivated:
-		to: self.
-	window announcer when: WindowClosed send: #logWindowClosed: to: self
+		do: [ self log: #ERROR key: #WINDOW_OPENED ]
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index f688420..97ec6b6 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -16,6 +16,13 @@ DSSpyInstrumenter class >> instrumentSystem [
 	DSRecordRegistry autoSerialize: true
 ]
 
+{ #category : 'system instrumentation' }
+DSSpyInstrumenter class >> stopInstrumentation [
+
+	SystemAnnouncer uniqueInstance unsubscribe: DSSpy.
+	MetaLink uninstallAll "TO CHANGED : just uninstall targeted MetaLinks"
+]
+
 { #category : 'browsers' }
 DSSpyInstrumenter >> instrumentClyQueryBrowser [
 
@@ -411,6 +418,8 @@ DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
 DSSpyInstrumenter >> instrumentSystem [
 	"self instrumentDebuggerOpening."
 
+	self listenToWindowEvents.
+	self listenToDebugPointChanges.
 	self logTextEditorsClipbardActions.
 	self logCodeInteractions "self logClyBrowsersOpenings." "self logDebuggerInteractions.
 	self logHaltAndBreakpointEvents.

From 29fe8050b9442a8f1f2675fee050cbd0c86020ed Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 15 Dec 2025 15:40:40 +0100
Subject: [PATCH 10/49] wip

---
 DebuggingSpy/DSSpy.class.st                   |  4 --
 .../DSToolWindowActivatedEventRecord.class.st | 15 -------
 DebuggingSpy/DSToolWindowEvent.class.st       | 44 -------------------
 .../DSToolWindowOpenedEventRecord.class.st    | 15 -------
 DebuggingSpy/DSWindowEventRecord.class.st     | 20 ++++++++-
 5 files changed, 18 insertions(+), 80 deletions(-)
 delete mode 100644 DebuggingSpy/DSToolWindowActivatedEventRecord.class.st
 delete mode 100644 DebuggingSpy/DSToolWindowEvent.class.st
 delete mode 100644 DebuggingSpy/DSToolWindowOpenedEventRecord.class.st

diff --git a/DebuggingSpy/DSSpy.class.st b/DebuggingSpy/DSSpy.class.st
index 351f859..2dba7f3 100644
--- a/DebuggingSpy/DSSpy.class.st
+++ b/DebuggingSpy/DSSpy.class.st
@@ -124,11 +124,7 @@ DSSpy class >> logWindowClosed: anEvent [
 DSSpy class >> logWindowOpened: anEvent [
 
 	| window |
-	
 	window := anEvent window.
-	[ DSToolWindowOpenedEventRecord for: window ]
-		on: Error
-		do: [ self log: #ERROR key: #WINDOW_TOOL_OPENED ].
 	[ DSWindowOpenedRecord for: anEvent ]
 		on: Error
 		do: [ self log: #ERROR key: #WINDOW_OPENED ]
diff --git a/DebuggingSpy/DSToolWindowActivatedEventRecord.class.st b/DebuggingSpy/DSToolWindowActivatedEventRecord.class.st
deleted file mode 100644
index 6e8081f..0000000
--- a/DebuggingSpy/DSToolWindowActivatedEventRecord.class.st
+++ /dev/null
@@ -1,15 +0,0 @@
-"
-I record when a tool is activated, ie, a window having this tool as model is activated
-"
-Class {
-	#name : 'DSToolWindowActivatedEventRecord',
-	#superclass : 'DSToolWindowEvent',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSToolWindowActivatedEventRecord >> toolAction [
-	^'activated'
-]
diff --git a/DebuggingSpy/DSToolWindowEvent.class.st b/DebuggingSpy/DSToolWindowEvent.class.st
deleted file mode 100644
index c14f233..0000000
--- a/DebuggingSpy/DSToolWindowEvent.class.st
+++ /dev/null
@@ -1,44 +0,0 @@
-"
-I record info about tools opened by windows
-"
-Class {
-	#name : 'DSToolWindowEvent',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'toolInfo'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSToolWindowEvent >> eventName [
-
-	toolInfo ifNil: [ ^ '[ERROR] Missing tool info' ].
-	^ String streamContents: [ :str | toolInfo printOn: str ]
-]
-
-{ #category : 'actions api' }
-DSToolWindowEvent >> record: window [
-
-	| tool |
-	super record: window.
-	tool := DSSpy toolInWindow: window.
-	tool ifNil: [ ^ self ]. 
-	toolInfo := DSToolInfo
-		            toolNamed: tool class name
-		            id: tool identityHash
-		            windowId: windowId
-		            action: self toolAction
-]
-
-{ #category : 'accessing' }
-DSToolWindowEvent >> toolAction [
-	 ^self subclassResponsibility 
-]
-
-{ #category : 'accessing' }
-DSToolWindowEvent >> toolInfo [
-	^ toolInfo
-]
diff --git a/DebuggingSpy/DSToolWindowOpenedEventRecord.class.st b/DebuggingSpy/DSToolWindowOpenedEventRecord.class.st
deleted file mode 100644
index 7af48be..0000000
--- a/DebuggingSpy/DSToolWindowOpenedEventRecord.class.st
+++ /dev/null
@@ -1,15 +0,0 @@
-"
-I record when a tool is opened, ie, a window having this tool as model is opened
-"
-Class {
-	#name : 'DSToolWindowOpenedEventRecord',
-	#superclass : 'DSToolWindowEvent',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSToolWindowOpenedEventRecord >> toolAction [
-	^'opened'
-]
diff --git a/DebuggingSpy/DSWindowEventRecord.class.st b/DebuggingSpy/DSWindowEventRecord.class.st
index cb7b93b..d518f19 100644
--- a/DebuggingSpy/DSWindowEventRecord.class.st
+++ b/DebuggingSpy/DSWindowEventRecord.class.st
@@ -2,7 +2,8 @@ Class {
 	#name : 'DSWindowEventRecord',
 	#superclass : 'DSAbstractEventRecord',
 	#instVars : [
-		'windowName'
+		'windowName',
+		'toolInfo'
 	],
 	#category : 'DebuggingSpy-Records',
 	#package : 'DebuggingSpy',
@@ -11,8 +12,17 @@ Class {
 
 { #category : 'actions api' }
 DSWindowEventRecord >> record: aWindowEvent [
+
+	| tool |
 	self recordWindowIdFromEvent: aWindowEvent.
-	self recordWindowNameFromEvent: aWindowEvent
+	self recordWindowNameFromEvent: aWindowEvent.
+	tool := DSSpy toolInWindow: aWindowEvent window.
+	tool ifNil: [ ^ self ].
+	toolInfo := DSToolInfo
+		            toolNamed: tool class name
+		            id: tool identityHash
+		            windowId: windowId
+		            action: self eventName
 ]
 
 { #category : 'recording' }
@@ -35,6 +45,12 @@ DSWindowEventRecord >> sameWindowAsIn: aDSWindowEventRecord [
 	^self windowId = aDSWindowEventRecord windowId
 ]
 
+{ #category : 'accessing' }
+DSWindowEventRecord >> toolInfo [
+
+	^ toolInfo
+]
+
 { #category : 'accessing' }
 DSWindowEventRecord >> windowName [
 

From 1a94020b1af9b88697023158370dab30d7ed54a7 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 15 Dec 2025 17:18:55 +0100
Subject: [PATCH 11/49] fix: window opening record and stop in instrumentation

---
 .../DSAbstractDebugPointTargetRecord.class.st |  3 +++
 .../DSDebugPointCheckBehaviorRecord.class.st  |  7 ------
 .../DSDebugPointClassTargetRecord.class.st    |  3 +++
 ...PointInstanceVariableTargetRecord.class.st |  3 +++
 .../DSDebugPointMetaBehaviorRecord.class.st   |  7 ------
 .../DSDebugPointNodeTargetRecord.class.st     |  3 +++
 .../DSDebugPointObjectTargetRecord.class.st   |  3 +++
 DebuggingSpy/DSDebugPointRecord.class.st      |  3 +++
 .../DSMouseEnterWindowRecord.class.st         |  1 -
 DebuggingSpy/DSRecordHistory.class.st         |  3 +--
 DebuggingSpy/DSSpyInstrumenter.class.st       |  3 +++
 DebuggingSpy/DSToolInfo.class.st              | 25 +------------------
 DebuggingSpy/DSWindowEventRecord.class.st     |  6 ++++-
 13 files changed, 28 insertions(+), 42 deletions(-)
 delete mode 100644 DebuggingSpy/DSDebugPointCheckBehaviorRecord.class.st
 delete mode 100644 DebuggingSpy/DSDebugPointMetaBehaviorRecord.class.st

diff --git a/DebuggingSpy/DSAbstractDebugPointTargetRecord.class.st b/DebuggingSpy/DSAbstractDebugPointTargetRecord.class.st
index 3ea7b30..bbbbc6a 100644
--- a/DebuggingSpy/DSAbstractDebugPointTargetRecord.class.st
+++ b/DebuggingSpy/DSAbstractDebugPointTargetRecord.class.st
@@ -1,3 +1,6 @@
+"
+I am an abstract class representing a record of a debugPoint's target.
+"
 Class {
 	#name : 'DSAbstractDebugPointTargetRecord',
 	#superclass : 'Object',
diff --git a/DebuggingSpy/DSDebugPointCheckBehaviorRecord.class.st b/DebuggingSpy/DSDebugPointCheckBehaviorRecord.class.st
deleted file mode 100644
index 11d9018..0000000
--- a/DebuggingSpy/DSDebugPointCheckBehaviorRecord.class.st
+++ /dev/null
@@ -1,7 +0,0 @@
-Class {
-	#name : 'DSDebugPointCheckBehaviorRecord',
-	#superclass : 'Object',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
diff --git a/DebuggingSpy/DSDebugPointClassTargetRecord.class.st b/DebuggingSpy/DSDebugPointClassTargetRecord.class.st
index 730e81b..d530475 100644
--- a/DebuggingSpy/DSDebugPointClassTargetRecord.class.st
+++ b/DebuggingSpy/DSDebugPointClassTargetRecord.class.st
@@ -1,3 +1,6 @@
+"
+I am a class which represents a class target record for debugPoint.
+"
 Class {
 	#name : 'DSDebugPointClassTargetRecord',
 	#superclass : 'DSAbstractDebugPointTargetRecord',
diff --git a/DebuggingSpy/DSDebugPointInstanceVariableTargetRecord.class.st b/DebuggingSpy/DSDebugPointInstanceVariableTargetRecord.class.st
index 1e84d2a..9658896 100644
--- a/DebuggingSpy/DSDebugPointInstanceVariableTargetRecord.class.st
+++ b/DebuggingSpy/DSDebugPointInstanceVariableTargetRecord.class.st
@@ -1,3 +1,6 @@
+"
+I am a class that reprensent instance variable target record for debugPoint.
+"
 Class {
 	#name : 'DSDebugPointInstanceVariableTargetRecord',
 	#superclass : 'DSDebugPointClassTargetRecord',
diff --git a/DebuggingSpy/DSDebugPointMetaBehaviorRecord.class.st b/DebuggingSpy/DSDebugPointMetaBehaviorRecord.class.st
deleted file mode 100644
index 8acef38..0000000
--- a/DebuggingSpy/DSDebugPointMetaBehaviorRecord.class.st
+++ /dev/null
@@ -1,7 +0,0 @@
-Class {
-	#name : 'DSDebugPointMetaBehaviorRecord',
-	#superclass : 'Object',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
diff --git a/DebuggingSpy/DSDebugPointNodeTargetRecord.class.st b/DebuggingSpy/DSDebugPointNodeTargetRecord.class.st
index 97e7ff5..0e2cb13 100644
--- a/DebuggingSpy/DSDebugPointNodeTargetRecord.class.st
+++ b/DebuggingSpy/DSDebugPointNodeTargetRecord.class.st
@@ -1,3 +1,6 @@
+"
+I am a class that reprensent  node target record for debugPoint.
+"
 Class {
 	#name : 'DSDebugPointNodeTargetRecord',
 	#superclass : 'DSDebugPointClassTargetRecord',
diff --git a/DebuggingSpy/DSDebugPointObjectTargetRecord.class.st b/DebuggingSpy/DSDebugPointObjectTargetRecord.class.st
index b052f4b..cf68f3a 100644
--- a/DebuggingSpy/DSDebugPointObjectTargetRecord.class.st
+++ b/DebuggingSpy/DSDebugPointObjectTargetRecord.class.st
@@ -1,3 +1,6 @@
+"
+I am a class that reprensent object target record for debugPoint.
+"
 Class {
 	#name : 'DSDebugPointObjectTargetRecord',
 	#superclass : 'DSAbstractDebugPointTargetRecord',
diff --git a/DebuggingSpy/DSDebugPointRecord.class.st b/DebuggingSpy/DSDebugPointRecord.class.st
index 2c5ea5f..ecc792e 100644
--- a/DebuggingSpy/DSDebugPointRecord.class.st
+++ b/DebuggingSpy/DSDebugPointRecord.class.st
@@ -1,3 +1,6 @@
+"
+I represent a debugPoint recorded event.
+"
 Class {
 	#name : 'DSDebugPointRecord',
 	#superclass : 'DSAbstractExtendedRecord',
diff --git a/DebuggingSpy/DSMouseEnterWindowRecord.class.st b/DebuggingSpy/DSMouseEnterWindowRecord.class.st
index a548653..0d5a0a2 100644
--- a/DebuggingSpy/DSMouseEnterWindowRecord.class.st
+++ b/DebuggingSpy/DSMouseEnterWindowRecord.class.st
@@ -30,7 +30,6 @@ DSMouseEnterWindowRecord >> record: morphsAndWindow [
 		            toolNamed: tool class name
 		            id: tool identityHash
 		            windowId: windowId
-		            action: 'enter'
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSRecordHistory.class.st b/DebuggingSpy/DSRecordHistory.class.st
index 3065941..f8ed472 100644
--- a/DebuggingSpy/DSRecordHistory.class.st
+++ b/DebuggingSpy/DSRecordHistory.class.st
@@ -556,8 +556,7 @@ DSRecordHistory >> reconstructWindowsToolInfo [
 
 	| toolInfos validWindows |
 	toolInfos := (((records select: [ :r |
-		                (r isKindOf: DSToolWindowEvent) or: [
-			                r class = DSMouseEnterWindowRecord ] ]) collect:
+			                (r class = DSMouseEnterWindowRecord) ]) collect:
 		               #toolInfo) reject: #isNil) asOrderedCollection
 		             groupedBy: #windowIdentityHash.
 
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 97ec6b6..2ae2abe 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -20,6 +20,9 @@ DSSpyInstrumenter class >> instrumentSystem [
 DSSpyInstrumenter class >> stopInstrumentation [
 
 	SystemAnnouncer uniqueInstance unsubscribe: DSSpy.
+	DebugPoint codeSupportAnnouncer unsubscribe: DSSpy.
+	self currentWorld announcer unsubscribe: DSSpy.
+	
 	MetaLink uninstallAll "TO CHANGED : just uninstall targeted MetaLinks"
 ]
 
diff --git a/DebuggingSpy/DSToolInfo.class.st b/DebuggingSpy/DSToolInfo.class.st
index f71f35f..fd3687c 100644
--- a/DebuggingSpy/DSToolInfo.class.st
+++ b/DebuggingSpy/DSToolInfo.class.st
@@ -8,8 +8,7 @@ Class {
 	#instVars : [
 		'toolClassName',
 		'toolIdentityHash',
-		'windowIdentityHash',
-		'toolAction'
+		'windowIdentityHash'
 	],
 	#category : 'DebuggingSpy-Records',
 	#package : 'DebuggingSpy',
@@ -26,33 +25,11 @@ DSToolInfo class >> toolNamed: aToolName id: aToolId windowId: aWindowId [
 		  yourself
 ]
 
-{ #category : 'instance creation' }
-DSToolInfo class >> toolNamed: aToolName id: aToolId windowId: aWindowId action: aString [
-
-	^ (self toolNamed: aToolName id: aToolId windowId: aWindowId)
-		  toolAction: aString;
-		  yourself
-]
-
 { #category : 'printing' }
 DSToolInfo >> printOn: str [
 
 	str << (toolClassName ifNil: [ 'missing tool name' ]).
-	toolAction ifNil: [ ^ self ].
 	str space.
-	str << toolAction
-]
-
-{ #category : 'accessing' }
-DSToolInfo >> toolAction [
-
-	^ toolAction
-]
-
-{ #category : 'accessing' }
-DSToolInfo >> toolAction: anObject [
-
-	toolAction := anObject
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSWindowEventRecord.class.st b/DebuggingSpy/DSWindowEventRecord.class.st
index d518f19..1680639 100644
--- a/DebuggingSpy/DSWindowEventRecord.class.st
+++ b/DebuggingSpy/DSWindowEventRecord.class.st
@@ -1,3 +1,8 @@
+"
+Class which represent a record of a window event : openned, closed or activated.
+
+This type of record is useful to know which are the tools used by a developper.
+"
 Class {
 	#name : 'DSWindowEventRecord',
 	#superclass : 'DSAbstractEventRecord',
@@ -22,7 +27,6 @@ DSWindowEventRecord >> record: aWindowEvent [
 		            toolNamed: tool class name
 		            id: tool identityHash
 		            windowId: windowId
-		            action: self eventName
 ]
 
 { #category : 'recording' }

From 4682d17f189b1f0d9287357bb153ab1dea34e1fb Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Tue, 16 Dec 2025 15:00:09 +0100
Subject: [PATCH 12/49] refactor: clean code, remove some instrumentations and
 switch to Metalink instead of hardcode

---
 DebuggingSpy/DSAbstractEventRecord.class.st   |  12 --
 .../DSMouseDownTableItemRecord.class.st       |  15 ---
 .../DSMouseEnterTableItemRecord.class.st      |  32 -----
 .../DSMouseEnterTextEditorRecord.class.st     |  26 ----
 .../DSMouseEnterWindowRecord.class.st         |  23 ----
 DebuggingSpy/DSMouseEventRecord.class.st      |  28 +++--
 DebuggingSpy/DSSpyInstrumenter.class.st       | 111 ++----------------
 DebuggingSpy/SystemWindow.extension.st        |  13 ++
 8 files changed, 38 insertions(+), 222 deletions(-)
 delete mode 100644 DebuggingSpy/DSMouseDownTableItemRecord.class.st
 delete mode 100644 DebuggingSpy/DSMouseEnterTableItemRecord.class.st
 delete mode 100644 DebuggingSpy/DSMouseEnterTextEditorRecord.class.st
 create mode 100644 DebuggingSpy/SystemWindow.extension.st

diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index 5e6924f..d216f3b 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -23,18 +23,6 @@ DSAbstractEventRecord class >> for: anObject [
 	^ rec
 ]
 
-{ #category : 'printing' }
-DSAbstractEventRecord class >> printStringMorphs: anArrayOfMorphs [
-
-	| str |
-	str := WriteStream on: String new.
-	anArrayOfMorphs do: [ :m | 
-		((m isKindOf: StringMorph) and: [ m contents ~= '...' ]) ifTrue: [ 
-			str << m contents asString.
-			m == anArrayOfMorphs last ifFalse: [ str << ' ' ] ] ].
-	^ str contents
-]
-
 { #category : 'comparing' }
 DSAbstractEventRecord >> < aDSAbstractRecord [
 	^self dateTime < aDSAbstractRecord dateTime
diff --git a/DebuggingSpy/DSMouseDownTableItemRecord.class.st b/DebuggingSpy/DSMouseDownTableItemRecord.class.st
deleted file mode 100644
index 49676ee..0000000
--- a/DebuggingSpy/DSMouseDownTableItemRecord.class.st
+++ /dev/null
@@ -1,15 +0,0 @@
-"
-This record is generated when the mouse clicks an item in a table.
-"
-Class {
-	#name : 'DSMouseDownTableItemRecord',
-	#superclass : 'DSMouseEventRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSMouseDownTableItemRecord >> eventName [
-	^'Click on table item'
-]
diff --git a/DebuggingSpy/DSMouseEnterTableItemRecord.class.st b/DebuggingSpy/DSMouseEnterTableItemRecord.class.st
deleted file mode 100644
index c3eff48..0000000
--- a/DebuggingSpy/DSMouseEnterTableItemRecord.class.st
+++ /dev/null
@@ -1,32 +0,0 @@
-"
-This record is generated when the mouse enters an item in a table.
-"
-Class {
-	#name : 'DSMouseEnterTableItemRecord',
-	#superclass : 'DSMouseEventRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSMouseEnterTableItemRecord >> eventName [
-
-	^ String streamContents: [ :str |
-		  str << 'Mouse on table item:'.
-		  str space.
-		  str << itemElement ]
-]
-
-{ #category : 'testing' }
-DSMouseEnterTableItemRecord >> isOverTestCase [
-
-	^ itemElement isString and: [
-		  itemElement size > 4 and: [
-			  (itemElement copyFrom: 1 to: 4) = 'test' ] ]
-]
-
-{ #category : 'accessing' }
-DSMouseEnterTableItemRecord >> windowName [
-	^windowId
-]
diff --git a/DebuggingSpy/DSMouseEnterTextEditorRecord.class.st b/DebuggingSpy/DSMouseEnterTextEditorRecord.class.st
deleted file mode 100644
index 95c3bfe..0000000
--- a/DebuggingSpy/DSMouseEnterTextEditorRecord.class.st
+++ /dev/null
@@ -1,26 +0,0 @@
-"
-This record is generated when the mouse enters an item in a text editor.
-"
-Class {
-	#name : 'DSMouseEnterTextEditorRecord',
-	#superclass : 'DSMouseEventRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSMouseEnterTextEditorRecord >> eventName [
-	^'Mouse on text editor'
-]
-
-{ #category : 'accessing' }
-DSMouseEnterTextEditorRecord >> windowName [
-	^ windowId
-]
-
-{ #category : 'accessing' }
-DSMouseEnterTextEditorRecord >> windowType [
-
-	^ 'External Window'
-]
diff --git a/DebuggingSpy/DSMouseEnterWindowRecord.class.st b/DebuggingSpy/DSMouseEnterWindowRecord.class.st
index 0d5a0a2..e44ec43 100644
--- a/DebuggingSpy/DSMouseEnterWindowRecord.class.st
+++ b/DebuggingSpy/DSMouseEnterWindowRecord.class.st
@@ -4,9 +4,6 @@ This record is generated when the mouse enters a window (with or without focus).
 Class {
 	#name : 'DSMouseEnterWindowRecord',
 	#superclass : 'DSMouseEventRecord',
-	#instVars : [
-		'toolInfo'
-	],
 	#category : 'DebuggingSpy-Records',
 	#package : 'DebuggingSpy',
 	#tag : 'Records'
@@ -16,23 +13,3 @@ Class {
 DSMouseEnterWindowRecord >> eventName [
 	^'Enter window'
 ]
-
-{ #category : 'actions api' }
-DSMouseEnterWindowRecord >> record: morphsAndWindow [
-
-	| window tool |
-	super record: morphsAndWindow.
-	window := morphsAndWindow last.
-	window ifNil: [ ^ self ].
-	tool := DSSpy toolInWindow: window.
-	tool ifNil: [ ^ self ].
-	toolInfo := DSToolInfo
-		            toolNamed: tool class name
-		            id: tool identityHash
-		            windowId: windowId
-]
-
-{ #category : 'accessing' }
-DSMouseEnterWindowRecord >> toolInfo [
-	^ toolInfo
-]
diff --git a/DebuggingSpy/DSMouseEventRecord.class.st b/DebuggingSpy/DSMouseEventRecord.class.st
index 3f3f67a..526b0d0 100644
--- a/DebuggingSpy/DSMouseEventRecord.class.st
+++ b/DebuggingSpy/DSMouseEventRecord.class.st
@@ -9,7 +9,7 @@ Class {
 	#name : 'DSMouseEventRecord',
 	#superclass : 'DSAbstractEventRecord',
 	#instVars : [
-		'itemElement'
+		'toolInfo'
 	],
 	#category : 'DebuggingSpy-Records',
 	#package : 'DebuggingSpy',
@@ -17,20 +17,28 @@ Class {
 }
 
 { #category : 'accessing' }
-DSMouseEventRecord >> itemElement [
+DSMouseEventRecord class >> link [
 
-	^ itemElement
+	^ MetaLink new
+		  metaObject: self;
+		  selector: #for:;
+		  arguments: #( receiver );
+		  control: #before
 ]
 
-{ #category : 'accessing' }
-DSMouseEventRecord >> itemElement: anObject [
+{ #category : 'actions api' }
+DSMouseEventRecord >> record: aWindow [
+
+	| tool |
+	windowId := aWindow identityHash.
 
-	itemElement := anObject
+	tool := DSSpy toolInWindow: aWindow.
+	tool ifNil: [ ^ self ].
+	toolInfo := DSToolInfo toolNamed: tool class name id: tool identityHash windowId: windowId
 ]
 
-{ #category : 'actions api' }
-DSMouseEventRecord >> record: morphsAndWindow [
+{ #category : 'accessing' }
+DSMouseEventRecord >> toolInfo [ 
 
-	itemElement := self class printStringMorphs: morphsAndWindow first.
-	windowId := morphsAndWindow last identityHash
+	^ toolInfo 
 ]
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 2ae2abe..495bb8a 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -254,42 +254,16 @@ DSSpyInstrumenter >> instrumentInspectorPageSelection [
 			do: [ :e | DSSpy log: #ERROR key: #INSPECTOR_META_CLASS ] ]'
 ]
 
-{ #category : 'mouse events' }
-DSSpyInstrumenter >> instrumentMouseDownFTSelectableMorph [
-
-	FTSelectableMorph compile:'mouseDown: evt 
-	[DSMouseDownTableItemRecord for: {self allMorphs. self window}] on: Error do:[:e| DSSpy log: #ERROR key: #CLICK_ON_TABLE_ITEM].
-	^super mouseDown: evt '
-]
-
-{ #category : 'mouse events' }
-DSSpyInstrumenter >> instrumentMouseEnterFTSelectableMorph [
-
-	FTSelectableMorph compile: 'mouseEnter: evt
-
-	[DSMouseEnterTableItemRecord for: {self allMorphs. self window}] on: Error do:[:e| DSSpy log: #ERROR key: #ENTER_TABLE_ITEM].
-	colorBeforeOver := self color.
-	self color: (selectionColor isTransparent
-			 ifTrue: [ self mouseOverColor ]
-			 ifFalse: [ self mouseOverColor mixed: 0.5 with: selectionColor ])'
-]
-
-{ #category : 'mouse events' }
+{ #category : 'system' }
 DSSpyInstrumenter >> instrumentMouseEnterWindow [
 
-	SystemWindow compile: 'handleMouseEnter: anEvent
-	
-	[DSMouseEnterWindowRecord for:{{self}. self}] on: Error do:[:e| DSSpy log: #ERROR key: #WINDOW_ENTER ].
-	^super handleMouseEnter: anEvent'
+	SystemWindow link: DSMouseEnterWindowRecord link toAST: (SystemWindow >> #handleMouseEnter:) ast
 ]
 
 { #category : 'mouse events' }
 DSSpyInstrumenter >> instrumentMouseLeaveWindow [
-	
-	SystemWindow compile: 'handleMouseLeave: anEvent
-	
-	[DSMouseLeaveWindowRecord for:{{self}. self}] on: Error do:[:e| DSSpy log: #ERROR key: #WINDOW_LEAVE ]	.
-	^super handleMouseLeave: anEvent'
+
+	SystemWindow link: DSMouseLeaveWindowRecord link toAST: (SystemWindow >> #handleMouseLeave:) ast
 ]
 
 { #category : 'inspector' }
@@ -322,73 +296,6 @@ DSSpyInstrumenter >> instrumentPrintIt [
 	SpCodePrintItCommand link: DSPrintItRecord link toAST: (SpCodePrintItCommand >> #execute) ast
 ]
 
-{ #category : 'mouse events' }
-DSSpyInstrumenter >> instrumentRubScrollTextMorphHandleMouseOver [
-
-	RubScrolledTextMorph compile: 'handlesMouseOver: evt
-	^true'
-]
-
-{ #category : 'mouse events' }
-DSSpyInstrumenter >> instrumentRubScrollTextMorphMouseEnter [
-
-	RubScrolledTextMorph compile: 'mouseEnter: evt
-	[DSMouseEnterTextEditorRecord for: {{self allMorphs}. self window}] on: Error do:[ DSSpy log: #ERROR key: #CODE_FOCUS ].
-	^super mouseEnter: evt'
-]
-
-{ #category : 'mouse events' }
-DSSpyInstrumenter >> instrumentScrollingByDraggingSlider [
-	
-SliderMorph compile: 'dragging: aBoolean
-
-	(aBoolean not and: [ dragging ]) ifTrue: [ 
-		[ DSStopScrollingEventRecord for: self window ]
-			on: Error
-			do: [ :e | DSSpy log: #ERROR key: #SCROLL_STOP ] ].
-	dragging := aBoolean.
-	dragging ifTrue: [ 
-		[ DSStartScrollingEventRecord for: self window ]
-			on: Error
-			do: [ :e | DSSpy log: #ERROR key: #SCROLL_START ] ]'
-]
-
-{ #category : 'mouse events' }
-DSSpyInstrumenter >> instrumentScrollingInScrollPanesEvents [
-	
-	
-GeneralScrollPaneMorph  compile: 'mouseWheel: event 
-	"Handle a mouseWheel event."
-	[DSScrollEventRecord for: self window] on: Error do:[:e| DSSpy log: #ERROR key: #SCROLL].
-	(self scrollTarget handlesMouseWheel: event)
-		ifTrue: [^self scrollTarget mouseWheel: event]. "pass on"
-	
-	event isUp ifTrue: [ ^ vScrollbar scrollUp: 3 ].
-	event isDown ifTrue: [ ^ vScrollbar scrollDown: 3 ].
-	event isLeft  ifTrue: [ ^ hScrollbar scrollLeft: 3 ].
-	event isRight  ifTrue: [ ^ hScrollbar scrollRight: 3 ].'
-]
-
-{ #category : 'mouse events' }
-DSSpyInstrumenter >> instrumentScrollingInTablesEvents [
-	FTTableMorph compile:'mouseWheel: event
-
-	"I tried scrolling up/down with a calculated value (check #scrollUpByPageDelta implementor)
-	 but the scrollbar proved been more intelligent than me... looks like hardcoded values 
-	 work better :/"
-	[DSScrollEventRecord for: self window] on: Error do:[:e| DSSpy log: #ERROR key: #SCROLL].
-	event isUp ifTrue: [ 
-		self verticalScrollBar scrollRestrictedUp: 3.
-		^ self
-	].
-	event isDown ifTrue: [ 
-		self verticalScrollBar scrollRestrictedDown: 3.
-		^ self
-	].
-	
-	super mouseWheel: event'
-]
-
 { #category : 'debugger' }
 DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
 	StDebugger class compile:
@@ -419,15 +326,15 @@ DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
 
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> instrumentSystem [
-	"self instrumentDebuggerOpening."
+	"Instrument every thing in the system, feel free to comment things you don't want to record"
 
 	self listenToWindowEvents.
 	self listenToDebugPointChanges.
 	self logTextEditorsClipbardActions.
+	self logMouseEvents.
 	self logCodeInteractions "self logClyBrowsersOpenings." "self logDebuggerInteractions.
 	self logHaltAndBreakpointEvents.
 	self logInspectorInteractions.
-	self logMouseEvents.
 	self listenToWindowEvents.
 	self listenToMethodChanges"
 ]
@@ -499,12 +406,8 @@ DSSpyInstrumenter >> logInspectorInteractions [
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logMouseEvents [
 
-	self instrumentMouseDownFTSelectableMorph.
-	self instrumentMouseEnterFTSelectableMorph.
 	self instrumentMouseEnterWindow.
-	self instrumentMouseLeaveWindow.
-	self instrumentRubScrollTextMorphHandleMouseOver.
-	self instrumentRubScrollTextMorphMouseEnter
+	self instrumentMouseLeaveWindow
 ]
 
 { #category : 'system-instrumentation' }
diff --git a/DebuggingSpy/SystemWindow.extension.st b/DebuggingSpy/SystemWindow.extension.st
new file mode 100644
index 0000000..1327137
--- /dev/null
+++ b/DebuggingSpy/SystemWindow.extension.st
@@ -0,0 +1,13 @@
+Extension { #name : 'SystemWindow' }
+
+{ #category : '*DebuggingSpy' }
+SystemWindow >> handleMouseEnter: anEvent [
+
+	super handleMouseEnter: anEvent
+]
+
+{ #category : '*DebuggingSpy' }
+SystemWindow >> handleMouseLeave: anEvent [
+
+	super handleMouseLeave: anEvent
+]

From 6c9f598c52d31e4bf5362e7c5fb1ca25c9a11c83 Mon Sep 17 00:00:00 2001
From: Jules Boulet <126467965+Julesboul@users.noreply.github.com>
Date: Mon, 22 Dec 2025 16:08:48 +0100
Subject: [PATCH 13/49] Update DSSTONFileLogger.class.st

---
 DebuggingSpy/DSSTONFileLogger.class.st | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DebuggingSpy/DSSTONFileLogger.class.st b/DebuggingSpy/DSSTONFileLogger.class.st
index 7eec78e..99eafa1 100644
--- a/DebuggingSpy/DSSTONFileLogger.class.st
+++ b/DebuggingSpy/DSSTONFileLogger.class.st
@@ -4,8 +4,8 @@ I log DSRecords as STON into files.
 Class {
 	#name : 'DSSTONFileLogger',
 	#superclass : 'Object',
-	#traits : 'TLogger',
-	#classTraits : 'TLogger classTrait',
+	#traits : 'TExperimentLogger',
+	#classTraits : 'TExperimentLogger classTrait',
 	#instVars : [
 		'loggingDirectory',
 		'loggingFilename',

From 70bc39b13ef7927f1f206f48697ac123dd818860 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 5 Jan 2026 11:09:04 +0100
Subject: [PATCH 14/49] wip

---
 DebuggingSpy/DSAbstractBrowserRecord.class.st |  10 +
 DebuggingSpy/DSAbstractEventRecord.class.st   |  10 +
 DebuggingSpy/DSAbstractTaskRecord.class.st    |  33 ----
 DebuggingSpy/DSBrowseRecord.class.st          |  15 ++
 DebuggingSpy/DSClipboardActionRecord.class.st |  10 -
 DebuggingSpy/DSCodeActionRecord.class.st      |   9 -
 DebuggingSpy/DSCompositeEventRecord.class.st  |  63 -------
 DebuggingSpy/DSEndingTaskRecord.class.st      |  22 ---
 DebuggingSpy/DSExpandAttributeRecord.class.st |  26 ---
 DebuggingSpy/DSFullBrowseRecord.class.st      |  82 ---------
 DebuggingSpy/DSImplementorsRecord.class.st    |  15 ++
 .../DSInspectAttributeRecord.class.st         |  76 --------
 .../DSInspectMethodSourceRecord.class.st      |  40 ----
 DebuggingSpy/DSInspectMethodsRecord.class.st  |  44 -----
 DebuggingSpy/DSInspectObjectRecord.class.st   |  31 ----
 DebuggingSpy/DSInspectorRecord.class.st       |  51 ------
 .../DSMergedWindowActivityRecord.class.st     |  64 -------
 .../DSMethodDebugPointRecord.class.st         |   3 +
 DebuggingSpy/DSMouseEventRecord.class.st      |  10 -
 .../DSNavigateAttributeRecord.class.st        |  29 ---
 DebuggingSpy/DSQueryBrowseRecord.class.st     |  37 ----
 DebuggingSpy/DSRecordRegistry.class.st        |   3 +
 DebuggingSpy/DSScrollEventRecord.class.st     |  16 --
 .../DSSelectInspectorPageRecord.class.st      |  49 -----
 DebuggingSpy/DSSendersRecord.class.st         |  15 ++
 DebuggingSpy/DSSpyInstrumenter.class.st       |  44 +----
 .../DSStartScrollingEventRecord.class.st      |  15 --
 DebuggingSpy/DSStartTaskRecord.class.st       |  15 --
 .../DSStopScrollingEventRecord.class.st       |  15 --
 DebuggingSpy/DSTaskSuccessRecord.class.st     |  33 ----
 DebuggingSpy/DSWindowActivityRecord.class.st  | 173 ------------------
 31 files changed, 74 insertions(+), 984 deletions(-)
 create mode 100644 DebuggingSpy/DSAbstractBrowserRecord.class.st
 delete mode 100644 DebuggingSpy/DSAbstractTaskRecord.class.st
 create mode 100644 DebuggingSpy/DSBrowseRecord.class.st
 delete mode 100644 DebuggingSpy/DSCompositeEventRecord.class.st
 delete mode 100644 DebuggingSpy/DSEndingTaskRecord.class.st
 delete mode 100644 DebuggingSpy/DSExpandAttributeRecord.class.st
 delete mode 100644 DebuggingSpy/DSFullBrowseRecord.class.st
 create mode 100644 DebuggingSpy/DSImplementorsRecord.class.st
 delete mode 100644 DebuggingSpy/DSInspectAttributeRecord.class.st
 delete mode 100644 DebuggingSpy/DSInspectMethodSourceRecord.class.st
 delete mode 100644 DebuggingSpy/DSInspectMethodsRecord.class.st
 delete mode 100644 DebuggingSpy/DSInspectObjectRecord.class.st
 delete mode 100644 DebuggingSpy/DSInspectorRecord.class.st
 delete mode 100644 DebuggingSpy/DSMergedWindowActivityRecord.class.st
 delete mode 100644 DebuggingSpy/DSNavigateAttributeRecord.class.st
 delete mode 100644 DebuggingSpy/DSQueryBrowseRecord.class.st
 delete mode 100644 DebuggingSpy/DSScrollEventRecord.class.st
 delete mode 100644 DebuggingSpy/DSSelectInspectorPageRecord.class.st
 create mode 100644 DebuggingSpy/DSSendersRecord.class.st
 delete mode 100644 DebuggingSpy/DSStartScrollingEventRecord.class.st
 delete mode 100644 DebuggingSpy/DSStartTaskRecord.class.st
 delete mode 100644 DebuggingSpy/DSStopScrollingEventRecord.class.st
 delete mode 100644 DebuggingSpy/DSTaskSuccessRecord.class.st
 delete mode 100644 DebuggingSpy/DSWindowActivityRecord.class.st

diff --git a/DebuggingSpy/DSAbstractBrowserRecord.class.st b/DebuggingSpy/DSAbstractBrowserRecord.class.st
new file mode 100644
index 0000000..ede14cd
--- /dev/null
+++ b/DebuggingSpy/DSAbstractBrowserRecord.class.st
@@ -0,0 +1,10 @@
+"
+Abstract record for events linked to the browser : browse, senders, implementors, ...
+"
+Class {
+	#name : 'DSAbstractBrowserRecord',
+	#superclass : 'DSAbstractEventRecord',
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index d216f3b..5a88035 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -23,6 +23,16 @@ DSAbstractEventRecord class >> for: anObject [
 	^ rec
 ]
 
+{ #category : 'accessing' }
+DSAbstractEventRecord class >> link [
+
+	^ MetaLink new
+		  metaObject: self;
+		  selector: #for:;
+		  arguments: #( receiver );
+		  control: #before
+]
+
 { #category : 'comparing' }
 DSAbstractEventRecord >> < aDSAbstractRecord [
 	^self dateTime < aDSAbstractRecord dateTime
diff --git a/DebuggingSpy/DSAbstractTaskRecord.class.st b/DebuggingSpy/DSAbstractTaskRecord.class.st
deleted file mode 100644
index 7d20053..0000000
--- a/DebuggingSpy/DSAbstractTaskRecord.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-"
-I am an optional record to manage tasks starting and ending in empirical experiments.
-My subclasses specialize me to provide specific task management.
-
-Tasks should be objects answering `#name` and `#description`, both returning a string.
-"
-Class {
-	#name : 'DSAbstractTaskRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'task'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSAbstractTaskRecord >> description [
-
-	^ task description
-]
-
-{ #category : 'actions api' }
-DSAbstractTaskRecord >> record: aTask [
-	task := aTask
-]
-
-{ #category : 'accessing' }
-DSAbstractTaskRecord >> taskName [
-
-	^ task title
-]
diff --git a/DebuggingSpy/DSBrowseRecord.class.st b/DebuggingSpy/DSBrowseRecord.class.st
new file mode 100644
index 0000000..8099067
--- /dev/null
+++ b/DebuggingSpy/DSBrowseRecord.class.st
@@ -0,0 +1,15 @@
+"
+Record when a user is doing a ""Browse"" on a class, method, ...
+"
+Class {
+	#name : 'DSBrowseRecord',
+	#superclass : 'DSAbstractBrowserRecord',
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSBrowseRecord >> eventName [
+	^ 'Browse'
+]
diff --git a/DebuggingSpy/DSClipboardActionRecord.class.st b/DebuggingSpy/DSClipboardActionRecord.class.st
index 71bf458..a7c4447 100644
--- a/DebuggingSpy/DSClipboardActionRecord.class.st
+++ b/DebuggingSpy/DSClipboardActionRecord.class.st
@@ -15,16 +15,6 @@ Class {
 	#tag : 'Records'
 }
 
-{ #category : 'accessing' }
-DSClipboardActionRecord class >> link [
-
-	^ MetaLink new
-		  metaObject: self;
-		  selector: #for:;
-		  arguments: #( receiver );
-		  control: #before
-]
-
 { #category : 'accessing' }
 DSClipboardActionRecord >> clipboardText [
 
diff --git a/DebuggingSpy/DSCodeActionRecord.class.st b/DebuggingSpy/DSCodeActionRecord.class.st
index 8a30fad..bc029a3 100644
--- a/DebuggingSpy/DSCodeActionRecord.class.st
+++ b/DebuggingSpy/DSCodeActionRecord.class.st
@@ -13,15 +13,6 @@ Class {
 	#tag : 'Records'
 }
 
-{ #category : 'accessing' }
-DSCodeActionRecord class >> link [
-	^ MetaLink new
-		metaObject: self;
-		selector: #for:;
-		arguments: #(receiver);
-		control: #before
-]
-
 { #category : 'actions api' }
 DSCodeActionRecord >> record: anEditor [
 
diff --git a/DebuggingSpy/DSCompositeEventRecord.class.st b/DebuggingSpy/DSCompositeEventRecord.class.st
deleted file mode 100644
index d808f31..0000000
--- a/DebuggingSpy/DSCompositeEventRecord.class.st
+++ /dev/null
@@ -1,63 +0,0 @@
-Class {
-	#name : 'DSCompositeEventRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'subEvents'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'adding' }
-DSCompositeEventRecord >> addSubEvent: aDSEvent [
-
-	self subEvents add: aDSEvent
-]
-
-{ #category : 'API' }
-DSCompositeEventRecord >> canOpenDebuggers [
-
-	^ self subEvents first canOpenDebuggers
-]
-
-{ #category : 'accessing' }
-DSCompositeEventRecord >> dateTime [
-
-	^ self subEvents first dateTime
-]
-
-{ #category : 'API' }
-DSCompositeEventRecord >> duration [
-
-	^ subEvents last dateTime - subEvents first dateTime
-]
-
-{ #category : 'accessing' }
-DSCompositeEventRecord >> eventName [
-	^subEvents first eventName
-]
-
-{ #category : 'accessing' }
-DSCompositeEventRecord >> subEvents [
-
-	^ subEvents ifNil: [ subEvents := OrderedCollection new ]
-]
-
-{ #category : 'accessing' }
-DSCompositeEventRecord >> subEvents: anObject [
-
-	subEvents := anObject
-]
-
-{ #category : 'API' }
-DSCompositeEventRecord >> windowId [
-
-	^ self subEvents first windowId
-]
-
-{ #category : 'API' }
-DSCompositeEventRecord >> windowType [
-
-	^ self subEvents first windowType
-]
diff --git a/DebuggingSpy/DSEndingTaskRecord.class.st b/DebuggingSpy/DSEndingTaskRecord.class.st
deleted file mode 100644
index 49321ad..0000000
--- a/DebuggingSpy/DSEndingTaskRecord.class.st
+++ /dev/null
@@ -1,22 +0,0 @@
-"
-I represent the ending point in time of an experimental task.
-Tasks are object that should answer to `#name`, `#description` and `#answer`, all returning a string
-
-"
-Class {
-	#name : 'DSEndingTaskRecord',
-	#superclass : 'DSAbstractTaskRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSEndingTaskRecord >> answer [
-	^ task answer
-]
-
-{ #category : 'accessing' }
-DSEndingTaskRecord >> eventName [
-	^'Ending task'
-]
diff --git a/DebuggingSpy/DSExpandAttributeRecord.class.st b/DebuggingSpy/DSExpandAttributeRecord.class.st
deleted file mode 100644
index f115b71..0000000
--- a/DebuggingSpy/DSExpandAttributeRecord.class.st
+++ /dev/null
@@ -1,26 +0,0 @@
-"
-I record the inspection of an inspected object's attribute through expanding inspector trees
-"
-Class {
-	#name : 'DSExpandAttributeRecord',
-	#superclass : 'DSInspectAttributeRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing - structure variables' }
-DSExpandAttributeRecord >> glyph [
-	^'EA'
-]
-
-{ #category : 'actions api' }
-DSExpandAttributeRecord >> record: aFTTableItem [
-	|window|
-	window := aFTTableItem dataSource model window.
-	(window isKindOf: SpWindowPresenter) ifTrue:[window := window window].
-	super record: { 
-			aFTTableItem data.
-			aFTTableItem data hostObject.
-			window}
-]
diff --git a/DebuggingSpy/DSFullBrowseRecord.class.st b/DebuggingSpy/DSFullBrowseRecord.class.st
deleted file mode 100644
index 3fbdb8b..0000000
--- a/DebuggingSpy/DSFullBrowseRecord.class.st
+++ /dev/null
@@ -1,82 +0,0 @@
-"
-I record user browsing code action.
-I store the browsed package, class and method names, and the window id in which it happened.
-Elements are browsed in order `package>class>method`.
-If one of them is nil, for instance, `package>class>nil`, it means that the user is browsing the class and possibly looking at its methods, or at the list of classes in the package, or at the packages list.
-
-I have to register names instead of objects, as there are no guarantees that the image that analyzes the record has these package/class/method.
-"
-Class {
-	#name : 'DSFullBrowseRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'methodBrowsed',
-		'packageBrowsed',
-		'classBrowsed'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> classBrowsed [
-
-	^ classBrowsed
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> classBrowsed: anObject [
-
-	classBrowsed := anObject
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> eventName [
-	^'Browse'
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> methodBrowsed [
-
-	^ methodBrowsed
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> methodBrowsed: anObject [
-
-	methodBrowsed := anObject
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> packageBrowsed [
-
-	^ packageBrowsed
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> packageBrowsed: anObject [
-
-	packageBrowsed := anObject
-]
-
-{ #category : 'actions api' }
-DSFullBrowseRecord >> record: aClyFullBrowser [
-	super record: aClyFullBrowser window.
-	packageBrowsed := aClyFullBrowser packageSelection isEmpty
-		                  ifTrue: [ '' ]
-		                  ifFalse: [ 
-		                  aClyFullBrowser packageSelection lastSelectedItem
-			                  actualObject name ].
-	classBrowsed := aClyFullBrowser classSelection isEmpty
-		                ifTrue: [ '' ]
-		                ifFalse: [ 
-		                aClyFullBrowser classSelection lastSelectedItem
-			                actualObject name ].
-	methodBrowsed := aClyFullBrowser methodSelection isEmpty
-		                 ifTrue: [ '' ]
-		                 ifFalse: [ 
-		                 aClyFullBrowser methodSelection lastSelectedItem
-			                 actualObject name ].
-	
-]
diff --git a/DebuggingSpy/DSImplementorsRecord.class.st b/DebuggingSpy/DSImplementorsRecord.class.st
new file mode 100644
index 0000000..d4890c1
--- /dev/null
+++ b/DebuggingSpy/DSImplementorsRecord.class.st
@@ -0,0 +1,15 @@
+"
+Record when a user is searching for implementors of a class, method, ...
+"
+Class {
+	#name : 'DSImplementorsRecord',
+	#superclass : 'DSAbstractBrowserRecord',
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSImplementorsRecord >> eventName [
+	^ 'Implementors'
+]
diff --git a/DebuggingSpy/DSInspectAttributeRecord.class.st b/DebuggingSpy/DSInspectAttributeRecord.class.st
deleted file mode 100644
index 5b69ead..0000000
--- a/DebuggingSpy/DSInspectAttributeRecord.class.st
+++ /dev/null
@@ -1,76 +0,0 @@
-"
-I record the inspection of an inspected object's attribute
-"
-Class {
-	#name : 'DSInspectAttributeRecord',
-	#superclass : 'DSInspectorRecord',
-	#instVars : [
-		'attributeName',
-		'attributeValue',
-		'attributeHash'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSInspectAttributeRecord >> attributeHash [
-
-	^ attributeHash
-]
-
-{ #category : 'accessing' }
-DSInspectAttributeRecord >> attributeHash: anObject [
-
-	attributeHash := anObject
-]
-
-{ #category : 'accessing' }
-DSInspectAttributeRecord >> attributeName [
-
-	^ attributeName
-]
-
-{ #category : 'accessing' }
-DSInspectAttributeRecord >> attributeName: anObject [
-
-	attributeName := anObject
-]
-
-{ #category : 'accessing' }
-DSInspectAttributeRecord >> attributeValue [
-
-	^ attributeValue
-]
-
-{ #category : 'accessing' }
-DSInspectAttributeRecord >> attributeValue: anObject [
-
-	attributeValue := anObject
-]
-
-{ #category : 'accessing' }
-DSInspectAttributeRecord >> eventName [
-	^'Inspect object'
-]
-
-{ #category : 'accessing - structure variables' }
-DSInspectAttributeRecord >> glyph [
-	^'InA'
-]
-
-{ #category : 'actions api' }
-DSInspectAttributeRecord >> record: inspectorNodeWithInspectedObjectWithWindow [
-
-	| inspectorNode window |
-	inspectorNode := inspectorNodeWithInspectedObjectWithWindow first.
-	inspectedObject := inspectorNodeWithInspectedObjectWithWindow second.
-	window := inspectorNodeWithInspectedObjectWithWindow third.
-	super record: { 
-			inspectedObject.
-			window }.
-	attributeName := inspectorNode key.
-	attributeValue := inspectorNode stringValue.
-	attributeHash := inspectorNode value identityHash
-]
diff --git a/DebuggingSpy/DSInspectMethodSourceRecord.class.st b/DebuggingSpy/DSInspectMethodSourceRecord.class.st
deleted file mode 100644
index 28b19ec..0000000
--- a/DebuggingSpy/DSInspectMethodSourceRecord.class.st
+++ /dev/null
@@ -1,40 +0,0 @@
-"
-I record inspections of the source of a method in the meta pane of an inspector
-"
-Class {
-	#name : 'DSInspectMethodSourceRecord',
-	#superclass : 'DSInspectMethodsRecord',
-	#instVars : [
-		'selectedMethod'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing - structure variables' }
-DSInspectMethodSourceRecord >> glyph [
-	^'InMS'
-]
-
-{ #category : 'actions api' }
-DSInspectMethodSourceRecord >> record: inspectedObjectWithSelectedClassWithSelectedMethodWithWindow [
-
-	super record: { 
-			inspectedObjectWithSelectedClassWithSelectedMethodWithWindow first.
-			inspectedObjectWithSelectedClassWithSelectedMethodWithWindow second.
-			inspectedObjectWithSelectedClassWithSelectedMethodWithWindow last }.
-	selectedMethod := inspectedObjectWithSelectedClassWithSelectedMethodWithWindow third name
-]
-
-{ #category : 'accessing' }
-DSInspectMethodSourceRecord >> selectedMethod [
-
-	^ selectedMethod
-]
-
-{ #category : 'accessing' }
-DSInspectMethodSourceRecord >> selectedMethod: anObject [
-
-	selectedMethod := anObject
-]
diff --git a/DebuggingSpy/DSInspectMethodsRecord.class.st b/DebuggingSpy/DSInspectMethodsRecord.class.st
deleted file mode 100644
index f93e975..0000000
--- a/DebuggingSpy/DSInspectMethodsRecord.class.st
+++ /dev/null
@@ -1,44 +0,0 @@
-"
-I record inspections of the methods of a class in the meta pane of an inspector.
-"
-Class {
-	#name : 'DSInspectMethodsRecord',
-	#superclass : 'DSInspectorRecord',
-	#instVars : [
-		'selectedClass'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSInspectMethodsRecord >> eventName [
-	^'Inspect methods'
-]
-
-{ #category : 'accessing - structure variables' }
-DSInspectMethodsRecord >> glyph [
-	^'InM'
-]
-
-{ #category : 'actions api' }
-DSInspectMethodsRecord >> record: inspectedObjectWithSelectedClassWithWindow [
-
-	super record: { 
-			inspectedObjectWithSelectedClassWithWindow first.
-			inspectedObjectWithSelectedClassWithWindow last }.
-	selectedClass := inspectedObjectWithSelectedClassWithWindow second name
-]
-
-{ #category : 'accessing' }
-DSInspectMethodsRecord >> selectedClass [
-
-	^ selectedClass
-]
-
-{ #category : 'accessing' }
-DSInspectMethodsRecord >> selectedClass: anObject [
-
-	selectedClass := anObject
-]
diff --git a/DebuggingSpy/DSInspectObjectRecord.class.st b/DebuggingSpy/DSInspectObjectRecord.class.st
deleted file mode 100644
index 842e657..0000000
--- a/DebuggingSpy/DSInspectObjectRecord.class.st
+++ /dev/null
@@ -1,31 +0,0 @@
-"
-I record the opening of an inspector on an object
-"
-Class {
-	#name : 'DSInspectObjectRecord',
-	#superclass : 'DSInspectorRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSInspectObjectRecord >> eventName [
-	^'Inspect object'
-]
-
-{ #category : 'accessing - structure variables' }
-DSInspectObjectRecord >> glyph [
-	^'InO'
-]
-
-{ #category : 'accessing' }
-DSInspectObjectRecord >> windowName [
-
-	^ inspectedObject
-]
-
-{ #category : 'accessing' }
-DSInspectObjectRecord >> windowType [
-	^'Inspector'
-]
diff --git a/DebuggingSpy/DSInspectorRecord.class.st b/DebuggingSpy/DSInspectorRecord.class.st
deleted file mode 100644
index 55a04a7..0000000
--- a/DebuggingSpy/DSInspectorRecord.class.st
+++ /dev/null
@@ -1,51 +0,0 @@
-"
-I represent recorded events from an open inspector (standalone or embedded in another presenter).
-"
-Class {
-	#name : 'DSInspectorRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'inspectedObject',
-		'inspectedObjectHash'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing - structure variables' }
-DSInspectorRecord >> glyphColor [
-	^Color green darker
-]
-
-{ #category : 'accessing' }
-DSInspectorRecord >> inspectedObject [
-
-	^ inspectedObject
-]
-
-{ #category : 'accessing' }
-DSInspectorRecord >> inspectedObject: anObject [
-
-	inspectedObject := anObject
-]
-
-{ #category : 'accessing' }
-DSInspectorRecord >> inspectedObjectHash [
-
-	^ inspectedObjectHash
-]
-
-{ #category : 'accessing' }
-DSInspectorRecord >> inspectedObjectHash: anObject [
-
-	inspectedObjectHash := anObject
-]
-
-{ #category : 'actions api' }
-DSInspectorRecord >> record: inspectedObjectAndWindow [
-
-	super record: inspectedObjectAndWindow second.
-	inspectedObject := inspectedObjectAndWindow first printString.
-	inspectedObjectHash := inspectedObjectAndWindow first identityHash 
-]
diff --git a/DebuggingSpy/DSMergedWindowActivityRecord.class.st b/DebuggingSpy/DSMergedWindowActivityRecord.class.st
deleted file mode 100644
index a0e3bda..0000000
--- a/DebuggingSpy/DSMergedWindowActivityRecord.class.st
+++ /dev/null
@@ -1,64 +0,0 @@
-Class {
-	#name : 'DSMergedWindowActivityRecord',
-	#superclass : 'DSWindowActivityRecord',
-	#instVars : [
-		'activities'
-	],
-	#category : 'DebuggingSpy-Records-Extensions',
-	#package : 'DebuggingSpy',
-	#tag : 'Records-Extensions'
-}
-
-{ #category : 'accessing' }
-DSMergedWindowActivityRecord >> activities [
-
-	^ activities
-		  ifNil: [ activities := OrderedCollection new ]
-		  ifNotNil: [ activities ]
-]
-
-{ #category : 'accessing' }
-DSMergedWindowActivityRecord >> activities: anObject [
-
-	activities := anObject
-]
-
-{ #category : 'accessing' }
-DSMergedWindowActivityRecord >> duration [
-
-	^ (self activities
-		   inject: 0
-		   into: [ :sum :n | sum + n duration asSeconds ]) asSeconds
-]
-
-{ #category : 'accessing' }
-DSMergedWindowActivityRecord >> eventName [
-	
-	^ String streamContents: [ :ws |
-		  self window printTypeOn: ws.
-		  ws << ':'.
-		  ws space.
-		  ws << self duration humanReadablePrintString ]
-]
-
-{ #category : 'accessing' }
-DSMergedWindowActivityRecord >> events [
-
-	^ (self activities collect: #events) flattened
-]
-
-{ #category : 'merging' }
-DSMergedWindowActivityRecord >> merge: aDSWindowActivityRecord [
-
-	self mergeWith: aDSWindowActivityRecord
-]
-
-{ #category : 'merging' }
-DSMergedWindowActivityRecord >> mergeWith: anActivityRecord [
-	self activities add: anActivityRecord.
-	windowId ifNil:[windowId := anActivityRecord windowId].
-	start ifNil:[start := anActivityRecord start].
-	window ifNil:[window := anActivityRecord window].
-	next := anActivityRecord next.
-	stop := anActivityRecord stop.
-]
diff --git a/DebuggingSpy/DSMethodDebugPointRecord.class.st b/DebuggingSpy/DSMethodDebugPointRecord.class.st
index 48efc57..d79380e 100644
--- a/DebuggingSpy/DSMethodDebugPointRecord.class.st
+++ b/DebuggingSpy/DSMethodDebugPointRecord.class.st
@@ -1,3 +1,6 @@
+"
+Abstract class for records on DebugPoint's actions
+"
 Class {
 	#name : 'DSMethodDebugPointRecord',
 	#superclass : 'DSDebugPointRecord',
diff --git a/DebuggingSpy/DSMouseEventRecord.class.st b/DebuggingSpy/DSMouseEventRecord.class.st
index 526b0d0..4ec60aa 100644
--- a/DebuggingSpy/DSMouseEventRecord.class.st
+++ b/DebuggingSpy/DSMouseEventRecord.class.st
@@ -16,16 +16,6 @@ Class {
 	#tag : 'Records'
 }
 
-{ #category : 'accessing' }
-DSMouseEventRecord class >> link [
-
-	^ MetaLink new
-		  metaObject: self;
-		  selector: #for:;
-		  arguments: #( receiver );
-		  control: #before
-]
-
 { #category : 'actions api' }
 DSMouseEventRecord >> record: aWindow [
 
diff --git a/DebuggingSpy/DSNavigateAttributeRecord.class.st b/DebuggingSpy/DSNavigateAttributeRecord.class.st
deleted file mode 100644
index 766e541..0000000
--- a/DebuggingSpy/DSNavigateAttributeRecord.class.st
+++ /dev/null
@@ -1,29 +0,0 @@
-"
-I record the inspection of an inspected object's attribute through selecting attributes in inspector tables
-"
-Class {
-	#name : 'DSNavigateAttributeRecord',
-	#superclass : 'DSInspectAttributeRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSNavigateAttributeRecord >> context [
-	^'Inspecting attributes'
-]
-
-{ #category : 'accessing - structure variables' }
-DSNavigateAttributeRecord >> glyph [
-	^'NA'
-]
-
-{ #category : 'actions api' }
-DSNavigateAttributeRecord >> record: attributeWithModelAndWindow [
-
-	super record: { 
-			attributeWithModelAndWindow first first.
-			attributeWithModelAndWindow first second.
-			attributeWithModelAndWindow second }
-]
diff --git a/DebuggingSpy/DSQueryBrowseRecord.class.st b/DebuggingSpy/DSQueryBrowseRecord.class.st
deleted file mode 100644
index 1ee8a92..0000000
--- a/DebuggingSpy/DSQueryBrowseRecord.class.st
+++ /dev/null
@@ -1,37 +0,0 @@
-"
-I record user browsing queries results (implementors, selectors...).
-I store the name of the query and the id of the window
-"
-Class {
-	#name : 'DSQueryBrowseRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'queryName'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSQueryBrowseRecord >> eventName [
-	^'Query'
-]
-
-{ #category : 'accessing' }
-DSQueryBrowseRecord >> queryName [
-
-	^ queryName
-]
-
-{ #category : 'accessing' }
-DSQueryBrowseRecord >> queryName: anObject [
-
-	queryName := anObject
-]
-
-{ #category : 'actions api' }
-DSQueryBrowseRecord >> record: aClyQueryBrowser [
-	super record: aClyQueryBrowser window.
-	queryName := aClyQueryBrowser systemQuery description
-]
diff --git a/DebuggingSpy/DSRecordRegistry.class.st b/DebuggingSpy/DSRecordRegistry.class.st
index dda8bc0..b7ede8c 100644
--- a/DebuggingSpy/DSRecordRegistry.class.st
+++ b/DebuggingSpy/DSRecordRegistry.class.st
@@ -1,3 +1,6 @@
+"
+I am a registry containing all records during a recording session.
+"
 Class {
 	#name : 'DSRecordRegistry',
 	#superclass : 'Object',
diff --git a/DebuggingSpy/DSScrollEventRecord.class.st b/DebuggingSpy/DSScrollEventRecord.class.st
deleted file mode 100644
index a839bd2..0000000
--- a/DebuggingSpy/DSScrollEventRecord.class.st
+++ /dev/null
@@ -1,16 +0,0 @@
-"
-I record a scrolling event somewhere in a FTTableMorph or a GeneralScrollPane.
-To identify where I am scrolling, use the window id recorded by my superclass.
-"
-Class {
-	#name : 'DSScrollEventRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSScrollEventRecord >> eventName [
-	^'Scrolling'
-]
diff --git a/DebuggingSpy/DSSelectInspectorPageRecord.class.st b/DebuggingSpy/DSSelectInspectorPageRecord.class.st
deleted file mode 100644
index 1cb5c63..0000000
--- a/DebuggingSpy/DSSelectInspectorPageRecord.class.st
+++ /dev/null
@@ -1,49 +0,0 @@
-"
-I record the selection of an inspector page when inspecting an object
-"
-Class {
-	#name : 'DSSelectInspectorPageRecord',
-	#superclass : 'DSInspectorRecord',
-	#instVars : [
-		'pageTitle'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSSelectInspectorPageRecord >> context [
-	^'Inspecting (tab change)'
-]
-
-{ #category : 'accessing' }
-DSSelectInspectorPageRecord >> eventName [
-	^'Selecting inspector tab'
-]
-
-{ #category : 'accessing - structure variables' }
-DSSelectInspectorPageRecord >> glyph [
-	^'In'
-]
-
-{ #category : 'accessing' }
-DSSelectInspectorPageRecord >> pageTitle [
-
-	^ pageTitle
-]
-
-{ #category : 'accessing' }
-DSSelectInspectorPageRecord >> pageTitle: anObject [
-
-	pageTitle := anObject
-]
-
-{ #category : 'actions api' }
-DSSelectInspectorPageRecord >> record: pageTitleWithInspectedObjectWithWindow [
-
-	super record: { 
-			pageTitleWithInspectedObjectWithWindow second.
-			pageTitleWithInspectedObjectWithWindow last }.
-	pageTitle := pageTitleWithInspectedObjectWithWindow first
-]
diff --git a/DebuggingSpy/DSSendersRecord.class.st b/DebuggingSpy/DSSendersRecord.class.st
new file mode 100644
index 0000000..acda10b
--- /dev/null
+++ b/DebuggingSpy/DSSendersRecord.class.st
@@ -0,0 +1,15 @@
+"
+Record when user is searching for senders of a class, method, ...
+"
+Class {
+	#name : 'DSSendersRecord',
+	#superclass : 'DSAbstractBrowserRecord',
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSSendersRecord >> eventName [
+	^ 'Senders'
+]
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 495bb8a..65406c6 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -26,48 +26,10 @@ DSSpyInstrumenter class >> stopInstrumentation [
 	MetaLink uninstallAll "TO CHANGED : just uninstall targeted MetaLinks"
 ]
 
-{ #category : 'browsers' }
-DSSpyInstrumenter >> instrumentClyQueryBrowser [
-
-	ClyQueryBrowserMorph compile: 'newWindowTitle
-	| title | 
-	title := systemQuery description.
-	resultView areItemsLoaded 
-		ifTrue: [title := title capitalized , '' ['' ,  self itemCount asString, '']'']
-		ifFalse: [title := ''Loading: '', title ].
-	self systemScope isCurrentImage ifFalse: [ 
-		title := title , '' in '', self systemScope description ].
-	[DSQueryBrowseRecord for: self] on: Error do: [DSSpy log: #ERROR key: #QUERY].
-	^title'
-]
-
-{ #category : 'debugger' }
-DSSpyInstrumenter >> instrumentCodePresenter [
-
-	SpCodePresenter compile: 'initialize 
-
-	super initialize.
-
-	"Use the default menu"
-	overrideContextMenu := false.
-	
-	self withSyntaxHighlight.
-	self withSmartCharacters.
-	self showLineNumbers.
-	self subscribeToSettingsChangesAnnouncements.
-	
-	self registerEventsForStyling.
-	self clearInteractionModel.
+{ #category : 'system' }
+DSSpyInstrumenter >> instrumentBrowsingActions [
 
-	self eventHandler
-		whenKeyDownDo: [ :event | 
-			[ DSPlaygroundWriteRecord for: self ]
-				on: Error
-				do: [:e| DSSpy log: #ERROR key: #PLAYGROUND_WRITE ] ];
-		whenMouseEnterDo: [ :evt |
-			[ DSPlaygroundReadRecord for: self.  ]
-				on: Error
-				do: [ DSSpy log: #ERROR key: #PLAYGROUND_READ ] ]'
+	ClyBrowserMorph link: DSBrowseRecord link toAST: (ClyBrowserMorph >> #prepareInitialStateBy:) ast
 ]
 
 { #category : 'system' }
diff --git a/DebuggingSpy/DSStartScrollingEventRecord.class.st b/DebuggingSpy/DSStartScrollingEventRecord.class.st
deleted file mode 100644
index 555376f..0000000
--- a/DebuggingSpy/DSStartScrollingEventRecord.class.st
+++ /dev/null
@@ -1,15 +0,0 @@
-"
-I record when scrolling by dragging a slider stops.
-"
-Class {
-	#name : 'DSStartScrollingEventRecord',
-	#superclass : 'DSScrollEventRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSStartScrollingEventRecord >> eventName [
-	^'Scroll start'
-]
diff --git a/DebuggingSpy/DSStartTaskRecord.class.st b/DebuggingSpy/DSStartTaskRecord.class.st
deleted file mode 100644
index 2de0b2f..0000000
--- a/DebuggingSpy/DSStartTaskRecord.class.st
+++ /dev/null
@@ -1,15 +0,0 @@
-"
-I represent the starting point in time of the performing of an experimental task.
-"
-Class {
-	#name : 'DSStartTaskRecord',
-	#superclass : 'DSAbstractTaskRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSStartTaskRecord >> eventName [
-	^'Starting task'
-]
diff --git a/DebuggingSpy/DSStopScrollingEventRecord.class.st b/DebuggingSpy/DSStopScrollingEventRecord.class.st
deleted file mode 100644
index 243acbd..0000000
--- a/DebuggingSpy/DSStopScrollingEventRecord.class.st
+++ /dev/null
@@ -1,15 +0,0 @@
-"
-I record when scrolling by dragging a slider stops.
-"
-Class {
-	#name : 'DSStopScrollingEventRecord',
-	#superclass : 'DSScrollEventRecord',
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSStopScrollingEventRecord >> eventName [
-	^'Scroll stop'
-]
diff --git a/DebuggingSpy/DSTaskSuccessRecord.class.st b/DebuggingSpy/DSTaskSuccessRecord.class.st
deleted file mode 100644
index a5a0123..0000000
--- a/DebuggingSpy/DSTaskSuccessRecord.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-"
-I represent the result of an automatic evaluation of a task success.
-true = success.
-false = failure.
-This boolean is stored into the success inst var.
-"
-Class {
-	#name : 'DSTaskSuccessRecord',
-	#superclass : 'DSAbstractTaskRecord',
-	#instVars : [
-		'success'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSTaskSuccessRecord >> eventName [
-	^'Task success ', self success asString
-]
-
-{ #category : 'actions api' }
-DSTaskSuccessRecord >> record: anArray [
-	super record: anArray first.
-	success := anArray second
-]
-
-{ #category : 'accessing' }
-DSTaskSuccessRecord >> success [
-
-	^ success ifNil: [ success := false ]
-]
diff --git a/DebuggingSpy/DSWindowActivityRecord.class.st b/DebuggingSpy/DSWindowActivityRecord.class.st
deleted file mode 100644
index 396fce9..0000000
--- a/DebuggingSpy/DSWindowActivityRecord.class.st
+++ /dev/null
@@ -1,173 +0,0 @@
-Class {
-	#name : 'DSWindowActivityRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'start',
-		'stop',
-		'events',
-		'window',
-		'previous',
-		'next',
-		'annotation'
-	],
-	#category : 'DebuggingSpy-Records-Extensions',
-	#package : 'DebuggingSpy',
-	#tag : 'Records-Extensions'
-}
-
-{ #category : 'instance creation' }
-DSWindowActivityRecord class >> start: aDSMouseEnterWindowRecord stop: aDSMouseLeaveWindowRecord events: aCollection [
-
-	^ self new
-		  start: aDSMouseEnterWindowRecord;
-		  stop: aDSMouseLeaveWindowRecord;
-		  events: aCollection;
-		  yourself
-]
-
-{ #category : 'instance creation' }
-DSWindowActivityRecord class >> start: aDSMouseEnterWindowRecord stop: aDSMouseLeaveWindowRecord events: aCollection window: aDSWindowRecord [
-
-	^ (self
-		   start: aDSMouseEnterWindowRecord
-		   stop: aDSMouseLeaveWindowRecord
-		   events: aCollection)
-		  window: aDSWindowRecord;
-		  yourself
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> annotation [
-
-	^ annotation ifNil:[annotation := DSWindowAnnotation new]
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> annotation: anObject [
-
-	annotation := anObject
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> debuggingActionsClasses [
-
-	| classes |
-	classes := OrderedCollection withAll: DSInspectorRecord allSubclasses.
-	classes addAll: DSPlaygroundRecord allSubclasses.
-	classes addAll: DSStepActionRecord allSubclasses.
-	classes addAll: DSStepRecord allSubclasses.
-	classes add: DSBrowseContextRecord.
-	^ classes
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> duration [
-	^ events last dateTime - events first dateTime
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> eventName [
-
-	^ String streamContents: [ :ws |
-		  window printTypeOn: ws.
-		  ws << ':'.
-		  ws space.
-		  ws << self duration humanReadablePrintString ]
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> events [
-
-	^ events
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> events: anObject [
-
-	events := anObject
-]
-
-{ #category : 'inspections' }
-DSWindowActivityRecord >> inspectionAnnotation [
-
-	<inspectorPresentationOrder: 50 title: 'Annotation'>
-	^ DSWindowElementAnnotationPresenter on: self
-]
-
-{ #category : 'merging' }
-DSWindowActivityRecord >> merge: aDSWindowActivityRecord [
-	|merge become|
-	merge := DSMergedWindowActivityRecord new.
-	become := self.
-	merge become: self.
-	become mergeWith: merge.
-	become mergeWith: aDSWindowActivityRecord
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> next [
-
-	^ next
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> next: anObject [
-
-	next := anObject
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> previous [
-
-	^ previous
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> previous: anObject [
-
-	previous := anObject
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> start [
-
-	^ start
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> start: anObject [
-
-	start := anObject
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> stop [
-
-	^ stop
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> stop: anObject [
-
-	stop := anObject
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> window [
-
-	^ window
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> window: anObject [
-
-	window := anObject
-]
-
-{ #category : 'accessing' }
-DSWindowActivityRecord >> windowId [
-
-	^ windowId
-		  ifNil: [ windowId := window windowId ]
-		  ifNotNil: [ windowId ]
-]

From bae64e31e506125e296f812c9e631f755e06d524 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 5 Jan 2026 12:05:13 +0100
Subject: [PATCH 15/49] refactor: clean code

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 107 +-----------------------
 1 file changed, 3 insertions(+), 104 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 65406c6..538a9e1 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -108,16 +108,6 @@ DSSpyInstrumenter >> instrumentExceptionSignalling [
 	^ UnhandledError signalForException: self'
 ]
 
-{ #category : 'inspector' }
-DSSpyInstrumenter >> instrumentExpandAttribute [
-
-	FTBasicItem compile: 'expandAndRefresh
-	[DSExpandAttributeRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #INSPECTOR_OBSERVE].
-	self dataSource preservingScrollbarPositionDo: [
-		self expand.
-		self refreshTable ]'
-]
-
 { #category : 'debugpoints  ' }
 DSSpyInstrumenter >> instrumentHaltHits [
 	Halt class compile: 'signalIn: ctx	
@@ -156,66 +146,6 @@ DSSpyInstrumenter >> instrumentInspectIt [
 	SpCodePrintItCommand link: DSInspectItRecord link toAST: (SpCodeInspectItCommand >> #execute) ast
 ]
 
-{ #category : 'inspector' }
-DSSpyInstrumenter >> instrumentInspectMethodsOfClass [
-
-	StMetaBrowserPresenter compile: 'methodsOf: aClass
-
-	aClass ifNil: [ ^ #() ].
-	[DSInspectMethodsRecord for: {self model. self selectedClass. self window window}] on: Error do:[:e| DSSpy log: #ERROR key: #INSPECTOR_META_CLASS].
-	^ aClass methods sorted: #selector ascending
-'
-]
-
-{ #category : 'inspector' }
-DSSpyInstrumenter >> instrumentInspectSourceOfMethod [
-
-	StMetaBrowserPresenter compile: 'updateSourceWith: method
-	source userActionDuring: [
-		method
-			ifNotNil: [ 
-				[DSInspectMethodSourceRecord for: {self model. self selectedClass. self selectedMethod. self window window}] on: Error do:[ DSSpy log: #ERROR key: #INSPECTOR_META_METHOD].
-				source text: method sourceCode; beForMethod: method  ]
-			ifNil: [ 
-				source text: ''''; clearInteractionModel ] ]'
-]
-
-{ #category : 'inspector' }
-DSSpyInstrumenter >> instrumentInspectorOnObject [
-
-	StInspectorPresenter compile: 'initializePresenters
-	[ 
-	self class == StPlayground ifFalse: [ 
-		DSInspectObjectRecord for: { 
-				self model inspectedObject.
-				([self window window] on: Error do: [ 0 ]) } ] ]
-		on: Error
-		do: [ DSSpy log: #ERROR key: #INSPECTOR_INSPECT ].	
-	millerList := self instantiate: SpMillerPaginatorPresenter.
-	millerList millerListPresenter
-		spacing: self spacing;
-		presenterBlock: [ :aModel | self newInspectorFor: aModel ];
-		setRootModel: self model;
-		whenColumnsWillChangeDo: [ self keepLastPageSelectedTabName ]'
-]
-
-{ #category : 'inspector' }
-DSSpyInstrumenter >> instrumentInspectorPageSelection [
-
-	StObjectInspectorPresenter compile: 'initializePresenters
-	views := self newNotebook.
-	header := self instantiate: StHeaderBar.
-	
-	views whenSelectedPageChangedDo: [ :page | 
-		[ 
-		DSSelectInspectorPageRecord for: { 
-				page title.
-				self model inspectedObject.
-				[self window window] on: Error do:[0] } ]
-			on: Error
-			do: [ :e | DSSpy log: #ERROR key: #INSPECTOR_META_CLASS ] ]'
-]
-
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentMouseEnterWindow [
 
@@ -228,20 +158,6 @@ DSSpyInstrumenter >> instrumentMouseLeaveWindow [
 	SystemWindow link: DSMouseLeaveWindowRecord link toAST: (SystemWindow >> #handleMouseLeave:) ast
 ]
 
-{ #category : 'inspector' }
-DSSpyInstrumenter >> instrumentNavigateAttribute [
-
-	StRawInspectionPresenter compile: 'setAttributeTable
-
-	attributeTable children: [ :node | node children ].
-
-	self outputSelectionPort transmitDo: [ :val | 
-		val ifNotNil: [ 
-			[ DSNavigateAttributeRecord for: { {val. model}. self window window} ]
-				on: Error
-				do: [ :err | DSSpy log: #ERROR key: #INSPECTOR_OBSERVE ] ] ]'
-]
-
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentPaste [
 
@@ -294,9 +210,8 @@ DSSpyInstrumenter >> instrumentSystem [
 	self listenToDebugPointChanges.
 	self logTextEditorsClipbardActions.
 	self logMouseEvents.
-	self logCodeInteractions "self logClyBrowsersOpenings." "self logDebuggerInteractions.
+	self logCodeInteractions "self logDebuggerInteractions.
 	self logHaltAndBreakpointEvents.
-	self logInspectorInteractions.
 	self listenToWindowEvents.
 	self listenToMethodChanges"
 ]
@@ -325,24 +240,19 @@ DSSpyInstrumenter >> listenToWindowEvents [
 	self currentWorld announcer when: WindowActivated send: #logWindowActivated: to: DSSpy
 ]
 
-{ #category : 'system-instrumentation' }
-DSSpyInstrumenter >> logClyBrowsersOpenings [
-	self instrumentClyQueryBrowser
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logCodeInteractions [
 
 	self instrumentPrintIt.
 	self instrumentDebugIt.
 	self instrumentDoIt.
-	self instrumentDoItAndGo
+	self instrumentDoItAndGo.
+	self instrumentBrowsingActions 
 ]
 
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logDebuggerInteractions [
 
-	self instrumentCodePresenter.
 	self instrumentDebuggerCommands.
 	self instrumentDebuggerStack.
 	self instrumentSindarinDebuggerCommands
@@ -354,17 +264,6 @@ DSSpyInstrumenter >> logHaltAndBreakpointEvents [
 	self listenToDebugPointChanges 
 ]
 
-{ #category : 'system-instrumentation' }
-DSSpyInstrumenter >> logInspectorInteractions [
-
-	self instrumentExpandAttribute.
-	self instrumentInspectMethodsOfClass.
-	self instrumentInspectSourceOfMethod.
-	self instrumentInspectorOnObject.
-	self instrumentInspectorPageSelection.
-	self instrumentNavigateAttribute
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logMouseEvents [
 

From 0ddd9e302a035afb547df3c14b2b34e1623f42fb Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 5 Jan 2026 15:33:11 +0100
Subject: [PATCH 16/49] fix: fix mouse handling to match expected behavior

---
 DebuggingSpy/SystemWindow.extension.st | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DebuggingSpy/SystemWindow.extension.st b/DebuggingSpy/SystemWindow.extension.st
index 1327137..aaaa2a5 100644
--- a/DebuggingSpy/SystemWindow.extension.st
+++ b/DebuggingSpy/SystemWindow.extension.st
@@ -3,11 +3,11 @@ Extension { #name : 'SystemWindow' }
 { #category : '*DebuggingSpy' }
 SystemWindow >> handleMouseEnter: anEvent [
 
-	super handleMouseEnter: anEvent
+	^ super handleMouseEnter: anEvent
 ]
 
 { #category : '*DebuggingSpy' }
 SystemWindow >> handleMouseLeave: anEvent [
 
-	super handleMouseLeave: anEvent
+	^ super handleMouseLeave: anEvent
 ]

From 7297c5e25021b1d20224a148720194d848433a1a Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Tue, 6 Jan 2026 11:00:01 +0100
Subject: [PATCH 17/49] feat(instrumentation): add browsing actions
 instrumentation (browse, senders, implementors)

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

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 538a9e1..1cc493b 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -27,9 +27,10 @@ DSSpyInstrumenter class >> stopInstrumentation [
 ]
 
 { #category : 'system' }
-DSSpyInstrumenter >> instrumentBrowsingActions [
+DSSpyInstrumenter >> instrumentBrowseActions [
 
 	ClyBrowserMorph link: DSBrowseRecord link toAST: (ClyBrowserMorph >> #prepareInitialStateBy:) ast
+	"SpBrowseClassCommand link: DSBrowseRecord link toAST: (SpBrowseClassCommand >> #execute) ast"
 ]
 
 { #category : 'system' }
@@ -138,6 +139,13 @@ DSSpyInstrumenter >> instrumentHaltHits [
 	super signal'.
 ]
 
+{ #category : 'system' }
+DSSpyInstrumenter >> instrumentImplementorsActions [
+
+	ClyShowMessageImplementorCommand link: DSImplementorsRecord link toAST: (ClyShowMessageImplementorCommand >> #execute) ast.
+	SpBrowseImplementorsCommand link: DSImplementorsRecord link toAST: (SpBrowseImplementorsCommand >> #execute) ast
+]
+
 { #category : 'interactions' }
 DSSpyInstrumenter >> instrumentInspectIt [
 	"Instruments different inspectIt methods"
@@ -174,6 +182,13 @@ DSSpyInstrumenter >> instrumentPrintIt [
 	SpCodePrintItCommand link: DSPrintItRecord link toAST: (SpCodePrintItCommand >> #execute) ast
 ]
 
+{ #category : 'system' }
+DSSpyInstrumenter >> instrumentSendersActions [
+
+	ClyShowMessageSenderCommand link: DSSendersRecord link toAST: (ClyShowMessageSenderCommand >> #execute) ast.
+	SpBrowseSendersCommand link: DSSendersRecord link toAST: (SpBrowseSendersCommand >> #execute) ast
+]
+
 { #category : 'debugger' }
 DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
 	StDebugger class compile:
@@ -210,7 +225,8 @@ DSSpyInstrumenter >> instrumentSystem [
 	self listenToDebugPointChanges.
 	self logTextEditorsClipbardActions.
 	self logMouseEvents.
-	self logCodeInteractions "self logDebuggerInteractions.
+	self logCodeInteractions. 
+	self logBrowsingActions "self logDebuggerInteractions.
 	self logHaltAndBreakpointEvents.
 	self listenToWindowEvents.
 	self listenToMethodChanges"
@@ -240,14 +256,21 @@ DSSpyInstrumenter >> listenToWindowEvents [
 	self currentWorld announcer when: WindowActivated send: #logWindowActivated: to: DSSpy
 ]
 
+{ #category : 'system-instrumentation' }
+DSSpyInstrumenter >> logBrowsingActions [
+
+	self instrumentBrowseActions.
+	self instrumentImplementorsActions.
+	self instrumentSendersActions
+]
+
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logCodeInteractions [
 
 	self instrumentPrintIt.
 	self instrumentDebugIt.
 	self instrumentDoIt.
-	self instrumentDoItAndGo.
-	self instrumentBrowsingActions 
+	self instrumentDoItAndGo
 ]
 
 { #category : 'system-instrumentation' }

From c49427378e86aeb8b088f1fe607ecb74784d421a Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Tue, 6 Jan 2026 15:16:07 +0100
Subject: [PATCH 18/49] refactor(DSSpyInstrumenter): add comments to all
 methods for code clarity

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 41 +++++++++++++++++--------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 1cc493b..74c1bdc 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -28,13 +28,14 @@ DSSpyInstrumenter class >> stopInstrumentation [
 
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentBrowseActions [
+	"Instruments browse actions"
 
-	ClyBrowserMorph link: DSBrowseRecord link toAST: (ClyBrowserMorph >> #prepareInitialStateBy:) ast
-	"SpBrowseClassCommand link: DSBrowseRecord link toAST: (SpBrowseClassCommand >> #execute) ast"
+	ClyBrowserMorph link: DSBrowseRecord link toAST: (ClyBrowserMorph >> #prepareInitialStateBy:) ast "SpBrowseClassCommand link: DSBrowseRecord link toAST: (SpBrowseClassCommand >> #execute) ast"
 ]
 
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentCopySelection [
+	"Instruments the action of copying to clipboard"
 
 	RubTextEditor link: DSClipboardCopyRecord link toAST: (RubTextEditor >> #copySelection) ast.
 	RubSmalltalkEditor link: DSClipboardCopyRecord link toAST: (RubSmalltalkEditor >> #copySelection) ast
@@ -83,7 +84,7 @@ stackTable := self newList.
 
 { #category : 'interactions' }
 DSSpyInstrumenter >> instrumentDoIt [
-	"Instruments different doIt methods"
+	"Instruments different 'Do it' actions"
 
 	RubSmalltalkEditor link: DSDoItRecord link toAST: (RubSmalltalkEditor >> #doIt) ast.
 	SpCodePrintItCommand link: DSDoItRecord link toAST: (SpCodeDoItCommand >> #execute) ast
@@ -91,7 +92,7 @@ DSSpyInstrumenter >> instrumentDoIt [
 
 { #category : 'interactions' }
 DSSpyInstrumenter >> instrumentDoItAndGo [
-	"Instruments different doEvaluateAndGo methods"
+	"Instruments different 'Do it and go' actions"
 
 	StObjectContextPresenter link: DSDoItAndGoRecord link toAST: (StObjectContextPresenter >> #doEvaluateAndGo) ast.
 	StPlaygroundPagePresenter link: DSDoItAndGoRecord link toAST: (StPlaygroundPagePresenter >> #doEvaluateAndGo) ast
@@ -141,6 +142,7 @@ DSSpyInstrumenter >> instrumentHaltHits [
 
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentImplementorsActions [
+	"Instruments actions to show implementors of a method"
 
 	ClyShowMessageImplementorCommand link: DSImplementorsRecord link toAST: (ClyShowMessageImplementorCommand >> #execute) ast.
 	SpBrowseImplementorsCommand link: DSImplementorsRecord link toAST: (SpBrowseImplementorsCommand >> #execute) ast
@@ -168,6 +170,7 @@ DSSpyInstrumenter >> instrumentMouseLeaveWindow [
 
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentPaste [
+	"Instruments the action of paste from clipboard"
 
 	RubTextEditor link: DSClipboardPasteRecord link toAST: (RubTextEditor >> #paste) ast.
 	RubSmalltalkEditor link: DSClipboardPasteRecord link toAST: (RubSmalltalkEditor >> #paste) ast
@@ -175,7 +178,7 @@ DSSpyInstrumenter >> instrumentPaste [
 
 { #category : 'interactions' }
 DSSpyInstrumenter >> instrumentPrintIt [
-	"Instruments different printIt methods"
+	"Instruments different 'Print it' actions"
 
 	RubSmalltalkEditor link: DSPrintItRecord link toAST: (RubSmalltalkEditor >> #printIt) ast.
 	ClyTextEditor link: DSPrintItRecord link toAST: (ClyTextEditor >> #printIt) ast.
@@ -184,6 +187,7 @@ DSSpyInstrumenter >> instrumentPrintIt [
 
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentSendersActions [
+	"Instruments actions to show senders of a method or class"
 
 	ClyShowMessageSenderCommand link: DSSendersRecord link toAST: (ClyShowMessageSenderCommand >> #execute) ast.
 	SpBrowseSendersCommand link: DSSendersRecord link toAST: (SpBrowseSendersCommand >> #execute) ast
@@ -223,7 +227,7 @@ DSSpyInstrumenter >> instrumentSystem [
 
 	self listenToWindowEvents.
 	self listenToDebugPointChanges.
-	self logTextEditorsClipbardActions.
+	self logClipbardActions.
 	self logMouseEvents.
 	self logCodeInteractions. 
 	self logBrowsingActions "self logDebuggerInteractions.
@@ -234,6 +238,7 @@ DSSpyInstrumenter >> instrumentSystem [
 
 { #category : 'debugpoints  ' }
 DSSpyInstrumenter >> listenToDebugPointChanges [
+	"Listen to the announcements link to debugPoints modification and record the event"
 
 	DebugPoint codeSupportAnnouncer weak when: DebugPointAdded send: #recordDebugPointEvent: to: DSSpy.
 	DebugPoint codeSupportAnnouncer weak when: DebugPointHit send: #recordDebugPointEvent: to: DSSpy.
@@ -243,6 +248,8 @@ DSSpyInstrumenter >> listenToDebugPointChanges [
 
 { #category : 'methods' }
 DSSpyInstrumenter >> listenToMethodChanges [
+	"Listen to the announcements link to method modification and record the event"
+
 	SystemAnnouncer uniqueInstance weak when: MethodModified send: #methodChanged: to: DSSpy.
 	SystemAnnouncer uniqueInstance weak when: MethodRemoved send: #methodRemoved: to: DSSpy.
 	SystemAnnouncer uniqueInstance weak when: MethodAdded send: #methodAdded: to: DSSpy
@@ -250,6 +257,7 @@ DSSpyInstrumenter >> listenToMethodChanges [
 
 { #category : 'windows' }
 DSSpyInstrumenter >> listenToWindowEvents [
+	"Listen to the announcements link to windows and record the event"
 
 	self currentWorld announcer when: WindowOpened send: #logWindowOpened: to: DSSpy.
 	self currentWorld announcer when: WindowClosed send: #logWindowClosed: to: DSSpy.
@@ -258,14 +266,24 @@ DSSpyInstrumenter >> listenToWindowEvents [
 
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logBrowsingActions [
+	"Instrument all actions link to the Browser : browse, senders and implementors"
 
 	self instrumentBrowseActions.
 	self instrumentImplementorsActions.
 	self instrumentSendersActions
 ]
 
+{ #category : 'system-instrumentation' }
+DSSpyInstrumenter >> logClipbardActions [
+	"Instruments commands linked to clipboard"
+
+	self instrumentCopySelection.
+	self instrumentPaste
+]
+
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logCodeInteractions [
+	"Instruments actions linked to code execution : do it, print it, inspect it, ..."
 
 	self instrumentPrintIt.
 	self instrumentDebugIt.
@@ -275,6 +293,7 @@ DSSpyInstrumenter >> logCodeInteractions [
 
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logDebuggerInteractions [
+	"Instruments the Debugger and the Sindarin Debugger"
 
 	self instrumentDebuggerCommands.
 	self instrumentDebuggerStack.
@@ -283,24 +302,20 @@ DSSpyInstrumenter >> logDebuggerInteractions [
 
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logHaltAndBreakpointEvents [
+	"Instrument halts and debugPoints"
+
 	self instrumentHaltHits.
 	self listenToDebugPointChanges 
 ]
 
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logMouseEvents [
+	"Instrument mouse events"
 
 	self instrumentMouseEnterWindow.
 	self instrumentMouseLeaveWindow
 ]
 
-{ #category : 'system-instrumentation' }
-DSSpyInstrumenter >> logTextEditorsClipbardActions [
-
-	self instrumentCopySelection.
-	self instrumentPaste
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> unsubscribeFromSystemAnnouncer [
 

From 9eaedb8f68146d8879156a963a6201dee4dce2f8 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Tue, 6 Jan 2026 16:38:35 +0100
Subject: [PATCH 19/49] refactor: delete hardcode instrumentation, create
 extension methods for instrumentation and add a parameter to inform about
 debugging sessions

---
 DebuggingSpy/DSSpy.class.st             | 35 +++++++---------
 DebuggingSpy/DSSpyInstrumenter.class.st | 55 ++++++-------------------
 DebuggingSpy/Halt.extension.st          | 48 +++++++++++++++++++++
 DebuggingSpy/StDebugger.extension.st    |  2 +-
 4 files changed, 76 insertions(+), 64 deletions(-)
 create mode 100644 DebuggingSpy/Halt.extension.st

diff --git a/DebuggingSpy/DSSpy.class.st b/DebuggingSpy/DSSpy.class.st
index 2dba7f3..80e4700 100644
--- a/DebuggingSpy/DSSpy.class.st
+++ b/DebuggingSpy/DSSpy.class.st
@@ -12,7 +12,8 @@ Class {
 		'packagesMonitoredForSourceCodeChanges',
 		'recordSourceCode',
 		'recordClipboardContent',
-		'scopeSourceCodeChangesRecording'
+		'scopeSourceCodeChangesRecording',
+		'recordingSession'
 	],
 	#category : 'DebuggingSpy-Instrumentation',
 	#package : 'DebuggingSpy',
@@ -43,14 +44,6 @@ DSSpy class >> defaultLoggerClass [
 	^DSSTONFileLogger
 ]
 
-{ #category : 'task management' }
-DSSpy class >> endTask: aTask [
-
-	DSEndingTaskRecord for: aTask.
-	logger reset.
-	taskStarted := false
-]
-
 { #category : 'task management' }
 DSSpy class >> forceRunningTask: aTask [
 	logger setupLoggerForTask: aTask.
@@ -105,9 +98,6 @@ DSSpy class >> logOnlyWhenTaskStarted: anObject [
 { #category : 'events - windows' }
 DSSpy class >> logWindowActivated: anEvent [
 
-	[ DSToolWindowActivatedEventRecord for: anEvent window ]
-		on: Error
-		do: [ self log: #ERROR key: #WINDOW_TOOL_OPENED ].
 	[ DSWindowActivatedRecord for: anEvent ]
 		on: Error
 		do: [ self log: #ERROR key: #WINDOW_ACTIVATED ]
@@ -301,6 +291,19 @@ DSSpy class >> recordSourceCodeDisabledErrorMessage [
 	^ 'Source code recording disabled'
 ]
 
+{ #category : 'accessing' }
+DSSpy class >> recordingSession [
+	"Indicates if there is currently a recording session or not"
+
+	^ recordingSession ifNil: [ recordingSession := false ]
+]
+
+{ #category : 'accessing' }
+DSSpy class >> recordingSession: aBoolean [
+
+	recordingSession := aBoolean
+]
+
 { #category : 'initialization' }
 DSSpy class >> resetSpy [
 
@@ -328,14 +331,6 @@ DSSpy class >> serialize: aDSEventRecord [
 	self log: aDSEventRecord
 ]
 
-{ #category : 'task management' }
-DSSpy class >> startTask: aTask [
-
-	logger setupLoggerForTask: aTask.
-	taskStarted := true.
-	DSStartTaskRecord for: aTask
-]
-
 { #category : 'accessing' }
 DSSpy class >> taskStarted [
 
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 74c1bdc..fd2a5f0 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -18,12 +18,18 @@ DSSpyInstrumenter class >> instrumentSystem [
 
 { #category : 'system instrumentation' }
 DSSpyInstrumenter class >> stopInstrumentation [
+	"Stop the instrumentation of the system"
 
+	"Stop the recording session"
+	DSSpy recordingSession: false.
+
+	"Stop listening to events for recording"
 	SystemAnnouncer uniqueInstance unsubscribe: DSSpy.
 	DebugPoint codeSupportAnnouncer unsubscribe: DSSpy.
 	self currentWorld announcer unsubscribe: DSSpy.
 	
-	MetaLink uninstallAll "TO CHANGED : just uninstall targeted MetaLinks"
+	"Uninstall MetaLinks used by the instrumenter"
+	MetaLink uninstallAll "TO CHANGE : just uninstall targeted MetaLinks"
 ]
 
 { #category : 'system' }
@@ -49,16 +55,6 @@ DSSpyInstrumenter >> instrumentDebugIt [
 	SpCodePrintItCommand link: DSDebugItRecord link toAST: (SpCodeDebugItCommand >> #execute) ast
 ]
 
-{ #category : 'debugger' }
-DSSpyInstrumenter >> instrumentDebuggerCommands [
-	StDebugger class compile:
-	'instrumentCommandsWith: stDebuggerInstance forRoot: rootCommandGroup
-
-	<extensionCommands>
-	self buildInstrumentedCommandsWith: stDebuggerInstance forRoot: rootCommandGroup'
-	
-]
-
 { #category : 'debugger' }
 DSSpyInstrumenter >> instrumentDebuggerStack [
 
@@ -110,36 +106,6 @@ DSSpyInstrumenter >> instrumentExceptionSignalling [
 	^ UnhandledError signalForException: self'
 ]
 
-{ #category : 'debugpoints  ' }
-DSSpyInstrumenter >> instrumentHaltHits [
-	Halt class compile: 'signalIn: ctx	
-		
-	self = Halt ifTrue:[
-	[|sender|				
-		sender := thisContext sender sender sender sender sender sender sender sender sender.
-		ctx selector = #once: ifFalse:[sender := sender sender].
-		DSHaltHitRecord for: {sender sourceNodeExecuted. ctx selector}] 
-		on: Error 
-		do:[ DSSpy log: #ERROR key: #HALT_HIT ]].
-	super signalIn: ctx'.
-	
-	Halt class compile: 'signal: s
-	self = Halt ifTrue:[	[|sender|		
-		sender := thisContext sender sender sender sender sender.
-		DSHaltHitRecord for:  {sender sourceNodeExecuted. #now:}] 
-		on: Error 
-		do:[ DSSpy log: #ERROR key: #HALT_HIT ]].
-	super signal: s'.
-	
-	Halt class compile: 'signal
-		self = Halt ifTrue:[	[|sender| 			
-		sender := thisContext sender sender sender sender sender.
-		DSHaltHitRecord for:  {sender sourceNodeExecuted. #halt}] 
-		on: Error 
-		do:[:err| DSSpy log: #ERROR key: #HALT_HIT ]].
-	super signal'.
-]
-
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentImplementorsActions [
 	"Instruments actions to show implementors of a method"
@@ -224,16 +190,19 @@ DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> instrumentSystem [
 	"Instrument every thing in the system, feel free to comment things you don't want to record"
+	
+	"Start debugging session"
+	DSSpy recordingSession: true.
 
 	self listenToWindowEvents.
+	self listenToMethodChanges.
 	self listenToDebugPointChanges.
 	self logClipbardActions.
 	self logMouseEvents.
 	self logCodeInteractions. 
 	self logBrowsingActions "self logDebuggerInteractions.
 	self logHaltAndBreakpointEvents.
-	self listenToWindowEvents.
-	self listenToMethodChanges"
+	"
 ]
 
 { #category : 'debugpoints  ' }
diff --git a/DebuggingSpy/Halt.extension.st b/DebuggingSpy/Halt.extension.st
new file mode 100644
index 0000000..519b78e
--- /dev/null
+++ b/DebuggingSpy/Halt.extension.st
@@ -0,0 +1,48 @@
+Extension { #name : 'Halt' }
+
+{ #category : '*DebuggingSpy' }
+Halt class >> signal [
+
+	DSSpy recordingSession ifTrue: [
+			[
+				| sender |
+				sender := thisContext sender sender sender sender sender.
+				DSHaltHitRecord for: {
+						sender sourceNodeExecuted.
+						#halt } ]
+				on: Error
+				do: [ :err | DSSpy log: #ERROR key: #HALT_HIT ] ].
+	super signal
+]
+
+{ #category : '*DebuggingSpy' }
+Halt class >> signal: s [
+
+	DSSpy recordingSession ifTrue: [
+			[
+				| sender |
+				sender := thisContext sender sender sender sender sender.
+				DSHaltHitRecord for: {
+						sender sourceNodeExecuted.
+						#now: } ]
+				on: Error
+				do: [ DSSpy log: #ERROR key: #HALT_HIT ] ].
+	super signal: s
+]
+
+{ #category : '*DebuggingSpy' }
+Halt class >> signalIn: ctx [
+
+	DSSpy recordingSession ifTrue: [
+			[
+				| sender |
+				sender := thisContext sender sender sender sender sender sender sender sender sender.
+				ctx selector = #once: ifFalse: [ sender := sender sender ].
+				DSHaltHitRecord for: {
+						sender sourceNodeExecuted.
+						ctx selector } ]
+				on: Error
+				do: [ DSSpy log: #ERROR key: #HALT_HIT ] ].
+			
+	^ super signalIn: ctx
+]
diff --git a/DebuggingSpy/StDebugger.extension.st b/DebuggingSpy/StDebugger.extension.st
index 4a89756..afff8ef 100644
--- a/DebuggingSpy/StDebugger.extension.st
+++ b/DebuggingSpy/StDebugger.extension.st
@@ -23,7 +23,7 @@ StDebugger class >> executionCommandGroupIn: rootCommandGroup [
 StDebugger class >> instrumentCommandsWith: stDebuggerInstance forRoot: rootCommandGroup [
 
 	<extensionCommands>
-	self buildInstrumentedCommandsWith: stDebuggerInstance forRoot: rootCommandGroup
+	DSSpy recordingSession ifTrue: [ self buildInstrumentedCommandsWith: stDebuggerInstance forRoot: rootCommandGroup ]
 ]
 
 { #category : '*DebuggingSpy' }

From e79082506183d3dcbb9074f8cc1f4087188a843c Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Wed, 7 Jan 2026 11:19:28 +0100
Subject: [PATCH 20/49] refactor: short old code and clean new one

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index fd2a5f0..103392f 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -194,15 +194,16 @@ DSSpyInstrumenter >> instrumentSystem [
 	"Start debugging session"
 	DSSpy recordingSession: true.
 
+	"Listen to announcements"
 	self listenToWindowEvents.
 	self listenToMethodChanges.
 	self listenToDebugPointChanges.
+	
+	"Instruments events/user's actions"
 	self logClipbardActions.
 	self logMouseEvents.
 	self logCodeInteractions. 
-	self logBrowsingActions "self logDebuggerInteractions.
-	self logHaltAndBreakpointEvents.
-	"
+	self logBrowsingActions "self logDebuggerInteraction."
 ]
 
 { #category : 'debugpoints  ' }
@@ -263,20 +264,11 @@ DSSpyInstrumenter >> logCodeInteractions [
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logDebuggerInteractions [
 	"Instruments the Debugger and the Sindarin Debugger"
-
-	self instrumentDebuggerCommands.
+	
 	self instrumentDebuggerStack.
 	self instrumentSindarinDebuggerCommands
 ]
 
-{ #category : 'system-instrumentation' }
-DSSpyInstrumenter >> logHaltAndBreakpointEvents [
-	"Instrument halts and debugPoints"
-
-	self instrumentHaltHits.
-	self listenToDebugPointChanges 
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logMouseEvents [
 	"Instrument mouse events"

From d8a40a7291674497744dfb564b427231439079f2 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Wed, 7 Jan 2026 11:32:32 +0100
Subject: [PATCH 21/49] refactor: delete debugger's stack instrumentation
 because browsing instrumentation already record the action

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 103392f..f3caab8 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -55,29 +55,6 @@ DSSpyInstrumenter >> instrumentDebugIt [
 	SpCodePrintItCommand link: DSDebugItRecord link toAST: (SpCodeDebugItCommand >> #execute) ast
 ]
 
-{ #category : 'debugger' }
-DSSpyInstrumenter >> instrumentDebuggerStack [
-
-	StDebugger compile: 'initializeStack
-stackTable := self newList.
-	stackTable
-		activateOnDoubleClick;
-		whenActivatedDo: [ :selection | self doBrowseClass ].
-	stackTable display:[:selection| StContextPrinter printContext: selection].
-	stackTable displayColor:[ :context | self stackColorForContext: context ].
-	stackTable displayIcon: [ :context| self stackIconForContext: context ].	
-	stackTable transmitDo: [ :context |
-		stackTable selection isEmpty ifFalse: [
-			self updateInspectorFromContext: context.
-			self updateCodeFromContext: context.
-			self updateExtensionsFromSession: self session.
-			self expandStackIfLastItemIsSelected.
-			self updateWindowTitle.
-			[DSBrowseContextRecord for: { context . [self window window] on: Error do:[0] } ] on: Error do:[:err| DSSpy log: #ERROR key: #DEBUGGER_STACK ] ] ].
-	stackHeader := self instantiate: StHeaderBar.
-	stackHeader label: ''Stack'''
-]
-
 { #category : 'interactions' }
 DSSpyInstrumenter >> instrumentDoIt [
 	"Instruments different 'Do it' actions"
@@ -265,7 +242,6 @@ DSSpyInstrumenter >> logCodeInteractions [
 DSSpyInstrumenter >> logDebuggerInteractions [
 	"Instruments the Debugger and the Sindarin Debugger"
 	
-	self instrumentDebuggerStack.
 	self instrumentSindarinDebuggerCommands
 ]
 

From 74a685cc32b57d62e9dd1eeddc58761ce245f3fb Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Wed, 7 Jan 2026 18:02:40 +0100
Subject: [PATCH 22/49] wip

---
 .../DSSpyInstrumenterTest.class.st            | 27 +++---------
 DebuggingSpy/DSAbstractEventRecord.class.st   |  5 +--
 DebuggingSpy/DSBrowseRecord.class.st          | 44 +++++++++++++++++++
 3 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index ba2e330..8eb67da 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -358,7 +358,7 @@ DSSpyInstrumenterTest >> setDummyWindowPresenter: windowPresenter forPresenter:
 DSSpyInstrumenterTest >> setUp [
 	super setUp.
 	
-	instrumenter := DSSpyInstrumenter new.
+	DSSpyInstrumenter instrumentSystem.
 	recordSourceCode := DSSpy recordSourceCode.
 	DSSpy recordSourceCode: true.
 	DSRecordRegistry current reset
@@ -412,42 +412,27 @@ DSSpyInstrumenterTest >> tableItemsListFromInspector: anInspector [
 
 { #category : 'running' }
 DSSpyInstrumenterTest >> tearDown [
-
-	(modifiedClass notNil and: [ 
-		 (#( nil '' ) includes: modifiedMethodSource) not ]) ifTrue: [ 
-		modifiedClass compile: modifiedMethodSource.
-		modifiedClass := nil.
-		modifiedMethodSource := nil ].
-	
-	methodToRemove ifNotNil: [ 
-		methodToRemove removeFromSystem.
-		methodToRemove := nil ].
-
-	methodsToRemove ifNotNil: [ 
-		methodsToRemove do: [ :m | m removeFromSystem ] ].
 	
 	DSSpy recordSourceCode: recordSourceCode.
-	
 	DSRecordRegistry current reset.
 	
+	DSSpyInstrumenter stopInstrumentation.
+	
 	super tearDown
 ]
 
 { #category : 'tests - browsers' }
 DSSpyInstrumenterTest >> testInstrumentClyFullBrowser [
 
-	modifiedClass := ClyFullBrowserMorph.
-	modifiedMethodSource := (ClyFullBrowserMorph >> #newWindowTitle) sourceCode.
-	instrumenter instrumentClyFullBrowser.
 	browser := ClyFullBrowserMorph on: ClyNavigationEnvironment currentImage.  
 	browser  prepareInitialStateBy:  [ :b |b selectMethod: (Object>>#yourself)].
-	self setDummyWindowForMorph: browser.
-	browser newWindowTitle.
+	"self setDummyWindowForMorph: browser.
+	browser newWindowTitle."
 	
 	self assert: self registry size equals: 1.
 	
 	record := self registry first.
-	self assert: record class identicalTo: DSFullBrowseRecord.
+	self assert: record class identicalTo: DSBrowseRecord.
 	self assert: record windowId equals: browser window hash.
 	self assert: record classBrowsed equals: Object name.
 	self assert: record packageBrowsed equals: Object package name.
diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index 5a88035..c490974 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -101,10 +101,7 @@ DSAbstractEventRecord >> realRecord [
 { #category : 'actions api' }
 DSAbstractEventRecord >> record: aWindow [
 
-	windowId := aWindow identityHash.
-"	(aWindow isKindOf: ClyBrowserMorph) ifFalse: [ ^ self ].
-	aWindow activeWindow ifNil:[^self].
-	windowId := aWindow activeWindow identityHash"
+	windowId := aWindow identityHash
 ]
 
 { #category : 'API-history' }
diff --git a/DebuggingSpy/DSBrowseRecord.class.st b/DebuggingSpy/DSBrowseRecord.class.st
index 8099067..3b72ea6 100644
--- a/DebuggingSpy/DSBrowseRecord.class.st
+++ b/DebuggingSpy/DSBrowseRecord.class.st
@@ -4,12 +4,56 @@ Record when a user is doing a ""Browse"" on a class, method, ...
 Class {
 	#name : 'DSBrowseRecord',
 	#superclass : 'DSAbstractBrowserRecord',
+	#instVars : [
+		'packageBrowsed',
+		'classBrowsed',
+		'methodBrowsed'
+	],
 	#category : 'DebuggingSpy-Records',
 	#package : 'DebuggingSpy',
 	#tag : 'Records'
 }
 
+{ #category : 'accessing' }
+DSBrowseRecord >> classBrowsed [ 
+
+	^ classBrowsed 
+]
+
 { #category : 'accessing' }
 DSBrowseRecord >> eventName [
 	^ 'Browse'
 ]
+
+{ #category : 'accessing' }
+DSBrowseRecord >> methodBrowsed [ 
+
+	^ methodBrowsed 
+]
+
+{ #category : 'accessing' }
+DSBrowseRecord >> packageBrowsed [ 
+
+	^ packageBrowsed 
+]
+
+{ #category : 'accessing' }
+DSBrowseRecord >> record: aClyBrowser [
+
+	windowId := aClyBrowser window identityHash.
+	packageBrowsed := aClyBrowser packageSelection isEmpty
+		                  ifTrue: [ '' ]
+		                  ifFalse: [ 
+		                  aClyBrowser packageSelection lastSelectedItem
+			                  actualObject name ].
+	classBrowsed := aClyBrowser classSelection isEmpty
+		                ifTrue: [ '' ]
+		                ifFalse: [ 
+		                aClyBrowser classSelection lastSelectedItem
+			                actualObject name ].
+	methodBrowsed := aClyBrowser methodSelection isEmpty
+		                 ifTrue: [ '' ]
+		                 ifFalse: [ 
+		                 aClyBrowser methodSelection lastSelectedItem
+			                 actualObject name ].
+]

From 8e1c5e399664a38cfa2dfe97a8b73d70fa2b690d Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Thu, 8 Jan 2026 14:00:00 +0100
Subject: [PATCH 23/49] refactor: start refactoring tests, add comments and
 restore old classes

---
 .../DSSpyInstrumenterTest.class.st            |  27 +--
 DebuggingSpy/DSBrowseRecord.class.st          |  37 +----
 DebuggingSpy/DSClipboardCopyRecord.class.st   |   3 +
 DebuggingSpy/DSClipboardPasteRecord.class.st  |   3 +
 DebuggingSpy/DSDoItRecord.class.st            |   2 +-
 DebuggingSpy/DSFullBrowseRecord.class.st      |  64 ++++++++
 DebuggingSpy/DSInspectItRecord.class.st       |   3 +
 DebuggingSpy/DSRecordHistory.class.st         |   4 +-
 DebuggingSpy/DSSpyInstrumenter.class.st       |   7 +
 DebuggingSpy/DSWindowActivityRecord.class.st  | 154 ++++++++++++++++++
 10 files changed, 247 insertions(+), 57 deletions(-)
 create mode 100644 DebuggingSpy/DSFullBrowseRecord.class.st
 create mode 100644 DebuggingSpy/DSWindowActivityRecord.class.st

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index 8eb67da..b0d923f 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -424,38 +424,27 @@ DSSpyInstrumenterTest >> tearDown [
 { #category : 'tests - browsers' }
 DSSpyInstrumenterTest >> testInstrumentClyFullBrowser [
 
-	browser := ClyFullBrowserMorph on: ClyNavigationEnvironment currentImage.  
-	browser  prepareInitialStateBy:  [ :b |b selectMethod: (Object>>#yourself)].
-	"self setDummyWindowForMorph: browser.
-	browser newWindowTitle."
-	
+	browser := ClyFullBrowserMorph on: ClyNavigationEnvironment currentImage.
+	browser prepareInitialStateBy: [ :b | b selectMethod: Object >> #yourself ].
+
 	self assert: self registry size equals: 1.
-	
+
 	record := self registry first.
 	self assert: record class identicalTo: DSBrowseRecord.
-	self assert: record windowId equals: browser window hash.
-	self assert: record classBrowsed equals: Object name.
-	self assert: record packageBrowsed equals: Object package name.
-	self assert: record methodBrowsed equals: (Object>>#yourself) name
+	self assert: record windowId equals: browser window hash
 ]
 
 { #category : 'tests - browsers' }
 DSSpyInstrumenterTest >> testInstrumentClyQueryBrowser [
 	
-	modifiedClass := ClyQueryBrowserMorph.
-	modifiedMethodSource := (ClyQueryBrowserMorph >> #newWindowTitle) sourceCode.
-	instrumenter instrumentClyQueryBrowser.
 	browser := ClyQueryBrowserMorph on: ClyNavigationEnvironment currentImage.  
-	browser showResultOf: (ClyMessageImplementorsQuery of: #instrumentClyQueryBrowser).
-	self setDummyWindowForMorph: browser.
-	browser newWindowTitle.
+	browser showResultOf: (ClyMessageImplementorsQuery of: #testInstrumentClyFullBrowser).
 	
 	self assert: self registry size equals: 1.
 	
 	record := self registry first.
-	self assert: record class identicalTo: DSQueryBrowseRecord.
-	self assert: record windowId equals: browser window hash.
-	self assert: record queryName equals: browser systemQuery description
+	self assert: record class identicalTo: DSImplementorsRecord.
+	self assert: record windowId equals: browser window hash
 ]
 
 { #category : 'tests - interactions' }
diff --git a/DebuggingSpy/DSBrowseRecord.class.st b/DebuggingSpy/DSBrowseRecord.class.st
index 3b72ea6..ae3ecb3 100644
--- a/DebuggingSpy/DSBrowseRecord.class.st
+++ b/DebuggingSpy/DSBrowseRecord.class.st
@@ -14,46 +14,13 @@ Class {
 	#tag : 'Records'
 }
 
-{ #category : 'accessing' }
-DSBrowseRecord >> classBrowsed [ 
-
-	^ classBrowsed 
-]
-
 { #category : 'accessing' }
 DSBrowseRecord >> eventName [
 	^ 'Browse'
 ]
 
-{ #category : 'accessing' }
-DSBrowseRecord >> methodBrowsed [ 
-
-	^ methodBrowsed 
-]
-
-{ #category : 'accessing' }
-DSBrowseRecord >> packageBrowsed [ 
-
-	^ packageBrowsed 
-]
-
-{ #category : 'accessing' }
+{ #category : 'actions api' }
 DSBrowseRecord >> record: aClyBrowser [
 
-	windowId := aClyBrowser window identityHash.
-	packageBrowsed := aClyBrowser packageSelection isEmpty
-		                  ifTrue: [ '' ]
-		                  ifFalse: [ 
-		                  aClyBrowser packageSelection lastSelectedItem
-			                  actualObject name ].
-	classBrowsed := aClyBrowser classSelection isEmpty
-		                ifTrue: [ '' ]
-		                ifFalse: [ 
-		                aClyBrowser classSelection lastSelectedItem
-			                actualObject name ].
-	methodBrowsed := aClyBrowser methodSelection isEmpty
-		                 ifTrue: [ '' ]
-		                 ifFalse: [ 
-		                 aClyBrowser methodSelection lastSelectedItem
-			                 actualObject name ].
+	super record: aClyBrowser window.
 ]
diff --git a/DebuggingSpy/DSClipboardCopyRecord.class.st b/DebuggingSpy/DSClipboardCopyRecord.class.st
index 4196313..8d7bf48 100644
--- a/DebuggingSpy/DSClipboardCopyRecord.class.st
+++ b/DebuggingSpy/DSClipboardCopyRecord.class.st
@@ -1,3 +1,6 @@
+"
+I record when a user is doing a copy to clipboard action.
+"
 Class {
 	#name : 'DSClipboardCopyRecord',
 	#superclass : 'DSClipboardActionRecord',
diff --git a/DebuggingSpy/DSClipboardPasteRecord.class.st b/DebuggingSpy/DSClipboardPasteRecord.class.st
index 8a53497..dfbb45b 100644
--- a/DebuggingSpy/DSClipboardPasteRecord.class.st
+++ b/DebuggingSpy/DSClipboardPasteRecord.class.st
@@ -1,3 +1,6 @@
+"
+I record when a user is doing a paste from clipboard action.
+"
 Class {
 	#name : 'DSClipboardPasteRecord',
 	#superclass : 'DSClipboardActionRecord',
diff --git a/DebuggingSpy/DSDoItRecord.class.st b/DebuggingSpy/DSDoItRecord.class.st
index 4d2a4b0..f654df5 100644
--- a/DebuggingSpy/DSDoItRecord.class.st
+++ b/DebuggingSpy/DSDoItRecord.class.st
@@ -1,5 +1,5 @@
 "
-I record when the user selects code and debugs it.
+I record when the user selects code and executes it by a ""Do it"".
 "
 Class {
 	#name : 'DSDoItRecord',
diff --git a/DebuggingSpy/DSFullBrowseRecord.class.st b/DebuggingSpy/DSFullBrowseRecord.class.st
new file mode 100644
index 0000000..071b77b
--- /dev/null
+++ b/DebuggingSpy/DSFullBrowseRecord.class.st
@@ -0,0 +1,64 @@
+"
+I record user browsing code action.
+I store the browsed package, class and method names, and the window id in which it happened.
+Elements are browsed in order package>class>method.
+If one of them is nil, for instance, package>class>nil, it means that the user is browsing the class and possibly looking at its methods, or at the list of classes in the package, or at the packages list.
+
+I have to register names instead of objects, as there are no guarantees that the image that analyzes the record has these package/class/method.
+"
+Class {
+	#name : 'DSFullBrowseRecord',
+	#superclass : 'DSAbstractEventRecord',
+	#instVars : [
+		'methodBrowsed',
+		'packageBrowsed',
+		'classBrowsed'
+	],
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSFullBrowseRecord >> classBrowsed [ 
+
+	^ classBrowsed 
+]
+
+{ #category : 'accessing' }
+DSFullBrowseRecord >> eventName [
+	^'Full browser opening'
+]
+
+{ #category : 'accessing' }
+DSFullBrowseRecord >> methodBrowsed [ 
+
+	^ methodBrowsed 
+]
+
+{ #category : 'accessing' }
+DSFullBrowseRecord >> packageBrowsed [ 
+
+	^ packageBrowsed 
+]
+
+{ #category : 'actions api' }
+DSFullBrowseRecord >> record: aClyFullBrowser [
+
+	super record: aClyFullBrowser window.
+	packageBrowsed := aClyFullBrowser packageSelection isEmpty
+		                  ifTrue: [ '' ]
+		                  ifFalse: [ 
+		                  aClyFullBrowser packageSelection lastSelectedItem
+			                  actualObject name ].
+	classBrowsed := aClyFullBrowser classSelection isEmpty
+		                ifTrue: [ '' ]
+		                ifFalse: [ 
+		                aClyFullBrowser classSelection lastSelectedItem
+			                actualObject name ].
+	methodBrowsed := aClyFullBrowser methodSelection isEmpty
+		                 ifTrue: [ '' ]
+		                 ifFalse: [ 
+		                 aClyFullBrowser methodSelection lastSelectedItem
+			                 actualObject name ].
+]
diff --git a/DebuggingSpy/DSInspectItRecord.class.st b/DebuggingSpy/DSInspectItRecord.class.st
index 0f94f80..fdf9948 100644
--- a/DebuggingSpy/DSInspectItRecord.class.st
+++ b/DebuggingSpy/DSInspectItRecord.class.st
@@ -1,3 +1,6 @@
+"
+I record when the user selects code and inspects it.
+"
 Class {
 	#name : 'DSInspectItRecord',
 	#superclass : 'DSCodeActionRecord',
diff --git a/DebuggingSpy/DSRecordHistory.class.st b/DebuggingSpy/DSRecordHistory.class.st
index f8ed472..b187c82 100644
--- a/DebuggingSpy/DSRecordHistory.class.st
+++ b/DebuggingSpy/DSRecordHistory.class.st
@@ -521,8 +521,8 @@ DSRecordHistory >> processRecords: array [
 	(self allRecordsOfKind: DSAbstractDebugPointEventRecord) do: #asDebugPointRecord.
 	
 	"Detect if we're in a specific task"	
-	(self records first isKindOf: DSStartTaskRecord) ifTrue: [
-		self taskName: self records first taskName ].
+"	(self records first isKindOf: DSStartTaskRecord) ifTrue: [
+		self taskName: self records first taskName ]."
 	
 	"Windows"
 	self buildWindowHistory.
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index f3caab8..db4284e 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -39,6 +39,13 @@ DSSpyInstrumenter >> instrumentBrowseActions [
 	ClyBrowserMorph link: DSBrowseRecord link toAST: (ClyBrowserMorph >> #prepareInitialStateBy:) ast "SpBrowseClassCommand link: DSBrowseRecord link toAST: (SpBrowseClassCommand >> #execute) ast"
 ]
 
+{ #category : 'system' }
+DSSpyInstrumenter >> instrumentClyFullBrowserOpening [
+	"Instruments the browser on opening"
+
+	ClyFullBrowserMorph link: DSFullBrowseRecord link toAST: (ClyFullBrowserMorph >> #newWindowTitle) ast
+]
+
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentCopySelection [
 	"Instruments the action of copying to clipboard"
diff --git a/DebuggingSpy/DSWindowActivityRecord.class.st b/DebuggingSpy/DSWindowActivityRecord.class.st
new file mode 100644
index 0000000..60eac76
--- /dev/null
+++ b/DebuggingSpy/DSWindowActivityRecord.class.st
@@ -0,0 +1,154 @@
+Class {
+	#name : 'DSWindowActivityRecord',
+	#superclass : 'DSAbstractEventRecord',
+	#instVars : [
+		'start',
+		'stop',
+		'events',
+		'window',
+		'previous',
+		'next',
+		'annotation'
+	],
+	#category : 'DebuggingSpy-Records-Extensions',
+	#package : 'DebuggingSpy',
+	#tag : 'Records-Extensions'
+}
+
+{ #category : 'instance creation' }
+DSWindowActivityRecord class >> start: aDSMouseEnterWindowRecord stop: aDSMouseLeaveWindowRecord events: aCollection [
+
+	^ self new
+		  start: aDSMouseEnterWindowRecord;
+		  stop: aDSMouseLeaveWindowRecord;
+		  events: aCollection;
+		  yourself
+]
+
+{ #category : 'instance creation' }
+DSWindowActivityRecord class >> start: aDSMouseEnterWindowRecord stop: aDSMouseLeaveWindowRecord events: aCollection window: aDSWindowRecord [
+
+	^ (self
+		   start: aDSMouseEnterWindowRecord
+		   stop: aDSMouseLeaveWindowRecord
+		   events: aCollection)
+		  window: aDSWindowRecord;
+		  yourself
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> annotation [
+
+	^ annotation ifNil:[annotation := DSWindowAnnotation new]
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> annotation: anObject [
+
+	annotation := anObject
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> debuggingActionsClasses [
+
+	| classes |
+	classes := OrderedCollection withAll: DSStepActionRecord allSubclasses.
+	classes addAll: DSStepRecord allSubclasses.
+	classes add: DSBrowseContextRecord.
+	^ classes
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> duration [
+	^ events last dateTime - events first dateTime
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> eventName [
+
+	^ String streamContents: [ :ws |
+		  window printTypeOn: ws.
+		  ws << ':'.
+		  ws space.
+		  ws << self duration humanReadablePrintString ]
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> events [
+
+	^ events
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> events: anObject [
+
+	events := anObject
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> next [
+
+	^ next
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> next: anObject [
+
+	next := anObject
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> previous [
+
+	^ previous
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> previous: anObject [
+
+	previous := anObject
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> start [
+
+	^ start
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> start: anObject [
+
+	start := anObject
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> stop [
+
+	^ stop
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> stop: anObject [
+
+	stop := anObject
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> window [
+
+	^ window
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> window: anObject [
+
+	window := anObject
+]
+
+{ #category : 'accessing' }
+DSWindowActivityRecord >> windowId [
+
+	^ windowId
+		  ifNil: [ windowId := window windowId ]
+		  ifNotNil: [ windowId ]
+]

From 8b5f9e6e442419d04cdecf42e0cee6c71d873909 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Thu, 8 Jan 2026 15:27:50 +0100
Subject: [PATCH 24/49] feat(DSMetaLink): add specific metalinks for
 DebuggingSpy

---
 DebuggingSpy/DSAbstractEventRecord.class.st |  5 +++--
 DebuggingSpy/DSMetaLink.class.st            | 14 ++++++++++++
 DebuggingSpy/DSMetaLinkInstaller.class.st   | 24 +++++++++++++++++++++
 DebuggingSpy/DSSpyInstrumenter.class.st     |  3 ++-
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 DebuggingSpy/DSMetaLink.class.st
 create mode 100644 DebuggingSpy/DSMetaLinkInstaller.class.st

diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index c490974..7540039 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -26,11 +26,12 @@ DSAbstractEventRecord class >> for: anObject [
 { #category : 'accessing' }
 DSAbstractEventRecord class >> link [
 
-	^ MetaLink new
+	^ DSMetaLink new
 		  metaObject: self;
 		  selector: #for:;
 		  arguments: #( receiver );
-		  control: #before
+		  control: #before;
+		  optionCompileOnLinkInstallation: true
 ]
 
 { #category : 'comparing' }
diff --git a/DebuggingSpy/DSMetaLink.class.st b/DebuggingSpy/DSMetaLink.class.st
new file mode 100644
index 0000000..3ae3c42
--- /dev/null
+++ b/DebuggingSpy/DSMetaLink.class.st
@@ -0,0 +1,14 @@
+Class {
+	#name : 'DSMetaLink',
+	#superclass : 'MetaLink',
+	#category : 'DebuggingSpy-Instrumentation',
+	#package : 'DebuggingSpy',
+	#tag : 'Instrumentation'
+}
+
+{ #category : 'accessing' }
+DSMetaLink class >> linkInstaller [ 
+	^linkInstaller
+		ifNil: [ linkInstaller := DSMetaLinkInstaller new ]
+	
+]
diff --git a/DebuggingSpy/DSMetaLinkInstaller.class.st b/DebuggingSpy/DSMetaLinkInstaller.class.st
new file mode 100644
index 0000000..6544c42
--- /dev/null
+++ b/DebuggingSpy/DSMetaLinkInstaller.class.st
@@ -0,0 +1,24 @@
+Class {
+	#name : 'DSMetaLinkInstaller',
+	#superclass : 'MetaLinkInstaller',
+	#category : 'DebuggingSpy-Instrumentation',
+	#package : 'DebuggingSpy',
+	#tag : 'Instrumentation'
+}
+
+{ #category : 'updating' }
+DSMetaLinkInstaller >> methodChanged: aMethodChanged [
+
+	| links dsLink newMethod |
+	super methodChanged: aMethodChanged.
+
+	links := aMethodChanged oldMethod compiledMethod ast links.
+
+	links ifEmpty: [ ^ self ].
+
+	dsLink := links detect: [ :link | link class = DSMetaLink ] ifNone: [ ^ self ].
+
+	newMethod := aMethodChanged newMethod.
+
+	newMethod methodClass link: dsLink toAST: newMethod ast
+]
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index db4284e..a108219 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -18,6 +18,7 @@ DSSpyInstrumenter class >> instrumentSystem [
 
 { #category : 'system instrumentation' }
 DSSpyInstrumenter class >> stopInstrumentation [
+	<example>
 	"Stop the instrumentation of the system"
 
 	"Stop the recording session"
@@ -29,7 +30,7 @@ DSSpyInstrumenter class >> stopInstrumentation [
 	self currentWorld announcer unsubscribe: DSSpy.
 	
 	"Uninstall MetaLinks used by the instrumenter"
-	MetaLink uninstallAll "TO CHANGE : just uninstall targeted MetaLinks"
+	DSMetaLink uninstallAll "TO CHANGE : just uninstall targeted MetaLinks"
 ]
 
 { #category : 'system' }

From 7d12b52402d3e90e169c20f07f2e4c7b39dac393 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Thu, 8 Jan 2026 16:47:37 +0100
Subject: [PATCH 25/49] fix: correct link method and record of
 AbstractEventRecord

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

diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index 7540039..f0a59e1 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -30,8 +30,7 @@ DSAbstractEventRecord class >> link [
 		  metaObject: self;
 		  selector: #for:;
 		  arguments: #( receiver );
-		  control: #before;
-		  optionCompileOnLinkInstallation: true
+		  control: #before
 ]
 
 { #category : 'comparing' }
@@ -102,7 +101,9 @@ DSAbstractEventRecord >> realRecord [
 { #category : 'actions api' }
 DSAbstractEventRecord >> record: aWindow [
 
-	windowId := aWindow identityHash
+	windowId := aWindow identityHash.
+
+	windowId = nil identityHash ifTrue: [ windowId := nil ]
 ]
 
 { #category : 'API-history' }

From cda84b91b495a53ccc12786fd67cb59c5c644385 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Fri, 9 Jan 2026 11:44:39 +0100
Subject: [PATCH 26/49] wip

---
 .../DSSTONFileLoggerTest.class.st             | 20 -------------------
 .../DSSpyInstrumenterTest.class.st            | 15 +++++++++++++-
 DebuggingSpy/DSBrowseRecord.class.st          |  6 ------
 DebuggingSpy/DSMetaLink.class.st              |  3 +++
 DebuggingSpy/DSMetaLinkInstaller.class.st     |  3 +++
 DebuggingSpy/DSSpy.class.st                   |  3 +++
 DebuggingSpy/DSSpyInstrumenter.class.st       |  3 ++-
 7 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st b/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
index ffae299..f5ffabd 100644
--- a/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
+++ b/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
@@ -98,26 +98,6 @@ DSSTONFileLoggerTest >> testLoggingFileName [
 		equals: logger defaultLoggingFileName
 ]
 
-{ #category : 'tests - file handling' }
-DSSTONFileLoggerTest >> testLoggingFileNameAfterTaskEnded [
-
-	DSSpy startTask: task.
-	DSSpy endTask: task.
-	self
-		assert: logger loggingFileName
-		equals: logger defaultLoggingFileName
-]
-
-{ #category : 'tests - file handling' }
-DSSTONFileLoggerTest >> testLoggingFileNameAfterTaskStarted [
-	
-	DSSpy startTask: task.
-
-	self
-		assert: logger loggingFileName
-		equals: (task title, '-', logger defaultLoggingFileName)
-]
-
 { #category : 'tests - file handling' }
 DSSTONFileLoggerTest >> testLoggingFileReference [
 
diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index b0d923f..11b3013 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -421,6 +421,19 @@ DSSpyInstrumenterTest >> tearDown [
 	super tearDown
 ]
 
+{ #category : 'tests - browsers' }
+DSSpyInstrumenterTest >> testInstrumentBrowseAction [
+
+	browser := ClyFullBrowserMorph on: ClyNavigationEnvironment currentImage.
+	browser prepareInitialStateBy: [ :b | b selectMethod: Object >> #yourself ].
+
+	self assert: self registry size equals: 1.
+
+	record := self registry first.
+	self assert: record class identicalTo: DSBrowseRecord.
+	self assert: record windowId equals: nil identityHash "At this stage, the window browser is not built"
+]
+
 { #category : 'tests - browsers' }
 DSSpyInstrumenterTest >> testInstrumentClyFullBrowser [
 
@@ -431,7 +444,7 @@ DSSpyInstrumenterTest >> testInstrumentClyFullBrowser [
 
 	record := self registry first.
 	self assert: record class identicalTo: DSBrowseRecord.
-	self assert: record windowId equals: browser window hash
+	self assert: record windowId equals: nil identityHash "At this stage, the window browser is not built"
 ]
 
 { #category : 'tests - browsers' }
diff --git a/DebuggingSpy/DSBrowseRecord.class.st b/DebuggingSpy/DSBrowseRecord.class.st
index ae3ecb3..27ef8a7 100644
--- a/DebuggingSpy/DSBrowseRecord.class.st
+++ b/DebuggingSpy/DSBrowseRecord.class.st
@@ -18,9 +18,3 @@ Class {
 DSBrowseRecord >> eventName [
 	^ 'Browse'
 ]
-
-{ #category : 'actions api' }
-DSBrowseRecord >> record: aClyBrowser [
-
-	super record: aClyBrowser window.
-]
diff --git a/DebuggingSpy/DSMetaLink.class.st b/DebuggingSpy/DSMetaLink.class.st
index 3ae3c42..44f1c63 100644
--- a/DebuggingSpy/DSMetaLink.class.st
+++ b/DebuggingSpy/DSMetaLink.class.st
@@ -1,3 +1,6 @@
+"
+MetaLinks only used by Debugging Spy for instrumentation purpose.
+"
 Class {
 	#name : 'DSMetaLink',
 	#superclass : 'MetaLink',
diff --git a/DebuggingSpy/DSMetaLinkInstaller.class.st b/DebuggingSpy/DSMetaLinkInstaller.class.st
index 6544c42..e199106 100644
--- a/DebuggingSpy/DSMetaLinkInstaller.class.st
+++ b/DebuggingSpy/DSMetaLinkInstaller.class.st
@@ -1,3 +1,6 @@
+"
+Installer for DSMetaLinks, it allows to uninstall all DSMetaLinks easily
+"
 Class {
 	#name : 'DSMetaLinkInstaller',
 	#superclass : 'MetaLinkInstaller',
diff --git a/DebuggingSpy/DSSpy.class.st b/DebuggingSpy/DSSpy.class.st
index 80e4700..2a3a9d3 100644
--- a/DebuggingSpy/DSSpy.class.st
+++ b/DebuggingSpy/DSSpy.class.st
@@ -1,3 +1,6 @@
+"
+I am defining rules for recording and I am used by most of the DebuggingSpy's classes.
+"
 Class {
 	#name : 'DSSpy',
 	#superclass : 'Object',
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index a108219..96bd12a 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -37,7 +37,8 @@ DSSpyInstrumenter class >> stopInstrumentation [
 DSSpyInstrumenter >> instrumentBrowseActions [
 	"Instruments browse actions"
 
-	ClyBrowserMorph link: DSBrowseRecord link toAST: (ClyBrowserMorph >> #prepareInitialStateBy:) ast "SpBrowseClassCommand link: DSBrowseRecord link toAST: (SpBrowseClassCommand >> #execute) ast"
+	ClySpawnFullBrowserCommand link: DSBrowseRecord link toAST: (ClySpawnFullBrowserCommand>>#execute) ast.
+	SpBrowseClassCommand link: DSBrowseRecord link toAST: (SpBrowseClassCommand >> #execute) ast
 ]
 
 { #category : 'system' }

From 50703be4ab6c4dcfd8c7cb01bbb2fdadd9a17c24 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Fri, 9 Jan 2026 16:14:48 +0100
Subject: [PATCH 27/49] test: start refactoring tests

---
 .../DSSpyInstrumenterTest.class.st            | 539 ++----------------
 1 file changed, 32 insertions(+), 507 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index 11b3013..f2105d0 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -2,14 +2,10 @@ Class {
 	#name : 'DSSpyInstrumenterTest',
 	#superclass : 'TestCase',
 	#instVars : [
-		'modifiedClass',
-		'modifiedMethodSource',
 		'instrumenter',
 		'record',
 		'debugger',
 		'browser',
-		'methodToRemove',
-		'methodsToRemove',
 		'recordSourceCode'
 	],
 	#category : 'DebuggingSpy-Tests-Tests - model',
@@ -38,14 +34,7 @@ DSSpyInstrumenterTest >> assertHaltHitRecordingMethod: method conditional: isHal
 DSSpyInstrumenterTest >> assertInstrumentDebuggerCommandNamed: debuggerCommandName [
 
 	| cmds cmd |
-	modifiedClass := StDebugger class.
-	modifiedMethodSource := [ 
-	                        (StDebugger class
-	                         >> #instrumentCommandsWith:forRoot:)
-		                        sourceCode ]
-		                        on: Error
-		                        do: [ nil ].
-	instrumenter instrumentDebuggerCommands.
+	
 	debugger := self debuggerOnRecursiveContextForTesting.
 	
 	cmds := debugger rootCommandsGroup.
@@ -65,13 +54,8 @@ DSSpyInstrumenterTest >> assertInstrumentDebuggerCommandNamed: debuggerCommandNa
 { #category : 'assertions' }
 DSSpyInstrumenterTest >> assertInstrumentSindarinDebuggerCommandNamed: debuggerCommandName [
 
-	| modifiedMethod cmds cmd |
-	modifiedClass := StDebugger class.
-	modifiedMethod := modifiedClass>>#buildSindarinExtentionCommandsGroupWith:forRoot:.
-	modifiedMethodSource := [ modifiedMethod sourceCode ]
-		                        on: Error
-		                        do: [ nil ].
-	instrumenter instrumentSindarinDebuggerCommands.
+	| cmds cmd |
+	
 	debugger := self debuggerOnRecursiveContextForTesting.
 
 	self setDummyWindowForPresenter: debugger.
@@ -426,19 +410,8 @@ DSSpyInstrumenterTest >> testInstrumentBrowseAction [
 
 	browser := ClyFullBrowserMorph on: ClyNavigationEnvironment currentImage.
 	browser prepareInitialStateBy: [ :b | b selectMethod: Object >> #yourself ].
-
-	self assert: self registry size equals: 1.
-
-	record := self registry first.
-	self assert: record class identicalTo: DSBrowseRecord.
-	self assert: record windowId equals: nil identityHash "At this stage, the window browser is not built"
-]
-
-{ #category : 'tests - browsers' }
-DSSpyInstrumenterTest >> testInstrumentClyFullBrowser [
-
-	browser := ClyFullBrowserMorph on: ClyNavigationEnvironment currentImage.
-	browser prepareInitialStateBy: [ :b | b selectMethod: Object >> #yourself ].
+	self setDummyWindowForMorph: browser.
+	browser newWindowTitle.
 
 	self assert: self registry size equals: 1.
 
@@ -464,9 +437,6 @@ DSSpyInstrumenterTest >> testInstrumentClyQueryBrowser [
 DSSpyInstrumenterTest >> testInstrumentClyTextEditorPrintIt [
 
 	| clyEditor |
-	modifiedClass := ClyTextEditor.
-	modifiedMethodSource := (ClyTextEditor >> #printIt) sourceCode.
-	instrumenter instrumentClyTextEditorPrintIt.
 
 	clyEditor := self clyTextEditor.
 	clyEditor printIt.
@@ -478,69 +448,10 @@ DSSpyInstrumenterTest >> testInstrumentClyTextEditorPrintIt [
 	self assert: record selectedString equals: '41+1'
 ]
 
-{ #category : 'tests - playground' }
-DSSpyInstrumenterTest >> testInstrumentCodePresenter [
-	|playground code|
-	modifiedClass := SpCodePresenter.	
-	modifiedMethodSource :=  [(SpCodePresenter >> #initialize) sourceCode] on: Error do:[nil].
-	instrumenter instrumentCodePresenter.	
-	playground := self playgroundPagePresenter.
-	self setDummyWindowForPresenter: playground.
-	code := self codePresenterFrom: playground.
-	
-	"When typing code, the playground generates an writing record"
-	self press: $t in: code.
-	self assert: self registry size equals: 1.
-	record := self registry first.	
-	self assert: record class identicalTo: DSPlaygroundWriteRecord.
-	self assert: record windowId equals: playground window window hash.
-	
-	"When the mouse enters the playground, if the playground has focus, generates a reading event"
-	code adapter sendMouseEnterEvent.
-	self assert: self registry size equals: 2.
-	record := self registry second.	
-	self assert: record class identicalTo: DSPlaygroundReadRecord.
-	self assert: record windowId equals: playground window window hash
-	
-]
-
-{ #category : 'tests - debugger' }
-DSSpyInstrumenterTest >> testInstrumentDebuggerCode [
-	|code adapter|
-	modifiedClass := SpCodePresenter.	
-	modifiedMethodSource :=  [(SpCodePresenter >> #initialize) sourceCode] on: Error do:[nil].
-	instrumenter instrumentCodePresenter.	
-	
-	debugger := self debuggerForTesting.	
-	code := debugger code.	
-	self setDummyWindowForPresenter: code.
-	adapter := SpMorphicCodeAdapter new.
-	adapter adapt: code.	
-	code adapter: adapter.
-	code adapter buildWidget.		
-
-	"When typing code, the playground code a writing record"
-	self press: $t in: code.
-	self assert: self registry size equals: 1.
-	record := self registry first.	
-	self assert: record class identicalTo: DSPlaygroundWriteRecord.
-	self assert: record windowId equals: code window window hash.
-	
-	"When the mouse enters the playground, if the playground has focus, generates a reading event"
-	code adapter sendMouseEnterEvent.
-	self assert: self registry size equals: 2.
-	record := self registry second.	
-	self assert: record class identicalTo: DSPlaygroundReadRecord.
-	self assert: record windowId equals: code window window hash
-]
-
 { #category : 'tests - debugger' }
 DSSpyInstrumenterTest >> testInstrumentDebuggerOpening [
-	modifiedClass := StDebugger.	
-	modifiedMethodSource :=  [(StDebugger >> #initializeWindow:) sourceCode] on: Error do:[nil].
 	
 	debugger := self debuggerForTestingWithWindow.			
-	instrumenter instrumentDebuggerOpening.	
 	debugger initializeWindow: debugger window.
 	
 	self assert: self registry size equals: 1.
@@ -557,9 +468,6 @@ DSSpyInstrumenterTest >> testInstrumentDebuggerOpening [
 { #category : 'tests - debugger' }
 DSSpyInstrumenterTest >> testInstrumentDebuggerStack [
 	|selectedItem|
-	modifiedClass := StDebugger.
-	modifiedMethodSource := (StDebugger >> #initializeStack) sourceCode.
-	instrumenter instrumentDebuggerStack.
 	
 	debugger := self debuggerForTestingWithWindow.		
 	self assert: self registry size equals: 2.
@@ -593,39 +501,9 @@ DSSpyInstrumenterTest >> testInstrumentDebuggerStack [
 	self assert: record selector equals: selectedItem selector
 ]
 
-{ #category : 'tests - inspector' }
-DSSpyInstrumenterTest >> testInstrumentExpandAttribute [
-
-	| inspector object items |
-	modifiedClass := FTBasicItem.
-	modifiedMethodSource := (FTBasicItem >> #expandAndRefresh) sourceCode.
-	instrumenter instrumentExpandAttribute.
-
-	object := OrderedCollection new.
-	inspector := StInspectorPresenter onObject: object.
-	items := self tableItemsListFromInspector: inspector.
-	items first expandAndRefresh.
-
-	self assert: self registry size equals: 1.
-	record := self registry first.
-
-	self assert: record class identicalTo: DSExpandAttributeRecord.
-	self
-		assert: record windowId
-		equals: inspector window window identityHash.
-	self assert: record attributeName equals: 'self'.
-	self assert: record attributeHash equals: object identityHash.
-	self assert: record attributeValue equals: object displayString
-]
-
 { #category : 'tests - halts' }
 DSSpyInstrumenterTest >> testInstrumentHaltHits [
 
-	instrumenter instrumentHaltHits.
-	methodsToRemove := {
-		                   (Halt class >> #signal:).
-		                   (Halt class >> #signalIn:).
-		                   (Halt class >> #signal) }.
 	[ self executeHalt ]
 		on: Halt
 		do: [ ].
@@ -652,8 +530,8 @@ DSSpyInstrumenterTest >> testInstrumentHaltHits [
 	[ self executeHaltOnce ]
 		on: Halt
 		do: [ ].
-	self assert: self registry size equals: 3.
-	record := self registry third.
+	self assert: self registry size equals: 5.
+	record := self registry at: 5.
 	self assert: record selector equals: #once:.
 	self
 		assertHaltHitRecordingMethod: self class >> #executeHaltOnce
@@ -663,8 +541,8 @@ DSSpyInstrumenterTest >> testInstrumentHaltHits [
 	[ self executeHaltWithMessage ]
 		on: Halt
 		do: [ ].
-	self assert: self registry size equals: 4.
-	record := self registry fourth.
+	self assert: self registry size equals: 6.
+	record := self registry at: 6.
 	self assert: record selector equals: #now:.
 	self
 		assertHaltHitRecordingMethod: self class >> #executeHaltWithMessage
@@ -674,8 +552,8 @@ DSSpyInstrumenterTest >> testInstrumentHaltHits [
 	[ self execute1Halt ]
 		on: Halt
 		do: [ ].
-	self assert: self registry size equals: 5.
-	record := self registry fifth.
+	self assert: self registry size equals: 7.
+	record := self registry at: 7.
 	self assert: record selector equals: #halt.
 	self
 		assertHaltHitRecordingMethod: self class >> #execute1Halt
@@ -686,11 +564,6 @@ DSSpyInstrumenterTest >> testInstrumentHaltHits [
 { #category : 'tests - halts' }
 DSSpyInstrumenterTest >> testInstrumentHaltHitsInBlock [
 	|executedMethod|
-	instrumenter instrumentHaltHits.
-	methodsToRemove := { 
-		                   (Halt class >> #signal:).
-		                   (Halt class >> #signalIn:).
-		                   (Halt class >> #signal) }.
 		
 	executedMethod := self class >> #executeHaltInBloc.
 	[ self executeHaltInBloc  ]
@@ -708,225 +581,30 @@ DSSpyInstrumenterTest >> testInstrumentHaltHitsInBlock [
 	self assert: record sourceCodeInterval last equals: executedMethod ast statements first receiver statements first stop
 ]
 
-{ #category : 'tests - inspector' }
-DSSpyInstrumenterTest >> testInstrumentInspectMethodsOfClass [
-
-	| metaPane object classes |
-	modifiedClass := StMetaBrowserPresenter.
-	modifiedMethodSource := (StMetaBrowserPresenter >> #methodsOf:)
-		                        sourceCode.
-	instrumenter instrumentInspectMethodsOfClass.
-
-	object := OrderedCollection new.
-	metaPane := StMetaBrowserPresenter basicNew.
-	self setDummyWindowForPresenter: metaPane.
-	metaPane application: StPharoApplication current.
-	metaPane setModelBeforeInitialization: object.
-
-	metaPane initialize.
-
-	classes := self
-		           metaPaneClassesItems: #classes
-		           FromInspector: metaPane.
-	classes selectPath:
-		(Array new: OrderedCollection allSuperclasses size + 1 withAll: 1).
-
-	self assert: self registry size equals: 1.
-	record := self registry first.
-
-	self assert: record class identicalTo: DSInspectMethodsRecord.
-	self assert: record windowId equals: metaPane window window hash.
-	self assert: record selectedClass equals: object class name.
-	self assert: record inspectedObject equals: object printString.
-
-	classes clickAtPath: { 1. 1. 1. 1 }.
-	record := self registry second.
-	self
-		assert: record selectedClass
-		equals: object class superclass name
-]
-
-{ #category : 'tests - inspector' }
-DSSpyInstrumenterTest >> testInstrumentInspectSourceOfMethod [
-
-	| metaPane object methods classes |
-	modifiedClass := StMetaBrowserPresenter.
-	modifiedMethodSource := (StMetaBrowserPresenter >> #updateSourceWith:)
-		                        sourceCode.
-	instrumenter instrumentInspectSourceOfMethod.
-
-	object := OrderedCollection new.
-	metaPane := StMetaBrowserPresenter on: object.
-	methods := self
-		           metaPaneClassesItems: #methods
-		           FromInspector: metaPane.
-	classes := self
-		           metaPaneClassesItems: #classes
-		           FromInspector: metaPane.
-
-	self setDummyWindowForPresenter: metaPane.
-
-	classes selectPath:
-		(Array new: OrderedCollection allSuperclasses size + 1 withAll: 1).
-
-	methods selectItem: methods items first.
-	record := self registry first.
-
-	self assert: record class identicalTo: DSInspectMethodSourceRecord.
-	self
-		assert: record selectedMethod
-		equals: metaPane selectedMethod name.
-
-	self assert: record windowId equals: metaPane window window hash.
-	self assert: record selectedClass equals: object class name.
-	self assert: record inspectedObject equals: object printString
-]
-
-{ #category : 'tests - inspector' }
-DSSpyInstrumenterTest >> testInstrumentInspectorOnObject [
-	|inspector object|
-	modifiedClass := StInspectorPresenter.
-	modifiedMethodSource := (StInspectorPresenter >> #initializePresenters) sourceCode.
-	instrumenter instrumentInspectorOnObject.
-	
-	object := OrderedCollection new.
-	inspector := self newInspectorOn: object.
-
-	self assert: self registry size equals: 1.
-	record := self registry first.
-	
-	
-	self assert: record class identicalTo: DSInspectObjectRecord.
-	self assert: record windowId equals: inspector window window identityHash.
-	self assert: record inspectedObject equals: object printString.
-	self assert: record inspectedObjectHash equals: object identityHash
-]
-
-{ #category : 'tests - inspector' }
-DSSpyInstrumenterTest >> testInstrumentInspectorPageSelection [
-
-	| inspector object objectInspector pagesView |
-	modifiedClass := StObjectInspectorPresenter.
-	modifiedMethodSource := (StObjectInspectorPresenter
-	                         >> #initializePresenters) sourceCode.
-	instrumenter instrumentInspectorPageSelection.
-
-	object := OrderedCollection new.
-	inspector := self newInspectorOn: object.
-	objectInspector := inspector firstPage.
-	pagesView := (objectInspector class slotNamed: #views) read:
-		             objectInspector.
-
-	self assert: self registry size equals: 1.
-	record := self registry first.
-
-	self assert: record class identicalTo: DSSelectInspectorPageRecord.
-	self
-		assert: record windowId
-		equals: inspector window window identityHash.
-	self assert: record pageTitle equals: pagesView pages first title.
-	self assert: record inspectedObjectHash equals: object identityHash.
-	self assert: record inspectedObject equals: object printString.
-
-	pagesView selectPage: pagesView pages second.
-	self assert: self registry size equals: 2.
-	record := self registry second.
-	self assert: record pageTitle equals: pagesView pages second title
-]
-
-{ #category : 'tests - mouse events' }
-DSSpyInstrumenterTest >> testInstrumentMouseDownFTSelectableMorph [
-	
-	|morph|
-	self should: [FTSelectableMorph >> #mouseDown: ] raise: KeyNotFound.
-	instrumenter instrumentMouseDownFTSelectableMorph.
-	methodToRemove := (FTSelectableMorph >> #mouseDown:).
-	
-	morph := FTSelectableMorph new.
-	morph privateOwner: SystemWindow new.
-	morph mouseDown: nil.
-	
-	self assert: self registry size equals: 1.	
-	record := self registry first.
-	self assert: record class identicalTo: DSMouseDownTableItemRecord.
-	self assert: record windowId equals: morph window hash.
-	self assert: record itemElement equals: (DSMouseEventRecord printStringMorphs: {morph})
-]
-
-{ #category : 'tests - mouse events' }
-DSSpyInstrumenterTest >> testInstrumentMouseEnterFTSelectableMorph [
-	
-	|morph|
-	modifiedClass := FTSelectableMorph.
-	modifiedMethodSource := (FTSelectableMorph >> #mouseEnter:) sourceCode.
-	instrumenter instrumentMouseEnterFTSelectableMorph.
-	
-	morph := FTSelectableMorph new.
-	morph privateOwner: SystemWindow new.
-	morph mouseEnter: nil.
-	
-	self assert: self registry size equals: 1.	
-	record := self registry first.
-	self assert: record class identicalTo: DSMouseEnterTableItemRecord.
-	self assert: record windowId equals: morph window hash.
-	self assert: record itemElement equals: (DSMouseEventRecord printStringMorphs: {morph})
-]
-
 { #category : 'tests - mouse events' }
 DSSpyInstrumenterTest >> testInstrumentMouseEnterWindow [
-	
-	|window|
-	self should: [SystemWindow >> #handleMouseEnter: ] raise: KeyNotFound.
-	instrumenter instrumentMouseEnterWindow.
-	methodToRemove := (SystemWindow >> #handleMouseEnter:).
-	
+
+	| window |
 	window := SystemWindow new.
 	window handleMouseEnter: (self simulatedMouseEventFor: window).
-	
-	self assert: self registry size equals: 1.	
+
+	self assert: self registry size equals: 1.
 	record := self registry first.
 	self assert: record class identicalTo: DSMouseEnterWindowRecord.
-	self assert: record windowId equals: window hash.
-	self assert: record itemElement equals: (DSMouseEventRecord printStringMorphs: {window})
+	self assert: record windowId equals: window hash
 ]
 
 { #category : 'tests - mouse events' }
 DSSpyInstrumenterTest >> testInstrumentMouseLeaveWindow [
-	
-	|window|
-	self should: [SystemWindow >> #handleMouseLeave: ] raise: KeyNotFound.
-	instrumenter instrumentMouseLeaveWindow.
-	methodToRemove := (SystemWindow >> #handleMouseLeave:).
-	
+
+	| window |
 	window := SystemWindow new.
 	window handleMouseLeave: (self simulatedMouseEventFor: window).
-	
-	self assert: self registry size equals: 1.	
-	record := self registry first.
-	self assert: record class identicalTo: DSMouseLeaveWindowRecord.
-	self assert: record windowId equals: window hash.
-	self assert: record itemElement equals: (DSMouseEventRecord printStringMorphs: {window})
-]
-
-{ #category : 'tests - inspector' }
-DSSpyInstrumenterTest >> testInstrumentNavigateAttribute [
-	|raw object|
-	modifiedClass := StRawInspectionPresenter.
-	modifiedMethodSource := (StRawInspectionPresenter >> #setAttributeTable) sourceCode.
-	instrumenter instrumentNavigateAttribute.
-	
-	object := OrderedCollection new.
-	raw := StRawInspectionPresenter on: object.
-	self setDummyWindowForPresenter: raw.	
-	raw selectPath: #(2).
 
 	self assert: self registry size equals: 1.
-	record := self registry first.	
-	
-	self assert: record class identicalTo: DSNavigateAttributeRecord.
-	self assert: record windowId equals: raw window window identityHash.
-	self assert: record inspectedObject equals: object printString.
-	self assert: record inspectedObjectHash equals: object identityHash
+	record := self registry first.
+	self assert: record class identicalTo: DSMouseLeaveWindowRecord.
+	self assert: record windowId equals: window hash
 ]
 
 { #category : 'tests - debugger' }
@@ -951,9 +629,6 @@ DSSpyInstrumenterTest >> testInstrumentReturn [
 DSSpyInstrumenterTest >> testInstrumentRubEditorCopySelection [
 
 	| rubEditor registerClipboardText |
-	modifiedClass := RubSmalltalkEditor.
-	modifiedMethodSource := (RubSmalltalkEditor >> #copySelection) sourceCode.
-	instrumenter instrumentRubSmalltalkEditorCopySelection.
 
 	registerClipboardText := DSSpy recordClipboardContent.
 	DSSpy recordClipboardContent: true.
@@ -979,10 +654,6 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorCopySelection [
 DSSpyInstrumenterTest >> testInstrumentRubEditorDebugIt [
 
 	| rubEditor |
-	self skip.
-	modifiedClass := RubSmalltalkEditor.
-	modifiedMethodSource := (RubSmalltalkEditor >> #debug:) sourceCode.
-	instrumenter instrumentRubEditorDebugIt.
 	
 	rubEditor := self rubTextEditor.
 	rubEditor selectAll.
@@ -999,9 +670,6 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorDebugIt [
 DSSpyInstrumenterTest >> testInstrumentRubEditorDoIt [
 
 	| rubEditor |
-	modifiedClass := RubSmalltalkEditor.
-	modifiedMethodSource := (RubSmalltalkEditor >> #doIt) sourceCode.
-	instrumenter instrumentRubEditorDoIt.
 	
 	rubEditor := self rubTextEditor.
 	rubEditor selectAll.
@@ -1018,40 +686,27 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorDoIt [
 DSSpyInstrumenterTest >> testInstrumentRubEditorPaste [
 
 	| rubEditor registerClipboardText |
-	modifiedClass := RubSmalltalkEditor.
-	modifiedMethodSource := (RubSmalltalkEditor >> #paste) sourceCode.
-	instrumenter instrumentRubSmalltalkEditorPaste.
 	registerClipboardText := DSSpy recordClipboardContent.
 	DSSpy recordClipboardContent: true.
 
-	[ 
-	rubEditor := self rubTextEditor.
-	rubEditor textArea beForSmalltalkCode.
+	[
+		rubEditor := self rubTextEditor.
+		rubEditor textArea beForSmalltalkCode.
 
-	Clipboard clipboardText: 'copiedText'.
-	rubEditor selectAll.
-	rubEditor paste.
-	"Added the select to be able to run the test in an instrumented image"
-	self
-		assert:
-		(self registry select: [ :r | r class = DSClipboardPasteRecord ])
-			size
-		equals: 1.
-	record := (self registry select: [ :r | 
-		           r class = DSClipboardPasteRecord ]) first.
+		Clipboard clipboardText: 'copiedText'.
+		rubEditor selectAll.
+		rubEditor paste. "Added the select to be able to run the test in an instrumented image"
+		self assert: (self registry select: [ :r | r class = DSClipboardPasteRecord ]) size equals: 1.
+		record := (self registry select: [ :r | r class = DSClipboardPasteRecord ]) first.
 
-	self assert: record class identicalTo: DSClipboardPasteRecord.
-	self assert: record clipboardText equals: 'copiedText' ] ensure: [ 
-		DSSpy recordClipboardContent: registerClipboardText ]
+		self assert: record class identicalTo: DSClipboardPasteRecord.
+		self assert: record clipboardText equals: 'copiedText' ] ensure: [ DSSpy recordClipboardContent: registerClipboardText ]
 ]
 
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentRubEditorPrintIt [
 
 	| rubEditor |
-	modifiedClass := RubSmalltalkEditor.
-	modifiedMethodSource := (RubSmalltalkEditor >> #printIt) sourceCode.
-	instrumenter instrumentRubEditorPrintIt.
 
 	rubEditor := self rubTextEditor.
 	rubEditor printIt.
@@ -1063,109 +718,17 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorPrintIt [
 	self assert: record selectedString equals: '41+1'
 ]
 
-{ #category : 'tests - mouse events' }
-DSSpyInstrumenterTest >> testInstrumentRubScrollTextMorphHandleMouseOver [
-	
-	self should: [RubScrolledTextMorph >> #handlesMouseOver: ] raise: KeyNotFound.
-	instrumenter instrumentRubScrollTextMorphHandleMouseOver.
-	methodToRemove := (RubScrolledTextMorph >> #handlesMouseOver:).
-		
-	self assert: (RubScrolledTextMorph new handlesMouseOver: nil)
-]
-
-{ #category : 'tests - mouse events' }
-DSSpyInstrumenterTest >> testInstrumentRubScrollTextMorphMouseEnter [
-	|morph|
-
-	modifiedClass := RubScrolledTextMorph.
-	instrumenter instrumentRubScrollTextMorphMouseEnter.
-	methodToRemove := (RubScrolledTextMorph >> #mouseEnter:).
-	morph := RubScrolledTextMorph new.
-	morph mouseEnter: nil.
-	
-	self assert: self registry size equals: 1.	
-	record := self registry first.
-	self assert: record class identicalTo: DSMouseEnterTextEditorRecord.
-	self assert: record windowId equals: morph window hash.
-	self assert: record itemElement equals: (DSMouseEventRecord printStringMorphs: {morph})
-]
-
 { #category : 'tests - debugger' }
 DSSpyInstrumenterTest >> testInstrumentRunTo [
 
 	self assertInstrumentDebuggerCommandNamed: 'Run to'
 ]
 
-{ #category : 'tests - mouse events' }
-DSSpyInstrumenterTest >> testInstrumentScrollingByDraggingSlider [
-	
-	|slider|
-	modifiedClass := SliderMorph.
-	modifiedMethodSource := (SliderMorph >> #dragging:) sourceCode.
-	instrumenter instrumentScrollingByDraggingSlider.
-	
-	slider := SliderMorph new.
-	slider privateOwner: SystemWindow new.
-	
-	slider dragging: true.			
-	self assert: self registry size equals: 1.	
-	record := self registry first.
-	self assert: record class identicalTo: DSStartScrollingEventRecord.
-	self assert: record windowId equals: slider window hash.
-
-	slider dragging: false.			
-	self assert: self registry size equals: 2.	
-	record := self registry second.
-	self assert: record class identicalTo: DSStopScrollingEventRecord.
-	self assert: record windowId equals: slider window hash.
-]
-
-{ #category : 'tests - mouse events' }
-DSSpyInstrumenterTest >> testInstrumentScrollingInScrollPanesEvents [
-	
-	|pane|
-	modifiedClass := GeneralScrollPaneMorph.
-	modifiedMethodSource := (GeneralScrollPaneMorph >> #mouseWheel:) sourceCode.
-	instrumenter instrumentScrollingInScrollPanesEvents.
-	
-	pane := GeneralScrollPaneMorph new.
-	pane privateOwner: SystemWindow new.
-	
-	pane mouseWheel: MouseWheelEvent new.			
-	self assert: self registry size equals: 1.	
-	record := self registry first.
-	self assert: record class identicalTo: DSScrollEventRecord.
-	self assert: record windowId equals: pane window hash
-]
-
-{ #category : 'tests - mouse events' }
-DSSpyInstrumenterTest >> testInstrumentScrollingInTablesEvents [
-	
-	|table|
-	modifiedClass := FTTableMorph.
-	modifiedMethodSource := (FTTableMorph >> #mouseWheel:) sourceCode.
-	instrumenter instrumentScrollingInTablesEvents.
-	
-	table := FTTableMorph new.
-	table privateOwner: SystemWindow new.
-	
-	table mouseWheel: MouseWheelEvent new.			
-	self assert: self registry size equals: 1.	
-	record := self registry first.
-	self assert: record class identicalTo: DSScrollEventRecord.
-	self assert: record windowId equals: table window hash
-]
-
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentSpCodeDebugIt [
 
 	| codePresenter debugItCommand |	
-	self skip.
-	self flag: 'This test seems to make the CI crash because of a debugger opening?'.
-	modifiedClass := SpCodeDebugItCommand.
-	modifiedMethodSource := (SpCodeDebugItCommand >> #execute) sourceCode.
-	instrumenter instrumentSpCodeDebugIt.
-
+		
 	codePresenter := self codePresenterFrom: self playgroundPagePresenter.
 
 	debugItCommand := SpCodeDebugItCommand new.
@@ -1183,9 +746,6 @@ DSSpyInstrumenterTest >> testInstrumentSpCodeDebugIt [
 DSSpyInstrumenterTest >> testInstrumentSpCodeDoIt [
 
 	| codePresenter printItCommand |
-	modifiedClass := SpCodeDoItCommand.
-	modifiedMethodSource := (SpCodeDoItCommand >> #execute) sourceCode.
-	instrumenter instrumentSpCodeDoIt.
 
 	codePresenter := self codePresenterFrom: self playgroundPagePresenter.
 
@@ -1205,9 +765,6 @@ DSSpyInstrumenterTest >> testInstrumentSpCodeDoIt [
 DSSpyInstrumenterTest >> testInstrumentSpCodeDoItAndGoForInspector [
 
 	| presenter |
-	modifiedClass := StObjectContextPresenter.
-	modifiedMethodSource := (StObjectContextPresenter >> #doEvaluateAndGo) sourceCode.
-	instrumenter instrumentSpCodeDoItAndGoForInspector.
 
 	presenter := StObjectContextPresenter basicNew.
 	presenter setModelBeforeInitialization: self stObjectContextModelMock.
@@ -1228,9 +785,6 @@ DSSpyInstrumenterTest >> testInstrumentSpCodeDoItAndGoForInspector [
 DSSpyInstrumenterTest >> testInstrumentSpCodeDoItAndGoForPlayground [
 
 	| presenter |
-	modifiedClass := StPlaygroundPagePresenter.
-	modifiedMethodSource := (StPlaygroundPagePresenter >> #doEvaluateAndGo) sourceCode.
-	instrumenter instrumentSpCodeDoItAndGoForPlayground.
 
 	presenter := StPlaygroundPagePresenter basicNew.
 	presenter forceDisableLoading.
@@ -1253,9 +807,6 @@ DSSpyInstrumenterTest >> testInstrumentSpCodeDoItAndGoForPlayground [
 DSSpyInstrumenterTest >> testInstrumentSpCodePrintIt [
 
 	| codePresenter printItCommand |
-	modifiedClass := SpCodePrintItCommand.
-	modifiedMethodSource := (SpCodePrintItCommand >> #execute) sourceCode.
-	instrumenter instrumentSpCodePrintIt.
 
 	codePresenter := self codePresenterFrom: self playgroundPagePresenter.
 	printItCommand := SpCodePrintItCommand new.
@@ -1269,24 +820,6 @@ DSSpyInstrumenterTest >> testInstrumentSpCodePrintIt [
 	self assert: record selectedString equals: '41+1'
 ]
 
-{ #category : 'tests - playground' }
-DSSpyInstrumenterTest >> testInstrumentStPlayground [
-
-	| playground |
-	modifiedClass := StPlaygroundPresenter class.
-	modifiedMethodSource := (StPlaygroundPresenter class >> #open)
-		                        sourceCode.
-	instrumenter instrumentPlaygroundCode.
-	playground := StPlaygroundPresenter open.
-
-	"On opening, the playground generates an opening record"
-	self assert: self registry size equals: 1.
-	record := self registry first.
-	self assert: record class identicalTo: DSPlaygroundOpenedRecord.
-	self assert: record windowId equals: playground window window hash.
-	playground close.
-]
-
 { #category : 'tests - debugger' }
 DSSpyInstrumenterTest >> testInstrumentStepInto [
 
@@ -1352,10 +885,6 @@ DSSpyInstrumenterTest >> testLoggingInteractionsWithNoSourceCode [
 DSSpyInstrumenterTest >> testRecordDNU [
 	|capturedDNU|
 	
-	modifiedClass := Exception.
-	modifiedMethodSource := (Exception >> #raiseUnhandledError) sourceCode.
-	instrumenter instrumentExceptionSignalling.
-	
 	[self methodWithDNU] on: MessageNotUnderstood do:[:dnu| capturedDNU := dnu. [dnu raiseUnhandledError] on: UnhandledError do:[] ].
 		
 	record := self registry first.
@@ -1370,10 +899,6 @@ DSSpyInstrumenterTest >> testRecordDNU [
 { #category : 'tests - exceptions' }
 DSSpyInstrumenterTest >> testRecordException [
 	|capturedException|
-	
-	modifiedClass := Exception.
-	modifiedMethodSource := (Exception >> #raiseUnhandledError) sourceCode.
-	instrumenter instrumentExceptionSignalling.
 		
 	[self methodWithException] on: Exception do:[:e| capturedException := e copy. [e raiseUnhandledError] on: UnhandledError do:[] ].
 

From 07fcb6f0e027c5186e59fa3d6663c126278ef4f3 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 12 Jan 2026 10:27:21 +0100
Subject: [PATCH 28/49] fix(DSSpy): fix tests linked to DSSpy

---
 DebuggingSpy-Tests/DSSpyTest.class.st | 147 ++------------------------
 1 file changed, 8 insertions(+), 139 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSpyTest.class.st b/DebuggingSpy-Tests/DSSpyTest.class.st
index 0b0ab63..f05d707 100644
--- a/DebuggingSpy-Tests/DSSpyTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyTest.class.st
@@ -200,42 +200,6 @@ DSSpyTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : 'tests - task management' }
-DSSpyTest >> testCloseSurvey [
-	
-	|taskLoggingFileName recordedSurvey|
-	DSSpy logOnlyWhenTaskStarted: true.
-	DSSpy startTask: task.
-	DSRecordRegistry autoSerialize: true.
-	taskLoggingFileName := task title, '-', DSSpy logger defaultLoggingFileName.
-	
-	self assert: self registry size equals: 1.
-	self assert: DSSpy logger loggingFileName equals: taskLoggingFileName.
-	self assert: DSSpy logger loggingFileReference basename equals: taskLoggingFileName.
-	
-	DSSpy closeSurvey: survey.
-	self assert: self registry size equals: 2.
-	self assert: DSSpy logger loggingFileName equals: taskLoggingFileName.
-	self assert: DSSpy logger loggingFileReference basename equals: taskLoggingFileName.	
-	
-	record := self registry first.
-	self assert: record class equals: DSStartTaskRecord.
-	self assert: record taskName equals: DSTestTask dsTaskDescription.
-	self assert: record description equals: DSTestTask dsTaskDescription.
-	
-	record := self registry last.
-	self assert: record class equals: DSSurveyRecord.
-	self assert: record answer equals: survey answer.
-	self assert: record description equals: DSTestSurvey dsSurveyDescription.
-	
-	recordedSurvey := (STON fromString: (DSSpy logger loggingDirectory / (DSSpy logger filenameForSurvey: survey)) readStream contents) first.
-	self assert: recordedSurvey class equals: DSSurveyRecord.
-	self assert: recordedSurvey answer equals: survey answer.
-	self assert: recordedSurvey description equals: DSTestSurvey dsSurveyDescription.
-	(DSSpy logger loggingDirectory / (DSSpy logger filenameForSurvey: survey)) delete
-	
-]
-
 { #category : 'tests - debugpoints events' }
 DSSpyTest >> testDebugPointAdded [
 
@@ -321,17 +285,6 @@ DSSpyTest >> testDefaultLogger [
 	self assert: DSSpy logger class equals: DSSpy defaultLoggerClass 
 ]
 
-{ #category : 'tests - task management' }
-DSSpyTest >> testEndTask [
-	DSSpy endTask: task.
-	self assert: self registry size equals: 1.
-	record := self registry first.
-	self assert: record class equals: DSEndingTaskRecord.
-	self assert: record taskName equals: DSTestTask dsTaskDescription.
-	self assert: record description equals: DSTestTask dsTaskDescription.
-	self assert: record answer equals: DSTestTask dsTaskDescription
-]
-
 { #category : 'tests - halts events' }
 DSSpyTest >> testIndexesOfHaltNodesIn [
 
@@ -361,42 +314,14 @@ DSSpyTest >> testLogKey [
 	self assert: record event equals: #TEST
 ]
 
-{ #category : 'tests - logging' }
-DSSpyTest >> testLogOnlyWhenTaskStarted [
-	|str dir|
-	dir := DSSpy logger loggingDirectory.
-	dir exists ifTrue: [ dir deleteAllChildren].
-	DSSpy resetSpy.
-	self deny: DSSpy logOnlyWhenTaskStarted.
-	
-	str := WriteStream on: String new.
-	str nextPutAll: '[''test'']'.
-	
-	DSSpy logOnlyWhenTaskStarted: true.
-	DSSpy log: 'test'.
-	self assert: DSSpy logOnlyWhenTaskStarted.
-	self assert: DSSpy logger loggingFileReference contents isEmpty.
-	
-	DSSpy startTask: task.	
-	DSSpy log: 'test'.
-	self assert: DSSpy logger loggingFileReference contents equals: str contents.
-	
-	DSSpy endTask: task.
-	self assert: DSSpy logOnlyWhenTaskStarted
-	
-]
-
 { #category : 'tests - window events' }
 DSSpyTest >> testLogWindowActivated [
 
 	DSSpy logWindowActivated: self windowEvent.
 
-	self assert: self registry size equals: 2.
+	self assert: self registry size equals: 1.
 
 	record := self registry first.
-	self assert: record class identicalTo: DSToolWindowActivatedEventRecord.
-
-	record := self registry second.
 	self assertWindowEventRecordedAs: DSWindowActivatedRecord
 ]
 
@@ -416,12 +341,9 @@ DSSpyTest >> testLogWindowOpened [
 
 	DSSpy logWindowOpened: self windowEvent.
 
-	self assert: self registry size equals: 2.
+	self assert: self registry size equals: 1.
 
 	record := self registry first.
-	self assert: record class identicalTo: DSToolWindowOpenedEventRecord.
-
-	record := self registry second.
 	self assertWindowEventRecordedAs: DSWindowOpenedRecord
 ]
 
@@ -807,17 +729,6 @@ DSSpyTest >> testRecordSourceCodeDefaultValue [
 	self deny: DSSpy recordSourceCode 
 ]
 
-{ #category : 'tests - task management' }
-DSSpyTest >> testResetSpy [
-
-	DSSpy startTask: task.
-	DSSpy resetSpy.
-	self deny: DSSpy taskStarted.
-	self
-		assert: DSSpy logger loggingFileName
-		equals: DSSpy logger defaultLoggingFileName
-]
-
 { #category : 'tests - methods events' }
 DSSpyTest >> testScopeSourceCodeChangesRecording [
 	DSSpy scopeSourceCodeChangesRecording: nil.
@@ -836,40 +747,6 @@ DSSpyTest >> testSerialize [
 		equals: '[' , (STON toString: record) , ']'
 ]
 
-{ #category : 'tests - task management' }
-DSSpyTest >> testStartTask [
-	
-	DSSpy startTask: task.
-	self assert: self registry size equals: 1.
-	record := self registry first.
-	self assert: record class equals: DSStartTaskRecord.
-	self assert: record taskName equals: DSTestTask dsTaskDescription.
-	self assert: record description equals: DSTestTask dsTaskDescription
-]
-
-{ #category : 'tests - task management' }
-DSSpyTest >> testStartTaskSerialization [
-
-	| recordedTask |
-	DSSpy logger loggingDirectory deleteAllChildren.
-	DSRecordRegistry autoSerialize: true.
-	DSSpy resetSpy.
-	DSSpy startTask: task.
-	recordedTask := (DSSpy materialize: DSSpy logger loggingFileReference) first.
-	self assert: recordedTask class equals: DSStartTaskRecord.
-	self assert: recordedTask taskName equals: task title
-]
-
-{ #category : 'tests - task management' }
-DSSpyTest >> testTaskStarted [
-
-	self deny: DSSpy taskStarted.
-	DSSpy startTask: task.
-	self assert: DSSpy taskStarted.
-	DSSpy endTask: task.
-	self deny: DSSpy taskStarted
-]
-
 { #category : 'tests - debugpoints events' }
 DSSpyTest >> testWatchDebugPointAdded [
 	| history |
@@ -945,27 +822,19 @@ DSSpyTest >> testWatchDebugPointRemoved [
 DSSpyTest >> testWindowOpenedListensToWindowActivatedAndClosedEvents [
 
 	DSSpy logWindowOpened: self windowEvent.
-	self windowEvent window announceActivated.
-	self windowEvent window announce: (WindowClosed new
+	DSSpy logWindowActivated: windowEvent window announceActivated.
+	DSSpy logWindowClosed: (windowEvent window announce: (WindowClosed new
 			 window: self windowEvent window;
-			 yourself).
-	self assert: self registry size equals: 5.
+			 yourself)).
+	self assert: self registry size equals: 3.
 
 	record := self registry first.
-	self assert: record class identicalTo: DSToolWindowOpenedEventRecord.
-
-	record := self registry second.
 	self assert: record class identicalTo: DSWindowOpenedRecord.
 	
-	record := self registry third.
-	self
-		assert: record class
-		identicalTo: DSToolWindowActivatedEventRecord.
-
-	record := self registry at: 4.
+	record := self registry second.
 	self assert: record class identicalTo: DSWindowActivatedRecord.
 
-	record := self registry at: 5.
+	record := self registry third.
 	self assert: record class identicalTo: DSWindowClosedRecord
 ]
 

From 43251343d58375ffd3a396618b3d1c109041b716 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 12 Jan 2026 15:25:38 +0100
Subject: [PATCH 29/49] fix: fixing tests and recording methods

---
 .../DSSpyInstrumenterTest.class.st            | 41 ++++++++++++-------
 DebuggingSpy/DSClipboardActionRecord.class.st |  3 --
 DebuggingSpy/DSClipboardCopyRecord.class.st   | 10 +++++
 DebuggingSpy/DSClipboardPasteRecord.class.st  | 10 +++++
 .../StObjectContextPresenter.extension.st     |  7 ++++
 5 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 DebuggingSpy/StObjectContextPresenter.extension.st

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index f2105d0..a905951 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -420,19 +420,6 @@ DSSpyInstrumenterTest >> testInstrumentBrowseAction [
 	self assert: record windowId equals: nil identityHash "At this stage, the window browser is not built"
 ]
 
-{ #category : 'tests - browsers' }
-DSSpyInstrumenterTest >> testInstrumentClyQueryBrowser [
-	
-	browser := ClyQueryBrowserMorph on: ClyNavigationEnvironment currentImage.  
-	browser showResultOf: (ClyMessageImplementorsQuery of: #testInstrumentClyFullBrowser).
-	
-	self assert: self registry size equals: 1.
-	
-	record := self registry first.
-	self assert: record class identicalTo: DSImplementorsRecord.
-	self assert: record windowId equals: browser window hash
-]
-
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentClyTextEditorPrintIt [
 
@@ -581,6 +568,19 @@ DSSpyInstrumenterTest >> testInstrumentHaltHitsInBlock [
 	self assert: record sourceCodeInterval last equals: executedMethod ast statements first receiver statements first stop
 ]
 
+{ #category : 'tests - browsers' }
+DSSpyInstrumenterTest >> testInstrumentImplementorsAction [
+	
+	browser := ClyQueryBrowserMorph on: ClyNavigationEnvironment currentImage.  
+	browser showResultOf: (ClyMessageImplementorsQuery of: #testInstrumentBrowseAction).
+	
+	self assert: self registry size equals: 1.
+	
+	record := self registry first.
+	self assert: record class identicalTo: DSImplementorsRecord.
+	self assert: record windowId equals: browser window hash
+]
+
 { #category : 'tests - mouse events' }
 DSSpyInstrumenterTest >> testInstrumentMouseEnterWindow [
 
@@ -715,7 +715,7 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorPrintIt [
 	record := self registry first.	
 	
 	self assert: record class identicalTo: DSPrintItRecord.	
-	self assert: record selectedString equals: '41+1'
+	self assert: record selectedString equals: '''41+1'''
 ]
 
 { #category : 'tests - debugger' }
@@ -724,6 +724,19 @@ DSSpyInstrumenterTest >> testInstrumentRunTo [
 	self assertInstrumentDebuggerCommandNamed: 'Run to'
 ]
 
+{ #category : 'tests - browsers' }
+DSSpyInstrumenterTest >> testInstrumentSendersAction [
+	
+	browser := ClyQueryBrowserMorph on: ClyNavigationEnvironment currentImage.  
+	browser showResultOf: (ClyMessageSendersQuery of: #testInstrumentBrowseAction).
+	
+	self assert: self registry size equals: 1.
+	
+	record := self registry first.
+	self assert: record class identicalTo: DSSendersRecord.
+	self assert: record windowId equals: browser window hash
+]
+
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentSpCodeDebugIt [
 
diff --git a/DebuggingSpy/DSClipboardActionRecord.class.st b/DebuggingSpy/DSClipboardActionRecord.class.st
index a7c4447..eca4d7e 100644
--- a/DebuggingSpy/DSClipboardActionRecord.class.st
+++ b/DebuggingSpy/DSClipboardActionRecord.class.st
@@ -42,9 +42,6 @@ DSClipboardActionRecord >> editorClassName: anObject [
 { #category : 'actions api' }
 DSClipboardActionRecord >> record: anEditor [
 
-	clipboardText := DSSpy recordClipboardContent
-		                 ifTrue: [ anEditor selection asString ]
-		                 ifFalse: [ 'RecordClipboarContent disabled' ].
 	windowId := anEditor textArea window hash.
 	editorClassName := anEditor class name
 ]
diff --git a/DebuggingSpy/DSClipboardCopyRecord.class.st b/DebuggingSpy/DSClipboardCopyRecord.class.st
index 8d7bf48..a68009f 100644
--- a/DebuggingSpy/DSClipboardCopyRecord.class.st
+++ b/DebuggingSpy/DSClipboardCopyRecord.class.st
@@ -14,3 +14,13 @@ DSClipboardCopyRecord >> eventName [
 
 	^ 'Clipboard Copy'
 ]
+
+{ #category : 'actions api' }
+DSClipboardCopyRecord >> record: anEditor [
+
+	clipboardText := DSSpy recordClipboardContent
+		                 ifTrue: [ anEditor selection asString ]
+		                 ifFalse: [ 'RecordClipboarContent disabled' ].
+
+	super record: anEditor
+]
diff --git a/DebuggingSpy/DSClipboardPasteRecord.class.st b/DebuggingSpy/DSClipboardPasteRecord.class.st
index dfbb45b..2ac388b 100644
--- a/DebuggingSpy/DSClipboardPasteRecord.class.st
+++ b/DebuggingSpy/DSClipboardPasteRecord.class.st
@@ -14,3 +14,13 @@ DSClipboardPasteRecord >> eventName [
 
 	^ 'Clipboard Paste'
 ]
+
+{ #category : 'actions api' }
+DSClipboardPasteRecord >> record: anEditor [
+
+	clipboardText := DSSpy recordClipboardContent
+		                 ifTrue: [ Clipboard clipboardText ]
+		                 ifFalse: [ 'RecordClipboarContent disabled' ].
+
+	super record: anEditor
+]
diff --git a/DebuggingSpy/StObjectContextPresenter.extension.st b/DebuggingSpy/StObjectContextPresenter.extension.st
new file mode 100644
index 0000000..2176d35
--- /dev/null
+++ b/DebuggingSpy/StObjectContextPresenter.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'StObjectContextPresenter' }
+
+{ #category : '*DebuggingSpy' }
+StObjectContextPresenter >> recordSelectedString [ 
+
+	^ evaluator text 
+]

From 053a62b6d4a627b36b9c18c4c45ea94a68686241 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 12 Jan 2026 15:57:56 +0100
Subject: [PATCH 30/49] refactor: restore exceptions instrumentation

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 27 +++++++++++--------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 96bd12a..3225d18 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -82,14 +82,9 @@ DSSpyInstrumenter >> instrumentDoItAndGo [
 
 { #category : 'debugpoints  ' }
 DSSpyInstrumenter >> instrumentExceptionSignalling [
+	"Instruments exception (except halt)"
 
-	Exception compile: 'raiseUnhandledError
-	"No one has handled this error, but now give them a chance to decide how to debug it.  If none handle this either then open debugger (see UnhandedError>>#defaultAction)"
-
-	self class = Halt ifFalse:[[	DSUnhandledExceptionRecord for:  self] 
-		on: Error 
-		do:[:err| DSSpy log: #ERROR key: self class name asSymbol ]].
-	^ UnhandledError signalForException: self'
+	Exception link: DSUnhandledExceptionRecord link toAST: (Exception >> #raiseUnhandledError) ast.
 ]
 
 { #category : 'system' }
@@ -176,20 +171,21 @@ DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> instrumentSystem [
 	"Instrument every thing in the system, feel free to comment things you don't want to record"
-	
-	"Start debugging session"
-	DSSpy recordingSession: true.
 
+	"Start debugging session"
+	DSSpy recordingSession: true. 
+	
 	"Listen to announcements"
 	self listenToWindowEvents.
 	self listenToMethodChanges.
-	self listenToDebugPointChanges.
+	self listenToDebugPointChanges. 
 	
 	"Instruments events/user's actions"
 	self logClipbardActions.
 	self logMouseEvents.
-	self logCodeInteractions. 
-	self logBrowsingActions "self logDebuggerInteraction."
+	self logCodeInteractions.
+	self logBrowsingActions.
+	self logDebuggerInteractions
 ]
 
 { #category : 'debugpoints  ' }
@@ -250,8 +246,9 @@ DSSpyInstrumenter >> logCodeInteractions [
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logDebuggerInteractions [
 	"Instruments the Debugger and the Sindarin Debugger"
-	
-	self instrumentSindarinDebuggerCommands
+
+	"self instrumentSindarinDebuggerCommands."
+	self instrumentExceptionSignalling
 ]
 
 { #category : 'system-instrumentation' }

From c397667b9462790425a893efa42c685127c9cfa1 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 12 Jan 2026 16:53:44 +0100
Subject: [PATCH 31/49] fix: complete instrumentations

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 3225d18..06e1e13 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -80,7 +80,7 @@ DSSpyInstrumenter >> instrumentDoItAndGo [
 	StPlaygroundPagePresenter link: DSDoItAndGoRecord link toAST: (StPlaygroundPagePresenter >> #doEvaluateAndGo) ast
 ]
 
-{ #category : 'debugpoints  ' }
+{ #category : 'debugger' }
 DSSpyInstrumenter >> instrumentExceptionSignalling [
 	"Instruments exception (except halt)"
 
@@ -92,6 +92,8 @@ DSSpyInstrumenter >> instrumentImplementorsActions [
 	"Instruments actions to show implementors of a method"
 
 	ClyShowMessageImplementorCommand link: DSImplementorsRecord link toAST: (ClyShowMessageImplementorCommand >> #execute) ast.
+	ClyTextEditor link: DSImplementorsRecord link toAST: (ClyTextEditor>>#implementorsOf:) ast.
+	RubSmalltalkEditor link: DSImplementorsRecord link toAST: (RubSmalltalkEditor >> #implementorsOf:) ast.
 	SpBrowseImplementorsCommand link: DSImplementorsRecord link toAST: (SpBrowseImplementorsCommand >> #execute) ast
 ]
 
@@ -137,6 +139,8 @@ DSSpyInstrumenter >> instrumentSendersActions [
 	"Instruments actions to show senders of a method or class"
 
 	ClyShowMessageSenderCommand link: DSSendersRecord link toAST: (ClyShowMessageSenderCommand >> #execute) ast.
+	ClyTextEditor link: DSSendersRecord link toAST: (ClyTextEditor>>#sendersOf:) ast.
+	RubSmalltalkEditor link: DSImplementorsRecord link toAST: (RubSmalltalkEditor >> #sendersOf:) ast.
 	SpBrowseSendersCommand link: DSSendersRecord link toAST: (SpBrowseSendersCommand >> #execute) ast
 ]
 

From 059984fa3a5b2fcdacdf43eac512f93d28116397 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Tue, 13 Jan 2026 17:20:21 +0100
Subject: [PATCH 32/49] fix: test on implementors

---
 .../DSSpyInstrumenterTest.class.st            | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index a905951..1ceb3f9 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -279,7 +279,7 @@ DSSpyInstrumenterTest >> registry [
 ]
 
 { #category : 'helpers' }
-DSSpyInstrumenterTest >> rubTextEditor [
+DSSpyInstrumenterTest >> rubSmalltalkEditor [
 
 	| editor textArea |
 	editor := RubSmalltalkEditor forTextArea:
@@ -570,15 +570,16 @@ DSSpyInstrumenterTest >> testInstrumentHaltHitsInBlock [
 
 { #category : 'tests - browsers' }
 DSSpyInstrumenterTest >> testInstrumentImplementorsAction [
-	
-	browser := ClyQueryBrowserMorph on: ClyNavigationEnvironment currentImage.  
-	browser showResultOf: (ClyMessageImplementorsQuery of: #testInstrumentBrowseAction).
-	
-	self assert: self registry size equals: 1.
-	
+
+	| rubEditor |
+	rubEditor := self rubSmalltalkEditor.
+	rubEditor sendersOf: #testInstrumentHaltHits.
+
+	self assert: self registry size equals: 2.
+
 	record := self registry first.
 	self assert: record class identicalTo: DSImplementorsRecord.
-	self assert: record windowId equals: browser window hash
+	self assert: record windowId equals: rubEditor hash
 ]
 
 { #category : 'tests - mouse events' }
@@ -633,7 +634,7 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorCopySelection [
 	registerClipboardText := DSSpy recordClipboardContent.
 	DSSpy recordClipboardContent: true.
 	[ 
-	rubEditor := self rubTextEditor.
+	rubEditor := self rubSmalltalkEditor.
 	rubEditor selectAll.
 	rubEditor copySelection.
 
@@ -655,7 +656,7 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorDebugIt [
 
 	| rubEditor |
 	
-	rubEditor := self rubTextEditor.
+	rubEditor := self rubSmalltalkEditor.
 	rubEditor selectAll.
 	self runWithoutOpeningDebugger: [rubEditor debugIt].
 
@@ -671,7 +672,7 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorDoIt [
 
 	| rubEditor |
 	
-	rubEditor := self rubTextEditor.
+	rubEditor := self rubSmalltalkEditor.
 	rubEditor selectAll.
 	rubEditor doIt.
 
@@ -690,7 +691,7 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorPaste [
 	DSSpy recordClipboardContent: true.
 
 	[
-		rubEditor := self rubTextEditor.
+		rubEditor := self rubSmalltalkEditor.
 		rubEditor textArea beForSmalltalkCode.
 
 		Clipboard clipboardText: 'copiedText'.
@@ -708,7 +709,7 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorPrintIt [
 
 	| rubEditor |
 
-	rubEditor := self rubTextEditor.
+	rubEditor := self rubSmalltalkEditor.
 	rubEditor printIt.
 
 	self assert: self registry size equals: 1.

From 1fbadca8b222c8ea20cf54f24fce9ed2943a9e30 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Wed, 14 Jan 2026 15:03:12 +0100
Subject: [PATCH 33/49] feat(DSSpyInstrumenterTest): add closing of windows
 used for testing

---
 .../DSSpyInstrumenterTest.class.st            | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index 1ceb3f9..a4f5735 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -6,7 +6,8 @@ Class {
 		'record',
 		'debugger',
 		'browser',
-		'recordSourceCode'
+		'recordSourceCode',
+		'intialWindows'
 	],
 	#category : 'DebuggingSpy-Tests-Tests - model',
 	#package : 'DebuggingSpy-Tests',
@@ -107,6 +108,15 @@ DSSpyInstrumenterTest >> assertStepActionRecordForCommandNamed: debuggerCommandN
 	self assert: record receiverClass equals: debugger currentContext receiver class name
 ]
 
+{ #category : 'running' }
+DSSpyInstrumenterTest >> closeOpenedWindows [
+
+	| currentWindows windowsToClose |
+	currentWindows := self currentWorld windowsSatisfying: [ :window | window isInWorld ].
+	windowsToClose := currentWindows reject: [ :window | intialWindows includes: window ].
+	windowsToClose collect: [ :window | window close ]
+]
+
 { #category : 'helpers' }
 DSSpyInstrumenterTest >> clyTextEditor [
 
@@ -345,7 +355,8 @@ DSSpyInstrumenterTest >> setUp [
 	DSSpyInstrumenter instrumentSystem.
 	recordSourceCode := DSSpy recordSourceCode.
 	DSSpy recordSourceCode: true.
-	DSRecordRegistry current reset
+	DSRecordRegistry current reset.
+	intialWindows := self currentWorld windowsSatisfying: [ :window | window isInWorld ]
 ]
 
 { #category : 'helpers' }
@@ -396,12 +407,14 @@ DSSpyInstrumenterTest >> tableItemsListFromInspector: anInspector [
 
 { #category : 'running' }
 DSSpyInstrumenterTest >> tearDown [
-	
+
+	self closeOpenedWindows.
+
 	DSSpy recordSourceCode: recordSourceCode.
 	DSRecordRegistry current reset.
-	
+
 	DSSpyInstrumenter stopInstrumentation.
-	
+
 	super tearDown
 ]
 
@@ -728,14 +741,15 @@ DSSpyInstrumenterTest >> testInstrumentRunTo [
 { #category : 'tests - browsers' }
 DSSpyInstrumenterTest >> testInstrumentSendersAction [
 	
-	browser := ClyQueryBrowserMorph on: ClyNavigationEnvironment currentImage.  
-	browser showResultOf: (ClyMessageSendersQuery of: #testInstrumentBrowseAction).
-	
-	self assert: self registry size equals: 1.
-	
+	| rubEditor |
+	rubEditor := self rubSmalltalkEditor.
+	rubEditor implementorsOf: #testInstrumentHaltHits.
+
+	self assert: self registry size equals: 2.
+
 	record := self registry first.
-	self assert: record class identicalTo: DSSendersRecord.
-	self assert: record windowId equals: browser window hash
+	self assert: record class identicalTo: DSImplementorsRecord.
+	self assert: record windowId equals: rubEditor hash
 ]
 
 { #category : 'tests - interactions' }

From 89a92c2e8e557da85fda3eac009933b95bd58592 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Wed, 14 Jan 2026 16:36:06 +0100
Subject: [PATCH 34/49] fix: test names

---
 DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index a4f5735..cf536e7 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -586,7 +586,7 @@ DSSpyInstrumenterTest >> testInstrumentImplementorsAction [
 
 	| rubEditor |
 	rubEditor := self rubSmalltalkEditor.
-	rubEditor sendersOf: #testInstrumentHaltHits.
+	rubEditor implementorsOf: #testInstrumentHaltHits.
 
 	self assert: self registry size equals: 2.
 
@@ -743,7 +743,7 @@ DSSpyInstrumenterTest >> testInstrumentSendersAction [
 	
 	| rubEditor |
 	rubEditor := self rubSmalltalkEditor.
-	rubEditor implementorsOf: #testInstrumentHaltHits.
+	rubEditor sendersOf: #testInstrumentHaltHits.
 
 	self assert: self registry size equals: 2.
 

From 88bd56c38efa9fe0ce51adaba45d408b4fc2bed9 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Wed, 14 Jan 2026 17:03:10 +0100
Subject: [PATCH 35/49] test(Instrumenter): add test for ClyTextEditor

---
 .../DSSpyInstrumenterTest.class.st            | 80 +++++++++++++++++++
 DebuggingSpy/DSSpyInstrumenter.class.st       |  1 +
 2 files changed, 81 insertions(+)

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index cf536e7..cdcaedc 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -433,6 +433,51 @@ DSSpyInstrumenterTest >> testInstrumentBrowseAction [
 	self assert: record windowId equals: nil identityHash "At this stage, the window browser is not built"
 ]
 
+{ #category : 'tests - interactions' }
+DSSpyInstrumenterTest >> testInstrumentClyTextEditorDebugIt [
+
+	| clyEditor |
+
+	clyEditor := self clyTextEditor.
+	clyEditor debugIt.
+
+	self assert: self registry size equals: 1.
+	record := self registry first.	
+	
+	self assert: record class identicalTo: DSDebugItRecord.	
+	self assert: record selectedString equals: '41+1'
+]
+
+{ #category : 'tests - interactions' }
+DSSpyInstrumenterTest >> testInstrumentClyTextEditorDoIt [
+
+	| clyEditor |
+
+	clyEditor := self clyTextEditor.
+	clyEditor doIt.
+
+	self assert: self registry size equals: 1.
+	record := self registry first.	
+	
+	self assert: record class identicalTo: DSDoItRecord.	
+	self assert: record selectedString equals: '41+1'
+]
+
+{ #category : 'tests - interactions' }
+DSSpyInstrumenterTest >> testInstrumentClyTextEditorInspectIt [
+
+	| clyEditor |
+
+	clyEditor := self clyTextEditor.
+	clyEditor inspectIt.
+
+	self assert: self registry size equals: 2.
+	record := self registry first.	
+	
+	self assert: record class identicalTo: DSInspectItRecord.	
+	self assert: record selectedString equals: '41+1'
+]
+
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentClyTextEditorPrintIt [
 
@@ -696,6 +741,22 @@ DSSpyInstrumenterTest >> testInstrumentRubEditorDoIt [
 	self assert: record selectedString equals: '41+1'printString
 ]
 
+{ #category : 'tests - interactions' }
+DSSpyInstrumenterTest >> testInstrumentRubEditorInspectIt [
+
+	| rubEditor |
+	
+	rubEditor := self rubSmalltalkEditor.
+	rubEditor selectAll.
+	rubEditor inspectIt.
+
+	self assert: self registry size equals: 2.
+	record := self registry first.	
+	
+	self assert: record class identicalTo: DSInspectItRecord.	
+	self assert: record selectedString equals: '41+1'printString
+]
+
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentRubEditorPaste [
 
@@ -831,6 +892,25 @@ DSSpyInstrumenterTest >> testInstrumentSpCodeDoItAndGoForPlayground [
 	self assert: record selectedString equals: '4+2'
 ]
 
+{ #category : 'tests - interactions' }
+DSSpyInstrumenterTest >> testInstrumentSpCodeInspectIt [
+
+	| codePresenter inspectItCommand |
+
+	codePresenter := self codePresenterFrom: self playgroundPagePresenter.
+
+	inspectItCommand := SpCodeInspectItCommand new.
+	inspectItCommand context: codePresenter.
+	codePresenter rawSelection: (1 to: 4).
+	inspectItCommand execute.
+
+	self assert: self registry size equals: 2.
+	record := self registry first.
+
+	self assert: record class identicalTo: DSInspectItRecord .
+	self assert: record selectedString equals: '41+1'
+]
+
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentSpCodePrintIt [
 
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 06e1e13..166aaeb 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -244,6 +244,7 @@ DSSpyInstrumenter >> logCodeInteractions [
 	self instrumentPrintIt.
 	self instrumentDebugIt.
 	self instrumentDoIt.
+	self instrumentInspectIt.
 	self instrumentDoItAndGo
 ]
 

From 515df8eebb6598539f8230240f9315595accc46a Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Thu, 15 Jan 2026 16:59:56 +0100
Subject: [PATCH 36/49] fix: rename and delete methods

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 166aaeb..4222b6a 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -41,13 +41,6 @@ DSSpyInstrumenter >> instrumentBrowseActions [
 	SpBrowseClassCommand link: DSBrowseRecord link toAST: (SpBrowseClassCommand >> #execute) ast
 ]
 
-{ #category : 'system' }
-DSSpyInstrumenter >> instrumentClyFullBrowserOpening [
-	"Instruments the browser on opening"
-
-	ClyFullBrowserMorph link: DSFullBrowseRecord link toAST: (ClyFullBrowserMorph >> #newWindowTitle) ast
-]
-
 { #category : 'system' }
 DSSpyInstrumenter >> instrumentCopySelection [
 	"Instruments the action of copying to clipboard"
@@ -185,11 +178,11 @@ DSSpyInstrumenter >> instrumentSystem [
 	self listenToDebugPointChanges. 
 	
 	"Instruments events/user's actions"
-	self logClipbardActions.
+	self logClipboardActions.
 	self logMouseEvents.
 	self logCodeInteractions.
 	self logBrowsingActions.
-	self logDebuggerInteractions
+	"self logDebuggerInteractions"
 ]
 
 { #category : 'debugpoints  ' }
@@ -230,7 +223,7 @@ DSSpyInstrumenter >> logBrowsingActions [
 ]
 
 { #category : 'system-instrumentation' }
-DSSpyInstrumenter >> logClipbardActions [
+DSSpyInstrumenter >> logClipboardActions [
 	"Instruments commands linked to clipboard"
 
 	self instrumentCopySelection.

From 4251efb9e91e5298fd40137f94a0d27722ccaa50 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Fri, 16 Jan 2026 16:42:59 +0100
Subject: [PATCH 37/49] fix: fix tests for browse in spec

---
 .../DSSpyInstrumenterTest.class.st            | 19 +++++++++++++++++++
 DebuggingSpy/DSAbstractBrowserRecord.class.st |  6 ++++++
 DebuggingSpy/SpToolCommand.extension.st       |  7 +++++++
 3 files changed, 32 insertions(+)
 create mode 100644 DebuggingSpy/SpToolCommand.extension.st

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index cdcaedc..668905e 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -813,6 +813,25 @@ DSSpyInstrumenterTest >> testInstrumentSendersAction [
 	self assert: record windowId equals: rubEditor hash
 ]
 
+{ #category : 'tests - interactions' }
+DSSpyInstrumenterTest >> testInstrumentSpCodeBrowse [
+
+	| codePresenter browseCommand |
+
+	codePresenter := self codePresenterFrom: self playgroundPagePresenter.
+
+	browseCommand := SpBrowseClassCommand new.
+	browseCommand context: codePresenter.
+	codePresenter rawSelection: (1 to: 4).
+	browseCommand execute.
+
+	self assert: self registry size equals: 2.
+	record := self registry first.
+
+	self assert: record class identicalTo: DSBrowseRecord.
+	self assert: record windowId equals: codePresenter window identityHash
+]
+
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentSpCodeDebugIt [
 
diff --git a/DebuggingSpy/DSAbstractBrowserRecord.class.st b/DebuggingSpy/DSAbstractBrowserRecord.class.st
index ede14cd..7a08eae 100644
--- a/DebuggingSpy/DSAbstractBrowserRecord.class.st
+++ b/DebuggingSpy/DSAbstractBrowserRecord.class.st
@@ -8,3 +8,9 @@ Class {
 	#package : 'DebuggingSpy',
 	#tag : 'Records'
 }
+
+{ #category : 'actions api' }
+DSAbstractBrowserRecord >> record: aCommandObject [
+
+	windowId := aCommandObject recordWindow identityHash 
+]
diff --git a/DebuggingSpy/SpToolCommand.extension.st b/DebuggingSpy/SpToolCommand.extension.st
new file mode 100644
index 0000000..66f537e
--- /dev/null
+++ b/DebuggingSpy/SpToolCommand.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'SpToolCommand' }
+
+{ #category : '*DebuggingSpy' }
+SpToolCommand >> recordWindow [
+
+	^ self context window
+]

From a1b2584c49e1c1c0787ba58ac0befdb18c0d2594 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 19 Jan 2026 10:20:37 +0100
Subject: [PATCH 38/49] test(DSSpyInstrumenterTest): add tests for implementors
 and senders

---
 .../DSSpyInstrumenterTest.class.st            | 89 ++++++++++++-------
 1 file changed, 59 insertions(+), 30 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index 668905e..36c7643 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -149,6 +149,22 @@ DSSpyInstrumenterTest >> codePresenterFrom: aPlaygroundPagePresenter [
 	^ codePresenter
 ]
 
+{ #category : 'helpers' }
+DSSpyInstrumenterTest >> codePresenterFrom: aPlaygroundPagePresenter withText: aText [
+
+	| codePresenter adapter |
+	codePresenter := (aPlaygroundPagePresenter class slotNamed: #text) 
+		                 read: aPlaygroundPagePresenter.
+	self setDummyWindowPresenter: aPlaygroundPagePresenter window forPresenter: codePresenter.
+	codePresenter text: aText.
+	
+	adapter := SpMorphicCodeAdapter new.
+	adapter adapt: codePresenter.	
+	codePresenter adapter: adapter.
+	codePresenter adapter buildWidget.
+	^ codePresenter
+]
+
 { #category : 'helpers' }
 DSSpyInstrumenterTest >> debuggerForTesting [
 
@@ -418,21 +434,6 @@ DSSpyInstrumenterTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : 'tests - browsers' }
-DSSpyInstrumenterTest >> testInstrumentBrowseAction [
-
-	browser := ClyFullBrowserMorph on: ClyNavigationEnvironment currentImage.
-	browser prepareInitialStateBy: [ :b | b selectMethod: Object >> #yourself ].
-	self setDummyWindowForMorph: browser.
-	browser newWindowTitle.
-
-	self assert: self registry size equals: 1.
-
-	record := self registry first.
-	self assert: record class identicalTo: DSBrowseRecord.
-	self assert: record windowId equals: nil identityHash "At this stage, the window browser is not built"
-]
-
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentClyTextEditorDebugIt [
 
@@ -626,20 +627,6 @@ DSSpyInstrumenterTest >> testInstrumentHaltHitsInBlock [
 	self assert: record sourceCodeInterval last equals: executedMethod ast statements first receiver statements first stop
 ]
 
-{ #category : 'tests - browsers' }
-DSSpyInstrumenterTest >> testInstrumentImplementorsAction [
-
-	| rubEditor |
-	rubEditor := self rubSmalltalkEditor.
-	rubEditor implementorsOf: #testInstrumentHaltHits.
-
-	self assert: self registry size equals: 2.
-
-	record := self registry first.
-	self assert: record class identicalTo: DSImplementorsRecord.
-	self assert: record windowId equals: rubEditor hash
-]
-
 { #category : 'tests - mouse events' }
 DSSpyInstrumenterTest >> testInstrumentMouseEnterWindow [
 
@@ -813,7 +800,7 @@ DSSpyInstrumenterTest >> testInstrumentSendersAction [
 	self assert: record windowId equals: rubEditor hash
 ]
 
-{ #category : 'tests - interactions' }
+{ #category : 'tests - browsers' }
 DSSpyInstrumenterTest >> testInstrumentSpCodeBrowse [
 
 	| codePresenter browseCommand |
@@ -911,6 +898,27 @@ DSSpyInstrumenterTest >> testInstrumentSpCodeDoItAndGoForPlayground [
 	self assert: record selectedString equals: '4+2'
 ]
 
+{ #category : 'tests - browsers' }
+DSSpyInstrumenterTest >> testInstrumentSpCodeImplementors [
+
+	| codePresenter browseCommand |
+	codePresenter := self codePresenterFrom: self playgroundPagePresenter withText: 'execute'.
+
+	browseCommand := SpBrowseImplementorsCommand new.
+	browseCommand context: codePresenter.
+	codePresenter selectionInterval: (1 to: 7).
+	browseCommand execute.
+
+	self assert: self registry size equals: 2.
+
+	record := self registry first.
+	self assert: record class identicalTo: DSImplementorsRecord.
+	self assert: record windowId equals: codePresenter window identityHash.
+
+	record := self registry second.
+	self assert: record class identicalTo: DSWindowOpenedRecord
+]
+
 { #category : 'tests - interactions' }
 DSSpyInstrumenterTest >> testInstrumentSpCodeInspectIt [
 
@@ -947,6 +955,27 @@ DSSpyInstrumenterTest >> testInstrumentSpCodePrintIt [
 	self assert: record selectedString equals: '41+1'
 ]
 
+{ #category : 'tests - browsers' }
+DSSpyInstrumenterTest >> testInstrumentSpCodeSenders [
+
+	| codePresenter browseCommand |
+	codePresenter := self codePresenterFrom: self playgroundPagePresenter withText: 'execute'.
+
+	browseCommand := SpBrowseSendersCommand new.
+	browseCommand context: codePresenter.
+	codePresenter selectionInterval: (1 to: 7).
+	browseCommand execute.
+
+	self assert: self registry size equals: 2.
+
+	record := self registry first.
+	self assert: record class identicalTo: DSSendersRecord.
+	self assert: record windowId equals: codePresenter window identityHash.
+
+	record := self registry second.
+	self assert: record class identicalTo: DSWindowOpenedRecord
+]
+
 { #category : 'tests - debugger' }
 DSSpyInstrumenterTest >> testInstrumentStepInto [
 

From 2422e5808e1c6aeba7f06e529b8812d36fcdae67 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 19 Jan 2026 12:04:22 +0100
Subject: [PATCH 39/49] refactor: finish fixing tests and remove old tests

---
 .../DSSpyInstrumenterTest.class.st            | 49 ++---------
 DebuggingSpy/DSAbstractBrowserRecord.class.st |  2 +-
 DebuggingSpy/DSAbstractEventRecord.class.st   |  8 +-
 DebuggingSpy/DSBrowseContextRecord.class.st   | 70 ----------------
 DebuggingSpy/DSClipboardActionRecord.class.st |  2 +-
 DebuggingSpy/DSDebuggerActionRecord.class.st  | 81 -------------------
 DebuggingSpy/DSDebuggerOpeningRecord.class.st | 66 ---------------
 DebuggingSpy/DSDebuggerRecord.class.st        | 64 ---------------
 DebuggingSpy/DSFullBrowseRecord.class.st      | 64 ---------------
 DebuggingSpy/DSMouseEventRecord.class.st      |  2 +-
 DebuggingSpy/DSSpyInstrumenter.class.st       | 40 +--------
 DebuggingSpy/RubTextEditor.extension.st       |  8 ++
 DebuggingSpy/StDebugger.extension.st          | 25 ++++++
 13 files changed, 48 insertions(+), 433 deletions(-)
 delete mode 100644 DebuggingSpy/DSBrowseContextRecord.class.st
 delete mode 100644 DebuggingSpy/DSDebuggerActionRecord.class.st
 delete mode 100644 DebuggingSpy/DSDebuggerOpeningRecord.class.st
 delete mode 100644 DebuggingSpy/DSDebuggerRecord.class.st
 delete mode 100644 DebuggingSpy/DSFullBrowseRecord.class.st
 create mode 100644 DebuggingSpy/RubTextEditor.extension.st

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index 36c7643..ebdd56f 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -499,52 +499,17 @@ DSSpyInstrumenterTest >> testInstrumentDebuggerOpening [
 	
 	debugger := self debuggerForTestingWithWindow.			
 	debugger initializeWindow: debugger window.
+	debugger open.
 	
-	self assert: self registry size equals: 1.
-	record := self registry first.
-	self assert: record class identicalTo: DSDebuggerOpeningRecord.
-	self assert: record windowId equals: debugger window window hash.
-	self assert: record debuggerId equals: debugger hash.
-	self assert: record contextName equals: debugger currentContext method printString.
-	self assert: record sourceNodeClass equals: debugger currentContext  sourceNodeExecuted class name.
-	self assert: record sourceNodeCode equals: debugger currentContext  sourceNodeExecuted sourceCode
-	
-]
-
-{ #category : 'tests - debugger' }
-DSSpyInstrumenterTest >> testInstrumentDebuggerStack [
-	|selectedItem|
-	
-	debugger := self debuggerForTestingWithWindow.		
 	self assert: self registry size equals: 2.
 	
-	"No idea why: the stack seems to be refreshed 3 times at opening.
-	This generates three identical events:"
-	self assert: self registry first windowId equals: self registry second windowId. 
-	self assert: self registry first receiver equals: self registry second receiver.
-	self assert: self registry first selector equals: self registry second selector.
-	self assert: self registry first contextName equals: self registry second contextName.
-	self assert: self registry first sourceNodeClass equals: self registry second sourceNodeClass.
-	self assert: self registry first sourceNodeCode equals: self registry second sourceNodeCode.
-	"self assert: self registry first windowId equals: self registry third windowId. 
-	self assert: self registry first receiver equals: self registry third receiver.
-	self assert: self registry first selector equals: self registry third selector.
-	self assert: self registry first contextName equals: self registry third contextName.
-	self assert: self registry first sourceNodeClass equals: self registry third sourceNodeClass.
-	self assert: self registry first sourceNodeCode equals: self registry third sourceNodeCode."
-	
-	debugger stackTable selectItem: debugger stackTable items second.
-	self assert: self registry size equals: 3.
+	record := self registry first.
+	self assert: record class identicalTo: DSHaltHitRecord.
 	
-	record := self registry third.
-	selectedItem := debugger stackTable items second.
-	self assert: record class identicalTo: DSBrowseContextRecord.
+	record := self registry second.
+	self assert: record class identicalTo: DSWindowOpenedRecord.
 	self assert: record windowId equals: debugger window window hash.
-	self assert: record contextName equals: selectedItem method printString.
-	self assert: record sourceNodeClass equals: selectedItem sourceNodeExecuted class name.
-	self assert: record sourceNodeCode equals: selectedItem sourceNodeExecuted sourceCode.
-	self assert: record receiver equals: selectedItem receiver printString.
-	self assert: record selector equals: selectedItem selector
+	
 ]
 
 { #category : 'tests - halts' }
@@ -797,7 +762,7 @@ DSSpyInstrumenterTest >> testInstrumentSendersAction [
 
 	record := self registry first.
 	self assert: record class identicalTo: DSImplementorsRecord.
-	self assert: record windowId equals: rubEditor hash
+	self assert: record windowId equals: nil
 ]
 
 { #category : 'tests - browsers' }
diff --git a/DebuggingSpy/DSAbstractBrowserRecord.class.st b/DebuggingSpy/DSAbstractBrowserRecord.class.st
index 7a08eae..323bd07 100644
--- a/DebuggingSpy/DSAbstractBrowserRecord.class.st
+++ b/DebuggingSpy/DSAbstractBrowserRecord.class.st
@@ -12,5 +12,5 @@ Class {
 { #category : 'actions api' }
 DSAbstractBrowserRecord >> record: aCommandObject [
 
-	windowId := aCommandObject recordWindow identityHash 
+	self windowId: aCommandObject recordWindow identityHash 
 ]
diff --git a/DebuggingSpy/DSAbstractEventRecord.class.st b/DebuggingSpy/DSAbstractEventRecord.class.st
index f0a59e1..0c7ecf5 100644
--- a/DebuggingSpy/DSAbstractEventRecord.class.st
+++ b/DebuggingSpy/DSAbstractEventRecord.class.st
@@ -101,9 +101,7 @@ DSAbstractEventRecord >> realRecord [
 { #category : 'actions api' }
 DSAbstractEventRecord >> record: aWindow [
 
-	windowId := aWindow identityHash.
-
-	windowId = nil identityHash ifTrue: [ windowId := nil ]
+	self windowId: aWindow identityHash.
 ]
 
 { #category : 'API-history' }
@@ -124,9 +122,9 @@ DSAbstractEventRecord >> windowId [
 ]
 
 { #category : 'accessing' }
-DSAbstractEventRecord >> windowId: anObject [
+DSAbstractEventRecord >> windowId: aWindowId [
 
-	windowId := anObject
+	windowId := aWindowId = nil identityHash ifTrue: [ nil ] ifFalse: [ aWindowId ]
 ]
 
 { #category : 'accessing' }
diff --git a/DebuggingSpy/DSBrowseContextRecord.class.st b/DebuggingSpy/DSBrowseContextRecord.class.st
deleted file mode 100644
index e3c9fe5..0000000
--- a/DebuggingSpy/DSBrowseContextRecord.class.st
+++ /dev/null
@@ -1,70 +0,0 @@
-"
-I record printed representation of browsed contexts in the debugger:
-- the receiver
-- the selector
-"
-Class {
-	#name : 'DSBrowseContextRecord',
-	#superclass : 'DSDebuggerRecord',
-	#instVars : [
-		'receiver',
-		'selector'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSBrowseContextRecord >> context [
-	^'Browsing'
-]
-
-{ #category : 'accessing' }
-DSBrowseContextRecord >> eventName [
-	^'Browse context'
-]
-
-{ #category : 'accessing - structure variables' }
-DSBrowseContextRecord >> glyph [
-	^'Br'
-]
-
-{ #category : 'accessing - structure variables' }
-DSBrowseContextRecord >> glyphColor [
-
-	^ Color orange
-]
-
-{ #category : 'accessing' }
-DSBrowseContextRecord >> receiver [
-
-	^ receiver
-]
-
-{ #category : 'accessing' }
-DSBrowseContextRecord >> receiver: anObject [
-
-	receiver := anObject
-]
-
-{ #category : 'actions api' }
-DSBrowseContextRecord >> record: aContextAndWindow [ 
-	|ctx|
-	super record: aContextAndWindow.
-	ctx := aContextAndWindow first.
-	receiver := ctx receiver printString.
-	selector := ctx selector
-]
-
-{ #category : 'accessing' }
-DSBrowseContextRecord >> selector [
-
-	^ selector
-]
-
-{ #category : 'accessing' }
-DSBrowseContextRecord >> selector: anObject [
-
-	selector := anObject
-]
diff --git a/DebuggingSpy/DSClipboardActionRecord.class.st b/DebuggingSpy/DSClipboardActionRecord.class.st
index eca4d7e..e7c0fab 100644
--- a/DebuggingSpy/DSClipboardActionRecord.class.st
+++ b/DebuggingSpy/DSClipboardActionRecord.class.st
@@ -42,6 +42,6 @@ DSClipboardActionRecord >> editorClassName: anObject [
 { #category : 'actions api' }
 DSClipboardActionRecord >> record: anEditor [
 
-	windowId := anEditor textArea window hash.
+	self windowId: anEditor textArea window hash.
 	editorClassName := anEditor class name
 ]
diff --git a/DebuggingSpy/DSDebuggerActionRecord.class.st b/DebuggingSpy/DSDebuggerActionRecord.class.st
deleted file mode 100644
index 61da3a8..0000000
--- a/DebuggingSpy/DSDebuggerActionRecord.class.st
+++ /dev/null
@@ -1,81 +0,0 @@
-"
-I record debugger actions such as step, stepOver, etc.
-The name of the action is stored in my event name
-"
-Class {
-	#name : 'DSDebuggerActionRecord',
-	#superclass : 'DSDebuggerRecord',
-	#instVars : [
-		'eventName'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'tests - instance creation' }
-DSDebuggerActionRecord class >> into: aContext [
-
-	^ (self for: aContext)
-		  eventName: 'Into';
-		  yourself
-]
-
-{ #category : 'tests - instance creation' }
-DSDebuggerActionRecord class >> over: aContext [
-
-	^ (self for: aContext)
-		  eventName: 'Over';
-		  yourself
-]
-
-{ #category : 'tests - instance creation' }
-DSDebuggerActionRecord class >> proceed: aContext [
-
-	^ (self for: aContext)
-		  eventName: 'Proceed';
-		  yourself
-]
-
-{ #category : 'tests - instance creation' }
-DSDebuggerActionRecord class >> restart: aContext [
-
-	^ (self for: aContext)
-		  eventName: 'Restart';
-		  yourself
-]
-
-{ #category : 'tests - instance creation' }
-DSDebuggerActionRecord class >> return: aContext [
-
-	^ (self for: aContext)
-		  eventName: 'Return';
-		  yourself
-]
-
-{ #category : 'tests - instance creation' }
-DSDebuggerActionRecord class >> runTo: aContext [
-
-	^ (self for: aContext)
-		  eventName: 'Run to';
-		  yourself
-]
-
-{ #category : 'tests - instance creation' }
-DSDebuggerActionRecord class >> through: aContext [
-
-	^ (self for: aContext)
-		  eventName: 'Through';
-		  yourself
-]
-
-{ #category : 'accessing' }
-DSDebuggerActionRecord >> eventName [
-	^eventName
-]
-
-{ #category : 'accessing' }
-DSDebuggerActionRecord >> eventName: anObject [
-
-	eventName := anObject
-]
diff --git a/DebuggingSpy/DSDebuggerOpeningRecord.class.st b/DebuggingSpy/DSDebuggerOpeningRecord.class.st
deleted file mode 100644
index a7fc182..0000000
--- a/DebuggingSpy/DSDebuggerOpeningRecord.class.st
+++ /dev/null
@@ -1,66 +0,0 @@
-"
-I am generated when a debugger is opened.
-"
-Class {
-	#name : 'DSDebuggerOpeningRecord',
-	#superclass : 'DSDebuggerRecord',
-	#instVars : [
-		'debuggerId'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSDebuggerOpeningRecord >> debuggerId [
-
-	^ debuggerId
-]
-
-{ #category : 'accessing' }
-DSDebuggerOpeningRecord >> debuggerId: anObject [
-
-	debuggerId := anObject
-]
-
-{ #category : 'accessing' }
-DSDebuggerOpeningRecord >> eventName [
-	^'Debugger open'
-]
-
-{ #category : 'actions api' }
-DSDebuggerOpeningRecord >> primarySourcesOfWindowOpenings [
-
-	^ ({
-		   DSDebugPointRecord.
-		   DSAbstractDebugPointEventRecord.
-		   DSHaltHitRecord.
-		   DSUnhandledExceptionRecord } collect: [ :c | c withAllSubclasses ])
-		  flattened
-]
-
-{ #category : 'actions api' }
-DSDebuggerOpeningRecord >> record: aDebugger [
-	debuggerId := aDebugger identityHash.
-	super record: { aDebugger currentContext. aDebugger window window }
-]
-
-{ #category : 'actions api' }
-DSDebuggerOpeningRecord >> secondarySourcesOfWindowOpenings [
-
-	^ ({
-		   DSCodeActionRecord.
-		   DSStepActionRecord } collect: [ :c | c withAllSubclasses ])
-		  flattened
-]
-
-{ #category : 'accessing' }
-DSDebuggerOpeningRecord >> windowName [
-	^contextName
-]
-
-{ #category : 'accessing' }
-DSDebuggerOpeningRecord >> windowType [
-	^'Debugger'
-]
diff --git a/DebuggingSpy/DSDebuggerRecord.class.st b/DebuggingSpy/DSDebuggerRecord.class.st
deleted file mode 100644
index ee6c1d1..0000000
--- a/DebuggingSpy/DSDebuggerRecord.class.st
+++ /dev/null
@@ -1,64 +0,0 @@
-"
-I record debugger events triggered from users' interaction with the debugger.
-I store the browsed debugger context: the executed method and the node that is going to be executed next.
-"
-Class {
-	#name : 'DSDebuggerRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'contextName',
-		'sourceNodeClass',
-		'sourceNodeCode'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSDebuggerRecord >> contextName [
-
-	^ contextName
-]
-
-{ #category : 'accessing' }
-DSDebuggerRecord >> contextName: anObject [
-
-	contextName := anObject
-]
-
-{ #category : 'actions api' }
-DSDebuggerRecord >> record: aContextAndWindow [ 
-	|aContext method sourceNode|
-	super record: aContextAndWindow second.
-	aContext := aContextAndWindow first.
-	method := aContext method.
-	contextName := method isCompiledBlock ifTrue:[method printString] ifFalse:[method name].
-	sourceNode := aContext sourceNodeExecuted.
-	sourceNodeClass := sourceNode class name.
-	sourceNodeCode := sourceNode sourceCode
-]
-
-{ #category : 'accessing' }
-DSDebuggerRecord >> sourceNodeClass [
-
-	^ sourceNodeClass
-]
-
-{ #category : 'accessing' }
-DSDebuggerRecord >> sourceNodeClass: anObject [
-
-	sourceNodeClass := anObject
-]
-
-{ #category : 'accessing' }
-DSDebuggerRecord >> sourceNodeCode [
-
-	^ sourceNodeCode
-]
-
-{ #category : 'accessing' }
-DSDebuggerRecord >> sourceNodeCode: anObject [
-
-	sourceNodeCode := anObject
-]
diff --git a/DebuggingSpy/DSFullBrowseRecord.class.st b/DebuggingSpy/DSFullBrowseRecord.class.st
deleted file mode 100644
index 071b77b..0000000
--- a/DebuggingSpy/DSFullBrowseRecord.class.st
+++ /dev/null
@@ -1,64 +0,0 @@
-"
-I record user browsing code action.
-I store the browsed package, class and method names, and the window id in which it happened.
-Elements are browsed in order package>class>method.
-If one of them is nil, for instance, package>class>nil, it means that the user is browsing the class and possibly looking at its methods, or at the list of classes in the package, or at the packages list.
-
-I have to register names instead of objects, as there are no guarantees that the image that analyzes the record has these package/class/method.
-"
-Class {
-	#name : 'DSFullBrowseRecord',
-	#superclass : 'DSAbstractEventRecord',
-	#instVars : [
-		'methodBrowsed',
-		'packageBrowsed',
-		'classBrowsed'
-	],
-	#category : 'DebuggingSpy-Records',
-	#package : 'DebuggingSpy',
-	#tag : 'Records'
-}
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> classBrowsed [ 
-
-	^ classBrowsed 
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> eventName [
-	^'Full browser opening'
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> methodBrowsed [ 
-
-	^ methodBrowsed 
-]
-
-{ #category : 'accessing' }
-DSFullBrowseRecord >> packageBrowsed [ 
-
-	^ packageBrowsed 
-]
-
-{ #category : 'actions api' }
-DSFullBrowseRecord >> record: aClyFullBrowser [
-
-	super record: aClyFullBrowser window.
-	packageBrowsed := aClyFullBrowser packageSelection isEmpty
-		                  ifTrue: [ '' ]
-		                  ifFalse: [ 
-		                  aClyFullBrowser packageSelection lastSelectedItem
-			                  actualObject name ].
-	classBrowsed := aClyFullBrowser classSelection isEmpty
-		                ifTrue: [ '' ]
-		                ifFalse: [ 
-		                aClyFullBrowser classSelection lastSelectedItem
-			                actualObject name ].
-	methodBrowsed := aClyFullBrowser methodSelection isEmpty
-		                 ifTrue: [ '' ]
-		                 ifFalse: [ 
-		                 aClyFullBrowser methodSelection lastSelectedItem
-			                 actualObject name ].
-]
diff --git a/DebuggingSpy/DSMouseEventRecord.class.st b/DebuggingSpy/DSMouseEventRecord.class.st
index 4ec60aa..5300f4e 100644
--- a/DebuggingSpy/DSMouseEventRecord.class.st
+++ b/DebuggingSpy/DSMouseEventRecord.class.st
@@ -20,7 +20,7 @@ Class {
 DSMouseEventRecord >> record: aWindow [
 
 	| tool |
-	windowId := aWindow identityHash.
+	self windowId: aWindow identityHash.
 
 	tool := DSSpy toolInWindow: aWindow.
 	tool ifNil: [ ^ self ].
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 4222b6a..874b708 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -73,7 +73,7 @@ DSSpyInstrumenter >> instrumentDoItAndGo [
 	StPlaygroundPagePresenter link: DSDoItAndGoRecord link toAST: (StPlaygroundPagePresenter >> #doEvaluateAndGo) ast
 ]
 
-{ #category : 'debugger' }
+{ #category : 'exceptions' }
 DSSpyInstrumenter >> instrumentExceptionSignalling [
 	"Instruments exception (except halt)"
 
@@ -137,34 +137,6 @@ DSSpyInstrumenter >> instrumentSendersActions [
 	SpBrowseSendersCommand link: DSSendersRecord link toAST: (SpBrowseSendersCommand >> #execute) ast
 ]
 
-{ #category : 'debugger' }
-DSSpyInstrumenter >> instrumentSindarinDebuggerCommands [
-	StDebugger class compile:
-	'buildSindarinExtentionCommandsGroupWith: stDebuggerInstance forRoot: rootCommandGroup
-
-	<extensionCommands>
-	| commands codeGroup toolbarGroup toolbarSindarinGroup |
-	commands := { 
-		            DSSindarinStepToMethodEntryCommand.
-		            DSSindarinStepToNextExecutionInClassCommand.
-		            DSSindarinStepToNextExecutionInObjectCommand.
-		            DSSindarinStepToNextInstanceCreation.
-		            DSSindarinStepToReturnCommand } collect: [ :class | 		         
-		            class forSpecContext: stDebuggerInstance ].
-
-	codeGroup := self debuggerCodeCommandGroupFor: rootCommandGroup.
-	commands do: [ :c | codeGroup register: c ].
-
-	toolbarSindarinGroup := CmCommandGroup forSpec
-			beToolbarPopoverButton;
-			name: ''Advanced'';
-			icon: (stDebuggerInstance application iconNamed: #smallDebugIt);
-			yourself.
-	(self debuggerToolbarCommandGroupFor: rootCommandGroup) register: toolbarSindarinGroup.
-	commands do: [ :c | toolbarSindarinGroup register: c ].'
-	
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> instrumentSystem [
 	"Instrument every thing in the system, feel free to comment things you don't want to record"
@@ -182,7 +154,7 @@ DSSpyInstrumenter >> instrumentSystem [
 	self logMouseEvents.
 	self logCodeInteractions.
 	self logBrowsingActions.
-	"self logDebuggerInteractions"
+	self instrumentExceptionSignalling
 ]
 
 { #category : 'debugpoints  ' }
@@ -241,14 +213,6 @@ DSSpyInstrumenter >> logCodeInteractions [
 	self instrumentDoItAndGo
 ]
 
-{ #category : 'system-instrumentation' }
-DSSpyInstrumenter >> logDebuggerInteractions [
-	"Instruments the Debugger and the Sindarin Debugger"
-
-	"self instrumentSindarinDebuggerCommands."
-	self instrumentExceptionSignalling
-]
-
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logMouseEvents [
 	"Instrument mouse events"
diff --git a/DebuggingSpy/RubTextEditor.extension.st b/DebuggingSpy/RubTextEditor.extension.st
new file mode 100644
index 0000000..cb9f9ca
--- /dev/null
+++ b/DebuggingSpy/RubTextEditor.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : 'RubTextEditor' }
+
+{ #category : '*DebuggingSpy' }
+RubTextEditor >> recordWindow [
+	"TODO: find if it is possible to get the window from here"
+
+	^ nil
+]
diff --git a/DebuggingSpy/StDebugger.extension.st b/DebuggingSpy/StDebugger.extension.st
index afff8ef..d481fdf 100644
--- a/DebuggingSpy/StDebugger.extension.st
+++ b/DebuggingSpy/StDebugger.extension.st
@@ -10,6 +10,31 @@ StDebugger class >> buildInstrumentedCommandsWith: stDebuggerInstance forRoot: r
 		self replaceSubclass: ec inCommanderGroup: toolbarGroup ]
 ]
 
+{ #category : '*DebuggingSpy' }
+StDebugger class >> buildSindarinExtentionCommandsGroupWith: stDebuggerInstance forRoot: rootCommandGroup [
+
+	<extensionCommands>
+	| commands codeGroup toolbarGroup toolbarSindarinGroup |
+	commands := { 
+		            DSSindarinStepToMethodEntryCommand.
+		            DSSindarinStepToNextExecutionInClassCommand.
+		            DSSindarinStepToNextExecutionInObjectCommand.
+		            DSSindarinStepToNextInstanceCreation.
+		            DSSindarinStepToReturnCommand } collect: [ :class | 		         
+		            class forSpecContext: stDebuggerInstance ].
+
+	codeGroup := self debuggerCodeCommandGroupFor: rootCommandGroup.
+	commands do: [ :c | codeGroup register: c ].
+
+	toolbarSindarinGroup := CmCommandGroup forSpec
+			beToolbarPopoverButton;
+			name: 'Advanced';
+			icon: (stDebuggerInstance application iconNamed: #smallDebugIt);
+			yourself.
+	(self debuggerToolbarCommandGroupFor: rootCommandGroup) register: toolbarSindarinGroup.
+	commands do: [ :c | toolbarSindarinGroup register: c ].
+]
+
 { #category : '*DebuggingSpy' }
 StDebugger class >> executionCommandGroupIn: rootCommandGroup [
 

From d0ebc1f755f0ec2958080c0d73aefb9ebc0f6e01 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 19 Jan 2026 14:39:42 +0100
Subject: [PATCH 40/49] refactor: delete methods with undeclared variables and
 update methods' name

---
 DebuggingSpy/DSRecordHistory.class.st | 183 +++++++++++---------------
 1 file changed, 75 insertions(+), 108 deletions(-)

diff --git a/DebuggingSpy/DSRecordHistory.class.st b/DebuggingSpy/DSRecordHistory.class.st
index b187c82..4ae2889 100644
--- a/DebuggingSpy/DSRecordHistory.class.st
+++ b/DebuggingSpy/DSRecordHistory.class.st
@@ -75,52 +75,6 @@ DSRecordHistory >> allRecordsOfKind: aClass [
 	^ records select: [ :record | record isKindOf: aClass ]
 ]
 
-{ #category : 'API-history' }
-DSRecordHistory >> breakpointAdds [
-
-	^ (self breakpointEvents: BreakpointAdded name) size
-]
-
-{ #category : 'API-history' }
-DSRecordHistory >> breakpointAnalysisMap [
-
-	| report |
-	report := Dictionary new.
-	(self allRecordsOfKind: DSDebugPointRecord) do: [ :bp |
-		(report at: bp targetClassOrMethod ifAbsentPut: [
-			 DSBreakpointReport new
-				 method: bp targetClassOrMethod;
-				 yourself ]) add: bp ].
-	^ report
-]
-
-{ #category : 'private - history' }
-DSRecordHistory >> breakpointEvents [
-
-	^ self records select: [ :r |
-		  (r isKindOf: DSAbstractDebugPointEventRecord) or: [
-			  r isKindOf: DSDebugPointRecord ] ]
-]
-
-{ #category : 'private - history' }
-DSRecordHistory >> breakpointEvents: aBreakpointEventName [
-
-	^ self breakpointEvents select: [ :bpEvent | 
-		  bpEvent eventName = aBreakpointEventName ]
-]
-
-{ #category : 'API-history' }
-DSRecordHistory >> breakpointHit [
-
-	^ (self breakpointEvents: BreakpointHit name) size
-]
-
-{ #category : 'API-history' }
-DSRecordHistory >> breakpointRemove [
-
-	^ (self breakpointEvents: BreakpointRemoved name) size
-]
-
 { #category : 'API-history' }
 DSRecordHistory >> buildWindowHistory [
 
@@ -179,12 +133,6 @@ DSRecordHistory >> buildWindows [
 					                    w type ] ]) or: [ w windowId = -1 ] ]
 ]
 
-{ #category : 'API-history' }
-DSRecordHistory >> callStackBrowing [
-
-	^ (self allRecordsOfKind: DSBrowseContextRecord) size
-]
-
 { #category : 'private - history' }
 DSRecordHistory >> collectTimeDiscrepancies [
 
@@ -209,7 +157,7 @@ DSRecordHistory >> collectTimeDiscrepancies [
 { #category : 'API-history' }
 DSRecordHistory >> countDebugActions [
 
-	^ self breakpointAdds + self breakpointRemove + self executedCode
+	^ self debugPointAdds + self debugPointRemove + self executedCode
 	  + self methodsAdded + self methodsModified + self methodsRemoved
 	  + self numberOfSteps + self callStackBrowing
 ]
@@ -219,6 +167,52 @@ DSRecordHistory >> dateTime [
 	^records first dateTime
 ]
 
+{ #category : 'API-history' }
+DSRecordHistory >> debugPointAdds [
+
+	^ (self debugPointEvents: DebugPointAdded name) size
+]
+
+{ #category : 'API-history' }
+DSRecordHistory >> debugPointAnalysisMap [
+
+	| report |
+	report := Dictionary new.
+	(self allRecordsOfKind: DSDebugPointRecord) do: [ :bp |
+		(report at: bp targetClassOrMethod ifAbsentPut: [
+			 DSBreakpointReport new
+				 method: bp targetClassOrMethod;
+				 yourself ]) add: bp ].
+	^ report
+]
+
+{ #category : 'private - history' }
+DSRecordHistory >> debugPointEvents [
+
+	^ self records select: [ :r |
+		  (r isKindOf: DSAbstractDebugPointEventRecord) or: [
+			  r isKindOf: DSDebugPointRecord ] ]
+]
+
+{ #category : 'private - history' }
+DSRecordHistory >> debugPointEvents: aDebugPointEventName [
+
+	^ self debugPointEvents select: [ :bpEvent | 
+		  bpEvent eventName = aDebugPointEventName ]
+]
+
+{ #category : 'API-history' }
+DSRecordHistory >> debugPointHit [
+
+	^ (self debugPointEvents: DebugPointHit name) size
+]
+
+{ #category : 'API-history' }
+DSRecordHistory >> debugPointRemove [
+
+	^ (self debugPointEvents: DebugPointRemoved name) size
+]
+
 { #category : 'private - history' }
 DSRecordHistory >> detectTimeDiscrepancies [
 	|time currentRecord totalDelta|
@@ -248,33 +242,25 @@ DSRecordHistory >> estimateSourceEventOf: aDSDebuggerOpeningRecord from: aRecord
 
 
 	(self
-		 findSourceEventLike:
-		 aDSDebuggerOpeningRecord primarySourcesOfWindowOpenings
+		 findSourceEventLike: aDSDebuggerOpeningRecord primarySourcesOfWindowOpenings
 		 forRecord: aDSDebuggerOpeningRecord
 		 in: aRecordList) ifNotNil: [ :sourceEvent | ^ sourceEvent ].
 
 
 	previousRecord := aRecordList at: eventIndex - 1.
-	(previousRecord class == DSMouseEnterTableItemRecord and: [
-		 previousRecord isOverTestCase ]) ifTrue: [
-		^ DSRunTestRecord for: previousRecord ].
 
 
 	(self
-		 findSourceEventLike:
-		 aDSDebuggerOpeningRecord secondarySourcesOfWindowOpenings
+		 findSourceEventLike: aDSDebuggerOpeningRecord secondarySourcesOfWindowOpenings
 		 forRecord: aDSDebuggerOpeningRecord
 		 in: aRecordList) ifNotNil: [ :sourceEvent | ^ sourceEvent ].
 
 
-	aDSDebuggerOpeningRecord contextName = 'CompiledMethod>>#DoIt'
-		ifTrue: [
-			^DSDebugItRecord new
-				selectedString: aDSDebuggerOpeningRecord sourceNodeCode;
-				windowId: (aRecordList at: eventIndex - 1) windowId;
-				yourself ].
-
-	"self halt: 'If we get there we forgot a case...'."
+	aDSDebuggerOpeningRecord contextName = 'CompiledMethod>>#DoIt' ifTrue: [
+			^ DSDebugItRecord new
+				  selectedString: aDSDebuggerOpeningRecord sourceNodeCode;
+				  windowId: (aRecordList at: eventIndex - 1) windowId;
+				  yourself ]. "self halt: 'If we get there we forgot a case...'."
 	^ aRecordList at: eventIndex - 1
 ]
 
@@ -502,12 +488,6 @@ DSRecordHistory >> numberOfSteps [
 	^ (self allRecordsOfKind: DSStepActionRecord) size
 ]
 
-{ #category : 'API-history' }
-DSRecordHistory >> openedDebuggers [
-
-	^ (self allRecordsOfKind: DSDebuggerOpeningRecord) size
-]
-
 { #category : 'initialization' }
 DSRecordHistory >> processRecords: array [
 
@@ -520,14 +500,10 @@ DSRecordHistory >> processRecords: array [
 	(self allRecordsOfKind: DSStepActionRecord) do: #asStepRecord.
 	(self allRecordsOfKind: DSAbstractDebugPointEventRecord) do: #asDebugPointRecord.
 	
-	"Detect if we're in a specific task"	
-"	(self records first isKindOf: DSStartTaskRecord) ifTrue: [
-		self taskName: self records first taskName ]."
-	
 	"Windows"
 	self buildWindowHistory.
 	self buildWindows.
-	"self buildWindowJumps."
+	self buildWindowJumps.
 	self reconstructWindowsToolInfo.
 	
 	"Check data consistency (raises a warning that can be proceeded)"
@@ -594,7 +570,7 @@ DSRecordHistory >> startTime [
 	^ records first dateTime asTime
 ]
 
-{ #category : 'as yet unclassified' }
+{ #category : 'accessing' }
 DSRecordHistory >> stopTime [
 	^records last dateTime asTime
 ]
@@ -710,40 +686,31 @@ DSRecordHistory >> validateWindows [
 	| erroneousWindows |
 	erroneousWindows := Dictionary new.
 
-	windows do: [ :w |
-		| firstEvent lastEvent |
-		firstEvent := w events first.
-		lastEvent := w events last.
-
-		({
-			 DSWindowOpenedRecord.
-			 DSWindowActivatedRecord.
-			 DSMouseEnterWindowRecord.
-			 DSDebuggerOpeningRecord.
-			 DSBrowseContextRecord.
-			 DSQueryBrowseRecord } includes: firstEvent class) ifFalse: [
-			(erroneousWindows at: w ifAbsentPut: [ OrderedCollection new ])
-				add: #opening -> firstEvent ].
-
-		({
-			 DSWindowClosedRecord.
-			 DSMouseLeaveWindowRecord } includes: lastEvent class) ifFalse: [
-			(erroneousWindows at: w ifAbsentPut: [ OrderedCollection new ])
-				add: #closing -> lastEvent ].
-
-		w events do: [ :e |
-			(e dateTime between: firstEvent dateTime and: lastEvent dateTime)
-				ifFalse: [
-					(erroneousWindows at: w ifAbsentPut: [ OrderedCollection new ])
-						add: #timestamp -> e ] ] ]
-
-	"erroneousWindows ifNotEmpty: [
+	windows do: [ :w | "erroneousWindows ifNotEmpty: [
 		Warning signal: (String streamContents: [ :str |
 				 str << erroneousWindows size printString.
 				 str space.
 				 str
 				 <<
 				 'potential sequence problem found in windows. This is just an information, you can proceed.' ]) ]"
+			| firstEvent lastEvent |
+			firstEvent := w events first.
+			lastEvent := w events last.
+
+			({
+				 DSWindowOpenedRecord.
+				 DSWindowActivatedRecord.
+				 DSMouseEnterWindowRecord } includes: firstEvent class) ifFalse: [
+				(erroneousWindows at: w ifAbsentPut: [ OrderedCollection new ]) add: #opening -> firstEvent ].
+
+			({
+				 DSWindowClosedRecord.
+				 DSMouseLeaveWindowRecord } includes: lastEvent class) ifFalse: [
+				(erroneousWindows at: w ifAbsentPut: [ OrderedCollection new ]) add: #closing -> lastEvent ].
+
+			w events do: [ :e |
+					(e dateTime between: firstEvent dateTime and: lastEvent dateTime) ifFalse: [
+						(erroneousWindows at: w ifAbsentPut: [ OrderedCollection new ]) add: #timestamp -> e ] ] ]
 ]
 
 { #category : 'accessing' }

From 4a9593cb51db481c2459509798a2ae82f68226bd Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 19 Jan 2026 14:55:43 +0100
Subject: [PATCH 41/49] fix: delete old code

---
 DebuggingSpy/DSRecordHistory.class.st |  2 +-
 DebuggingSpy/DSWindowRecord.class.st  | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/DebuggingSpy/DSRecordHistory.class.st b/DebuggingSpy/DSRecordHistory.class.st
index 4ae2889..064c9c8 100644
--- a/DebuggingSpy/DSRecordHistory.class.st
+++ b/DebuggingSpy/DSRecordHistory.class.st
@@ -503,7 +503,7 @@ DSRecordHistory >> processRecords: array [
 	"Windows"
 	self buildWindowHistory.
 	self buildWindows.
-	self buildWindowJumps.
+	"self buildWindowJumps."
 	self reconstructWindowsToolInfo.
 	
 	"Check data consistency (raises a warning that can be proceeded)"
diff --git a/DebuggingSpy/DSWindowRecord.class.st b/DebuggingSpy/DSWindowRecord.class.st
index d9152d5..a722898 100644
--- a/DebuggingSpy/DSWindowRecord.class.st
+++ b/DebuggingSpy/DSWindowRecord.class.st
@@ -52,25 +52,6 @@ DSWindowRecord >> buildEvents: aCollectionOfEvents [
 	self computeActivePeriods.
 
 	type := self windowTypeFor: events first.
-	type = 'ClyQueryBrowserMorph' ifTrue: [
-		(events
-			 detect: [ :e | e class == DSQueryBrowseRecord ]
-			 ifNone: [ nil ]) ifNotNil: [ :e |
-			type := (e queryName readStream upTo: Character space) capitalized.
-			name := (e queryName splitOn: Character space) last ] ].
-
-
-	type = 'ClyFullBrowserMorph' ifTrue: [
-		type := 'Browser'.
-		(events
-			 detect: [ :e | e class == DSFullBrowseRecord ]
-			 ifNone: [ nil ]) ifNotNil: [ :e |
-			name := String streamContents: [ :ws |
-				        (#( nil '' ) includes: e classBrowsed) ifFalse: [
-					        ws << e classBrowsed ].
-				        (#( nil '' ) includes: e methodBrowsed) ifFalse: [
-					        ws << '>>'.
-					        ws << e methodBrowsed ] ] ] ].
 	
 	name ifNotNil: [ ^ self ].
 	name := self windowNameFor: events first

From 78949bb764c832eb1534c31a10f4ab7c20b275f8 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Mon, 19 Jan 2026 17:02:05 +0100
Subject: [PATCH 42/49] test remote failing

---
 DebuggingSpy/DSSpyInstrumenter.class.st      | 2 +-
 DebuggingSpy/DSWindowActivityRecord.class.st | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 874b708..4c4e710 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -154,7 +154,7 @@ DSSpyInstrumenter >> instrumentSystem [
 	self logMouseEvents.
 	self logCodeInteractions.
 	self logBrowsingActions.
-	self instrumentExceptionSignalling
+	"self instrumentExceptionSignalling"
 ]
 
 { #category : 'debugpoints  ' }
diff --git a/DebuggingSpy/DSWindowActivityRecord.class.st b/DebuggingSpy/DSWindowActivityRecord.class.st
index 60eac76..46444b5 100644
--- a/DebuggingSpy/DSWindowActivityRecord.class.st
+++ b/DebuggingSpy/DSWindowActivityRecord.class.st
@@ -54,7 +54,6 @@ DSWindowActivityRecord >> debuggingActionsClasses [
 	| classes |
 	classes := OrderedCollection withAll: DSStepActionRecord allSubclasses.
 	classes addAll: DSStepRecord allSubclasses.
-	classes add: DSBrowseContextRecord.
 	^ classes
 ]
 

From 1f8dc641df3698710c37d8069c6109aa67865faa Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Tue, 20 Jan 2026 13:46:53 +0100
Subject: [PATCH 43/49] fix: change logging file name

---
 DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st | 2 +-
 DebuggingSpy/DSSTONFileLogger.class.st           | 2 +-
 DebuggingSpy/DSSpy.class.st                      | 9 ++++++++-
 DebuggingSpy/DSSpyInstrumenter.class.st          | 2 +-
 DebuggingSpy/WorkingSession.extension.st         | 7 -------
 5 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 DebuggingSpy/WorkingSession.extension.st

diff --git a/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st b/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
index f5ffabd..b5a5a17 100644
--- a/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
+++ b/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
@@ -39,7 +39,7 @@ DSSTONFileLoggerTest >> testDefaultLoggingDirectoryName [
 
 { #category : 'tests - file handling' }
 DSSTONFileLoggerTest >> testDefaultLoggingFileName [
- 	self assert: logger defaultLoggingFileName equals: SessionManager default currentSession id asString
+ 	self assert: logger defaultLoggingFileName equals: DSSpy id asString
 ]
 
 { #category : 'tests - file handling' }
diff --git a/DebuggingSpy/DSSTONFileLogger.class.st b/DebuggingSpy/DSSTONFileLogger.class.st
index 99eafa1..a291eb9 100644
--- a/DebuggingSpy/DSSTONFileLogger.class.st
+++ b/DebuggingSpy/DSSTONFileLogger.class.st
@@ -25,7 +25,7 @@ DSSTONFileLogger >> defaultLoggingDirectoryName [
 { #category : 'accessing' }
 DSSTONFileLogger >> defaultLoggingFileName [
 
-	^ SessionManager default currentSession id asString
+	^ DSSpy id asString
 ]
 
 { #category : 'logging' }
diff --git a/DebuggingSpy/DSSpy.class.st b/DebuggingSpy/DSSpy.class.st
index 2a3a9d3..a5759af 100644
--- a/DebuggingSpy/DSSpy.class.st
+++ b/DebuggingSpy/DSSpy.class.st
@@ -16,7 +16,8 @@ Class {
 		'recordSourceCode',
 		'recordClipboardContent',
 		'scopeSourceCodeChangesRecording',
-		'recordingSession'
+		'recordingSession',
+		'id'
 	],
 	#category : 'DebuggingSpy-Instrumentation',
 	#package : 'DebuggingSpy',
@@ -59,6 +60,12 @@ DSSpy class >> handlingError: anObject [
 	^ HandlingError := anObject
 ]
 
+{ #category : 'logging' }
+DSSpy class >> id [
+
+	^ id ifNil: [ id := UUID new ]
+]
+
 { #category : 'events - debugpoints' }
 DSSpy class >> indexesOfHaltNodesIn: aMethod [
 
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 4c4e710..874b708 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -154,7 +154,7 @@ DSSpyInstrumenter >> instrumentSystem [
 	self logMouseEvents.
 	self logCodeInteractions.
 	self logBrowsingActions.
-	"self instrumentExceptionSignalling"
+	self instrumentExceptionSignalling
 ]
 
 { #category : 'debugpoints  ' }
diff --git a/DebuggingSpy/WorkingSession.extension.st b/DebuggingSpy/WorkingSession.extension.st
deleted file mode 100644
index 411e1f0..0000000
--- a/DebuggingSpy/WorkingSession.extension.st
+++ /dev/null
@@ -1,7 +0,0 @@
-Extension { #name : 'WorkingSession' }
-
-{ #category : '*DebuggingSpy' }
-WorkingSession >> id [
-
-	^ properties at: #id ifAbsentPut: [ UUID new ]
-]

From 8812be11035d2cb7757d58a14d9198ff22abe6ad Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Tue, 20 Jan 2026 13:53:56 +0100
Subject: [PATCH 44/49] fix: change WorkingSession to DSSpy id

---
 DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st b/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
index b5a5a17..56c221b 100644
--- a/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
+++ b/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
@@ -66,7 +66,7 @@ DSSTONFileLoggerTest >> testFilenameForSurvey [
 DSSTONFileLoggerTest >> testForceLoggingFileNameFor [
 	logger reset.
 	logger forceLoggingFileNameFor: task.	
-	self assert: logger loggingFileName equals: (task title, '-', SessionManager default currentSession id asString).
+	self assert: logger loggingFileName equals: (task title, '-', DSSpy id asString).
 	self assert: logger loggingFileName equals: logger loggingFileReference basename.
 	self assert: logger loggingFileReference exists
 ]
@@ -79,7 +79,7 @@ DSSTONFileLoggerTest >> testForceRunningTask [
 	self
 		assert: logger loggingFileName
 		equals:
-		task title , '-' , SessionManager default currentSession id asString
+		task title , '-' , DSSpy id asString
 ]
 
 { #category : 'tests - file handling' }

From eed0021594ef5fb4256b64a46928ff26744c83dd Mon Sep 17 00:00:00 2001
From: Jules Boulet <126467965+Julesboul@users.noreply.github.com>
Date: Tue, 20 Jan 2026 15:24:50 +0100
Subject: [PATCH 45/49] Update README.md

---
 README.md | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 85ac552..7b833af 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ To cite the use of this tool, please use: https://hal.science/hal-04858378v1
 
 | **Type of traces**         | **User activity/block event or action** | **Debugging action** | **Navigation/inspection action** | **Debugging event** | **Code edition action** |
 |-----------------------------|------------------------------------------|-----------------------|-----------------------------------|---------------------|--------------------------|
-| Breakpoint                 |                                          | x                     |                                   |                     |                          |
-| Variable breakpoint        |                                          | x                     |                                   |                     |                          |
+| DebugPoint                 |                                          | x                     |                                   |                     |                          |
+| Watch DebugPoint           |                                          | x                     |                                   |                     |                          |
 | Halt change                |                                          | x                     |                                   |                     |                          |
 | Halt hit                   |                                          |                       |                                   | x                   |                          |
 | Clipboard copy             |                                          |                       |                                   |                     | x                        |
@@ -46,33 +46,17 @@ To cite the use of this tool, please use: https://hal.science/hal-04858378v1
 | Do it                      | ?                                        |                       |                                   |                     |                          |
 | Do it and go               | ?                                        |                       |                                   |                     |                          |
 | Print it                   |                                          |                       | x                                 |                     |                          |
-| Browse context             |                                          |                       | x                                 |                     |                          |
-| Debugger action            |                                          | x                     |                                   |                     |                          |
-| Debugger opening           | x                                        |                       |                                   |                     |                          |
-| Full browse                |                                          |                       | x                                 |                     |                          |
-| Inspect attribute          | x                                        |                       |                                   |                     |                          |
-| Expand attribute           |                                          |                       | x                                 |                     |                          |
-| Navigate attribute         |                                          |                       | x                                 |                     |                          |
-| Inspect method             | x                                        |                       |                                   |                     |                          |
-| Inspect method source      | x                                        |                       |                                   |                     |                          |
-| Inspect object             | x                                        |                       |                                   |                     |                          |
-| Select inspector page      |                                          |                       | x                                 |                     |                          |
+| Browse                     |                                          |                       | x                                 |                     |                          |
+| Implementors               | x                                        |                       |                                   |                     |                          |
+| Senders                    | x                                        |                       |                                   |                     |                          |
+| Inspect                    | x                                        |                       |                                   |                     |                          |
 | Logging error              |                                          |                       |                                   | x                   |                          |
 | Method added               |                                          |                       |                                   |                     | x                        |
 | Method modified            |                                          |                       |                                   |                     | x                        |
 | Method removed             |                                          |                       |                                   |                     | x                        |
 | Source code change         |                                          |                       |                                   |                     | x                        |
-| Mouse down table           |                                          |                       | x                                 |                     |                          |
-| Mouse enter table          |                                          |                       | x                                 |                     |                          |
-| Mouse enter text editor    |                                          |                       | x                                 |                     |                          |
 | Mouse enter window         | x                                        |                       |                                   |                     |                          |
 | Mouse leave window         | x                                        |                       |                                   |                     |                          |
-| Playground opened          | x                                        |                       |                                   |                     |                          |
-| Playground read            |                                          |                       | x                                 |                     |                          |
-| Playground write           |                                          |                       |                                   |                     | x                        |
-| Query browse               |                                          |                       | x                                 |                     |                          |
-| Start scrolling            |                                          |                       | x                                 |                     |                          |
-| Stop scrolling             |                                          |                       | x                                 |                     |                          |
 | Step                       |                                          | x                     |                                   |                     |                          |
 | Window activated           | x                                        |                       |                                   |                     |                          |
 | Window opened              | x                                        |                       |                                   |                     |                          |
@@ -89,7 +73,7 @@ To cite the use of this tool, please use: https://hal.science/hal-04858378v1
 # User documentation
 ## Log data to local file
 
-Load the P12 baseline into a Pharo 12 image, then execute the following line:
+Load the baseline into a Pharo image, then execute the following line:
 ```Smalltalk
 DSSpyInstrumenter instrumentSystem
 ```

From 3efa646d9c0b33c7026ff1f2092ef44c07fe63e3 Mon Sep 17 00:00:00 2001
From: Jules Boulet <126467965+Julesboul@users.noreply.github.com>
Date: Tue, 20 Jan 2026 15:48:31 +0100
Subject: [PATCH 46/49] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 7b833af..11dbe68 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,10 @@ Logs are serialized in the image working directory, in the *ds-spy* folder:
 
 <img width="445" alt="Capture d’écran 2025-03-09 à 22 45 10" src="https://github.com/user-attachments/assets/c0f7595b-6d32-4101-b6c2-45f54c5fddd0" />
 
+To stop the instrumentation, execute the following line:
+```Smalltalk
+DSSpyInstrumenter stopInstrumentation
+```
 
 ## Log data to a remote server
 TODO

From ba93fd52b278f8daa394f41d07a05215d4f90312 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Wed, 21 Jan 2026 15:27:11 +0100
Subject: [PATCH 47/49] refactor: restore Task management

---
 .../DSSTONFileLoggerTest.class.st             | 20 ++++
 DebuggingSpy-Tests/DSSpyTest.class.st         | 91 +++++++++++++++++++
 DebuggingSpy/DSAbstractTaskRecord.class.st    | 33 +++++++
 DebuggingSpy/DSEndingTaskRecord.class.st      | 22 +++++
 DebuggingSpy/DSRecordHistory.class.st         | 20 ++--
 DebuggingSpy/DSSpy.class.st                   | 18 ++++
 DebuggingSpy/DSStartTaskRecord.class.st       | 15 +++
 DebuggingSpy/DSTaskSuccessRecord.class.st     | 33 +++++++
 8 files changed, 243 insertions(+), 9 deletions(-)
 create mode 100644 DebuggingSpy/DSAbstractTaskRecord.class.st
 create mode 100644 DebuggingSpy/DSEndingTaskRecord.class.st
 create mode 100644 DebuggingSpy/DSStartTaskRecord.class.st
 create mode 100644 DebuggingSpy/DSTaskSuccessRecord.class.st

diff --git a/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st b/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
index 56c221b..ff75ec2 100644
--- a/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
+++ b/DebuggingSpy-Tests/DSSTONFileLoggerTest.class.st
@@ -98,6 +98,26 @@ DSSTONFileLoggerTest >> testLoggingFileName [
 		equals: logger defaultLoggingFileName
 ]
 
+{ #category : 'tests - file handling' }
+DSSTONFileLoggerTest >> testLoggingFileNameAfterTaskEnded [
+
+	DSSpy startTask: task.
+	DSSpy endTask: task.
+	self
+		assert: logger loggingFileName
+		equals: logger defaultLoggingFileName
+]
+
+{ #category : 'tests - file handling' }
+DSSTONFileLoggerTest >> testLoggingFileNameAfterTaskStarted [
+	
+	DSSpy startTask: task.
+
+	self
+		assert: logger loggingFileName
+		equals: (task title, '-', logger defaultLoggingFileName)
+]
+
 { #category : 'tests - file handling' }
 DSSTONFileLoggerTest >> testLoggingFileReference [
 
diff --git a/DebuggingSpy-Tests/DSSpyTest.class.st b/DebuggingSpy-Tests/DSSpyTest.class.st
index f05d707..fda6247 100644
--- a/DebuggingSpy-Tests/DSSpyTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyTest.class.st
@@ -200,6 +200,42 @@ DSSpyTest >> tearDown [
 	super tearDown
 ]
 
+{ #category : 'tests - task management' }
+DSSpyTest >> testCloseSurvey [
+
+	| taskLoggingFileName recordedSurvey |
+	DSSpy logOnlyWhenTaskStarted: true.
+	DSSpy startTask: task.
+	DSRecordRegistry autoSerialize: true.
+	taskLoggingFileName := task title , '-' , DSSpy logger defaultLoggingFileName.
+
+	self assert: self registry size equals: 1.
+	self assert: DSSpy logger loggingFileName equals: taskLoggingFileName.
+	self assert: DSSpy logger loggingFileReference basename equals: taskLoggingFileName.
+
+	DSSpy closeSurvey: survey.
+	self assert: self registry size equals: 2.
+	self assert: DSSpy logger loggingFileName equals: taskLoggingFileName.
+	self assert: DSSpy logger loggingFileReference basename equals: taskLoggingFileName.
+
+	record := self registry first.
+	self assert: record class equals: DSStartTaskRecord.
+	self assert: record taskName equals: DSTestTask dsTaskDescription.
+	self assert: record description equals: DSTestTask dsTaskDescription.
+
+	record := self registry last.
+	self assert: record class equals: DSSurveyRecord.
+	self assert: record answer equals: survey answer.
+	self assert: record description equals: DSTestSurvey dsSurveyDescription.
+
+	recordedSurvey := (STON fromString:
+		                   (DSSpy logger loggingDirectory / (DSSpy logger filenameForSurvey: survey)) readStream contents) first.
+	self assert: recordedSurvey class equals: DSSurveyRecord.
+	self assert: recordedSurvey answer equals: survey answer.
+	self assert: recordedSurvey description equals: DSTestSurvey dsSurveyDescription.
+	(DSSpy logger loggingDirectory / (DSSpy logger filenameForSurvey: survey)) delete
+]
+
 { #category : 'tests - debugpoints events' }
 DSSpyTest >> testDebugPointAdded [
 
@@ -285,6 +321,18 @@ DSSpyTest >> testDefaultLogger [
 	self assert: DSSpy logger class equals: DSSpy defaultLoggerClass 
 ]
 
+{ #category : 'tests - task management' }
+DSSpyTest >> testEndTask [
+
+	DSSpy endTask: task.
+	self assert: self registry size equals: 1.
+	record := self registry first.
+	self assert: record class equals: DSEndingTaskRecord.
+	self assert: record taskName equals: DSTestTask dsTaskDescription.
+	self assert: record description equals: DSTestTask dsTaskDescription.
+	self assert: record answer equals: DSTestTask dsTaskDescription
+]
+
 { #category : 'tests - halts events' }
 DSSpyTest >> testIndexesOfHaltNodesIn [
 
@@ -729,6 +777,15 @@ DSSpyTest >> testRecordSourceCodeDefaultValue [
 	self deny: DSSpy recordSourceCode 
 ]
 
+{ #category : 'tests - task management' }
+DSSpyTest >> testResetSpy [
+
+	DSSpy startTask: task.
+	DSSpy resetSpy.
+	self deny: DSSpy taskStarted.
+	self assert: DSSpy logger loggingFileName equals: DSSpy logger defaultLoggingFileName
+]
+
 { #category : 'tests - methods events' }
 DSSpyTest >> testScopeSourceCodeChangesRecording [
 	DSSpy scopeSourceCodeChangesRecording: nil.
@@ -747,6 +804,40 @@ DSSpyTest >> testSerialize [
 		equals: '[' , (STON toString: record) , ']'
 ]
 
+{ #category : 'tests - task management' }
+DSSpyTest >> testStartTask [
+
+	DSSpy startTask: task.
+	self assert: self registry size equals: 1.
+	record := self registry first.
+	self assert: record class equals: DSStartTaskRecord.
+	self assert: record taskName equals: DSTestTask dsTaskDescription.
+	self assert: record description equals: DSTestTask dsTaskDescription
+]
+
+{ #category : 'tests - task management' }
+DSSpyTest >> testStartTaskSerialization [
+
+	| recordedTask |
+	DSSpy logger loggingDirectory deleteAllChildren.
+	DSRecordRegistry autoSerialize: true.
+	DSSpy resetSpy.
+	DSSpy startTask: task.
+	recordedTask := (DSSpy materialize: DSSpy logger loggingFileReference) first.
+	self assert: recordedTask class equals: DSStartTaskRecord.
+	self assert: recordedTask taskName equals: task title
+]
+
+{ #category : 'tests - task management' }
+DSSpyTest >> testTaskStarted [
+
+	self deny: DSSpy taskStarted.
+	DSSpy startTask: task.
+	self assert: DSSpy taskStarted.
+	DSSpy endTask: task.
+	self deny: DSSpy taskStarted
+]
+
 { #category : 'tests - debugpoints events' }
 DSSpyTest >> testWatchDebugPointAdded [
 	| history |
diff --git a/DebuggingSpy/DSAbstractTaskRecord.class.st b/DebuggingSpy/DSAbstractTaskRecord.class.st
new file mode 100644
index 0000000..7d20053
--- /dev/null
+++ b/DebuggingSpy/DSAbstractTaskRecord.class.st
@@ -0,0 +1,33 @@
+"
+I am an optional record to manage tasks starting and ending in empirical experiments.
+My subclasses specialize me to provide specific task management.
+
+Tasks should be objects answering `#name` and `#description`, both returning a string.
+"
+Class {
+	#name : 'DSAbstractTaskRecord',
+	#superclass : 'DSAbstractEventRecord',
+	#instVars : [
+		'task'
+	],
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSAbstractTaskRecord >> description [
+
+	^ task description
+]
+
+{ #category : 'actions api' }
+DSAbstractTaskRecord >> record: aTask [
+	task := aTask
+]
+
+{ #category : 'accessing' }
+DSAbstractTaskRecord >> taskName [
+
+	^ task title
+]
diff --git a/DebuggingSpy/DSEndingTaskRecord.class.st b/DebuggingSpy/DSEndingTaskRecord.class.st
new file mode 100644
index 0000000..49321ad
--- /dev/null
+++ b/DebuggingSpy/DSEndingTaskRecord.class.st
@@ -0,0 +1,22 @@
+"
+I represent the ending point in time of an experimental task.
+Tasks are object that should answer to `#name`, `#description` and `#answer`, all returning a string
+
+"
+Class {
+	#name : 'DSEndingTaskRecord',
+	#superclass : 'DSAbstractTaskRecord',
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSEndingTaskRecord >> answer [
+	^ task answer
+]
+
+{ #category : 'accessing' }
+DSEndingTaskRecord >> eventName [
+	^'Ending task'
+]
diff --git a/DebuggingSpy/DSRecordHistory.class.st b/DebuggingSpy/DSRecordHistory.class.st
index 064c9c8..b969084 100644
--- a/DebuggingSpy/DSRecordHistory.class.st
+++ b/DebuggingSpy/DSRecordHistory.class.st
@@ -55,7 +55,7 @@ DSRecordHistory class >> windowLeaveEventTypes [
 
 { #category : 'API-history' }
 DSRecordHistory >> absoluteTimeTaken [
-	"The absoulte time taken to perform the recording of user events, including unmonitoring activities (interruptions or activities outside the IDE)."
+	"The absolute time taken to perform the recording of user events, including unmonitoring activities (interruptions or activities outside the IDE)."
 
 	^ ((records last dateTime asSeconds - records first dateTime asSeconds)
 	   / 60) asFloat
@@ -159,7 +159,7 @@ DSRecordHistory >> countDebugActions [
 
 	^ self debugPointAdds + self debugPointRemove + self executedCode
 	  + self methodsAdded + self methodsModified + self methodsRemoved
-	  + self numberOfSteps + self callStackBrowing
+	  + self numberOfSteps
 ]
 
 { #category : 'accessing' }
@@ -491,20 +491,22 @@ DSRecordHistory >> numberOfSteps [
 { #category : 'initialization' }
 DSRecordHistory >> processRecords: array [
 
-	self fixWindowIdsOf: array.
+	self fixWindowIdsOf: array. 
 	"events with window id equals to 0 are automatic events triggered while opening a spec presenter while the window is not already open -> noise "
-	self records:
-		(array reject: [ :e | #( 0 ) includes: e windowId ]).
-		
+	self records: (array reject: [ :e | #( 0 ) includes: e windowId ]). 
+	
 	"Transform raw events to model events"
 	(self allRecordsOfKind: DSStepActionRecord) do: #asStepRecord.
-	(self allRecordsOfKind: DSAbstractDebugPointEventRecord) do: #asDebugPointRecord.
+	(self allRecordsOfKind: DSAbstractDebugPointEventRecord) do: #asDebugPointRecord. 
+	
+	"Detect if we're in a specific task"
+	(self records first isKindOf: DSStartTaskRecord) ifTrue: [ self taskName: self records first taskName ]. 
 	
 	"Windows"
 	self buildWindowHistory.
-	self buildWindows.
+	self buildWindows. 
 	"self buildWindowJumps."
-	self reconstructWindowsToolInfo.
+	self reconstructWindowsToolInfo. 
 	
 	"Check data consistency (raises a warning that can be proceeded)"
 	self validateWindows
diff --git a/DebuggingSpy/DSSpy.class.st b/DebuggingSpy/DSSpy.class.st
index a5759af..ba7532d 100644
--- a/DebuggingSpy/DSSpy.class.st
+++ b/DebuggingSpy/DSSpy.class.st
@@ -48,6 +48,14 @@ DSSpy class >> defaultLoggerClass [
 	^DSSTONFileLogger
 ]
 
+{ #category : 'task management' }
+DSSpy class >> endTask: aTask [
+
+	DSEndingTaskRecord for: aTask.
+	logger reset.
+	taskStarted := false
+]
+
 { #category : 'task management' }
 DSSpy class >> forceRunningTask: aTask [
 	logger setupLoggerForTask: aTask.
@@ -219,6 +227,7 @@ DSSpy class >> packagesMonitoredForSourceCodeChanges: anObject [
 
 { #category : 'accessing' }
 DSSpy class >> recordClipboardContent [
+	"Indicates if the clipboard content should be recorded or not"
 
 	^ recordClipboardContent ifNil: [ recordClipboardContent := false ]
 ]
@@ -271,6 +280,7 @@ DSSpy class >> recordHaltInRemovedMethod: oldMethod [
 
 { #category : 'accessing' }
 DSSpy class >> recordSourceCode [
+	"Indicates if source code should be recorded or not (when doing actions like Print It, Do It, ...)"
 
 	^ recordSourceCode ifNil: [ recordSourceCode := false ]
 ]
@@ -341,6 +351,14 @@ DSSpy class >> serialize: aDSEventRecord [
 	self log: aDSEventRecord
 ]
 
+{ #category : 'task management' }
+DSSpy class >> startTask: aTask [
+
+	logger setupLoggerForTask: aTask.
+	taskStarted := true.
+	DSStartTaskRecord for: aTask
+]
+
 { #category : 'accessing' }
 DSSpy class >> taskStarted [
 
diff --git a/DebuggingSpy/DSStartTaskRecord.class.st b/DebuggingSpy/DSStartTaskRecord.class.st
new file mode 100644
index 0000000..2de0b2f
--- /dev/null
+++ b/DebuggingSpy/DSStartTaskRecord.class.st
@@ -0,0 +1,15 @@
+"
+I represent the starting point in time of the performing of an experimental task.
+"
+Class {
+	#name : 'DSStartTaskRecord',
+	#superclass : 'DSAbstractTaskRecord',
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSStartTaskRecord >> eventName [
+	^'Starting task'
+]
diff --git a/DebuggingSpy/DSTaskSuccessRecord.class.st b/DebuggingSpy/DSTaskSuccessRecord.class.st
new file mode 100644
index 0000000..a5a0123
--- /dev/null
+++ b/DebuggingSpy/DSTaskSuccessRecord.class.st
@@ -0,0 +1,33 @@
+"
+I represent the result of an automatic evaluation of a task success.
+true = success.
+false = failure.
+This boolean is stored into the success inst var.
+"
+Class {
+	#name : 'DSTaskSuccessRecord',
+	#superclass : 'DSAbstractTaskRecord',
+	#instVars : [
+		'success'
+	],
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
+
+{ #category : 'accessing' }
+DSTaskSuccessRecord >> eventName [
+	^'Task success ', self success asString
+]
+
+{ #category : 'actions api' }
+DSTaskSuccessRecord >> record: anArray [
+	super record: anArray first.
+	success := anArray second
+]
+
+{ #category : 'accessing' }
+DSTaskSuccessRecord >> success [
+
+	^ success ifNil: [ success := false ]
+]

From 4bf3601aad6ce62404de3484770b7dfe4c937c23 Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Fri, 23 Jan 2026 16:08:38 +0100
Subject: [PATCH 48/49] refactor: delete commands instrumentation and replace
 it by DSMetalinks

---
 .../DSSpyInstrumenterTest.class.st            | 11 ++-
 .../DSAbstractDebuggerActionRecord.class.st   |  7 ++
 DebuggingSpy/DSProceedCommand.class.st        | 21 -----
 DebuggingSpy/DSRestartCommand.class.st        | 17 ----
 DebuggingSpy/DSReturnValueCommand.class.st    | 20 -----
 DebuggingSpy/DSRunToSelectionCommand.class.st | 17 ----
 ...SSindarinStepToMethodEntryCommand.class.st | 21 -----
 ...StepToNextExecutionInClassCommand.class.st | 21 -----
 ...tepToNextExecutionInObjectCommand.class.st | 21 -----
 ...indarinStepToNextInstanceCreation.class.st | 21 -----
 .../DSSindarinStepToReturnCommand.class.st    | 21 -----
 DebuggingSpy/DSSpyInstrumenter.class.st       | 39 +++++++++
 DebuggingSpy/DSStepActionRecord.class.st      |  2 +-
 DebuggingSpy/DSStepIntoCommand.class.st       | 17 ----
 DebuggingSpy/DSStepOverCommand.class.st       | 17 ----
 DebuggingSpy/DSStepThroughCommand.class.st    | 17 ----
 DebuggingSpy/DSTCommandForTests.trait.st      | 24 ------
 DebuggingSpy/StDebugger.extension.st          | 81 -------------------
 18 files changed, 52 insertions(+), 343 deletions(-)
 create mode 100644 DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
 delete mode 100644 DebuggingSpy/DSProceedCommand.class.st
 delete mode 100644 DebuggingSpy/DSRestartCommand.class.st
 delete mode 100644 DebuggingSpy/DSReturnValueCommand.class.st
 delete mode 100644 DebuggingSpy/DSRunToSelectionCommand.class.st
 delete mode 100644 DebuggingSpy/DSSindarinStepToMethodEntryCommand.class.st
 delete mode 100644 DebuggingSpy/DSSindarinStepToNextExecutionInClassCommand.class.st
 delete mode 100644 DebuggingSpy/DSSindarinStepToNextExecutionInObjectCommand.class.st
 delete mode 100644 DebuggingSpy/DSSindarinStepToNextInstanceCreation.class.st
 delete mode 100644 DebuggingSpy/DSSindarinStepToReturnCommand.class.st
 delete mode 100644 DebuggingSpy/DSStepIntoCommand.class.st
 delete mode 100644 DebuggingSpy/DSStepOverCommand.class.st
 delete mode 100644 DebuggingSpy/DSStepThroughCommand.class.st
 delete mode 100644 DebuggingSpy/DSTCommandForTests.trait.st
 delete mode 100644 DebuggingSpy/StDebugger.extension.st

diff --git a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
index ebdd56f..c7b7679 100644
--- a/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
+++ b/DebuggingSpy-Tests/DSSpyInstrumenterTest.class.st
@@ -438,14 +438,13 @@ DSSpyInstrumenterTest >> tearDown [
 DSSpyInstrumenterTest >> testInstrumentClyTextEditorDebugIt [
 
 	| clyEditor |
-
-	clyEditor := self clyTextEditor.
-	clyEditor debugIt.
+	
+	self runWithoutOpeningDebugger: [clyEditor := self clyTextEditor. clyEditor debugIt].
 
 	self assert: self registry size equals: 1.
-	record := self registry first.	
-	
-	self assert: record class identicalTo: DSDebugItRecord.	
+	record := self registry first.
+
+	self assert: record class identicalTo: DSDebugItRecord.
 	self assert: record selectedString equals: '41+1'
 ]
 
diff --git a/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st b/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
new file mode 100644
index 0000000..c3866cd
--- /dev/null
+++ b/DebuggingSpy/DSAbstractDebuggerActionRecord.class.st
@@ -0,0 +1,7 @@
+Class {
+	#name : 'DSAbstractDebuggerActionRecord',
+	#superclass : 'DSAbstractEventRecord',
+	#category : 'DebuggingSpy-Records',
+	#package : 'DebuggingSpy',
+	#tag : 'Records'
+}
diff --git a/DebuggingSpy/DSProceedCommand.class.st b/DebuggingSpy/DSProceedCommand.class.st
deleted file mode 100644
index 73874e8..0000000
--- a/DebuggingSpy/DSProceedCommand.class.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-I specialize StProceedCommand with debugging spy record creation.
-	I am meant to replace StProceedCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSProceedCommand',
-	#superclass : 'StProceedCommand',
-	#traits : 'DSTCommandForTests',
-	#classTraits : 'DSTCommandForTests classTrait',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'hooks' }
-DSProceedCommand >> execute [
-
-	[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #PROCEED].
-	self forTests ifTrue: [ ^ self ].
-	^ super execute
-]
diff --git a/DebuggingSpy/DSRestartCommand.class.st b/DebuggingSpy/DSRestartCommand.class.st
deleted file mode 100644
index 3e0501e..0000000
--- a/DebuggingSpy/DSRestartCommand.class.st
+++ /dev/null
@@ -1,17 +0,0 @@
-"
-I specialize StRestartCommand with debugging spy record creation.
-	I am meant to replace StRestartCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSRestartCommand',
-	#superclass : 'StRestartCommand',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'hooks' }
-DSRestartCommand >> execute [
-		[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #RESTART].
-		^super execute.
-]
diff --git a/DebuggingSpy/DSReturnValueCommand.class.st b/DebuggingSpy/DSReturnValueCommand.class.st
deleted file mode 100644
index d8cc2ec..0000000
--- a/DebuggingSpy/DSReturnValueCommand.class.st
+++ /dev/null
@@ -1,20 +0,0 @@
-"
-I specialize StReturnValueCommand with debugging spy record creation.
-	I am meant to replace StReturnValueCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSReturnValueCommand',
-	#superclass : 'StReturnValueCommand',
-	#traits : 'DSTCommandForTests',
-	#classTraits : 'DSTCommandForTests classTrait',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'actions' }
-DSReturnValueCommand >> execute [
-		[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #RETURN_VALUE].
-		self forTests ifTrue: [ ^ self ].
-		^super execute.
-]
diff --git a/DebuggingSpy/DSRunToSelectionCommand.class.st b/DebuggingSpy/DSRunToSelectionCommand.class.st
deleted file mode 100644
index 832785c..0000000
--- a/DebuggingSpy/DSRunToSelectionCommand.class.st
+++ /dev/null
@@ -1,17 +0,0 @@
-"
-I specialize StRunToSelectionCommand with debugging spy record creation.
-	I am meant to replace StRunToSelectionCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSRunToSelectionCommand',
-	#superclass : 'StRunToSelectionCommand',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'hooks' }
-DSRunToSelectionCommand >> execute [
-		[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #RUN_TO].
-		^super execute.
-]
diff --git a/DebuggingSpy/DSSindarinStepToMethodEntryCommand.class.st b/DebuggingSpy/DSSindarinStepToMethodEntryCommand.class.st
deleted file mode 100644
index d168651..0000000
--- a/DebuggingSpy/DSSindarinStepToMethodEntryCommand.class.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-I specialize SindarinStepToMethodEntryCommand with debugging spy record creation.
-	I am meant to replace SindarinStepToMethodEntryCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSSindarinStepToMethodEntryCommand',
-	#superclass : 'SindarinStepToMethodEntryCommand',
-	#traits : 'DSTCommandForTests',
-	#classTraits : 'DSTCommandForTests classTrait',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'executing' }
-DSSindarinStepToMethodEntryCommand >> execute [
-
-	[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #TO_METHOD_ENTRY].
-	self forTests ifTrue: [ ^ self ].
-	^ super execute
-]
diff --git a/DebuggingSpy/DSSindarinStepToNextExecutionInClassCommand.class.st b/DebuggingSpy/DSSindarinStepToNextExecutionInClassCommand.class.st
deleted file mode 100644
index 82ac5de..0000000
--- a/DebuggingSpy/DSSindarinStepToNextExecutionInClassCommand.class.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-I specialize SindarinStepToNextCallInClassCommand with debugging spy record creation.
-	I am meant to replace SindarinStepToNextCallInClassCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSSindarinStepToNextExecutionInClassCommand',
-	#superclass : 'SindarinStepToNextExecutionInClassCommand',
-	#traits : 'DSTCommandForTests',
-	#classTraits : 'DSTCommandForTests classTrait',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'hooks' }
-DSSindarinStepToNextExecutionInClassCommand >> execute [
-
-	[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #TO_NEXT_EXECUTION_IN_CLASS].
-	self forTests ifTrue: [ ^ self ].
-	^ super execute
-]
diff --git a/DebuggingSpy/DSSindarinStepToNextExecutionInObjectCommand.class.st b/DebuggingSpy/DSSindarinStepToNextExecutionInObjectCommand.class.st
deleted file mode 100644
index 14ce17b..0000000
--- a/DebuggingSpy/DSSindarinStepToNextExecutionInObjectCommand.class.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-I specialize SindarinStepToNextCallInObjectCommand with debugging spy record creation.
-	I am meant to replace SindarinStepToNextCallInObjectCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSSindarinStepToNextExecutionInObjectCommand',
-	#superclass : 'SindarinStepToNextExecutionInObjectCommand',
-	#traits : 'DSTCommandForTests',
-	#classTraits : 'DSTCommandForTests classTrait',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'hooks' }
-DSSindarinStepToNextExecutionInObjectCommand >> execute [
-
-	[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #TO_NEXT_EXECUTION_IN_OBJECT].
-	self forTests ifTrue: [ ^ self ].
-	^ super execute
-]
diff --git a/DebuggingSpy/DSSindarinStepToNextInstanceCreation.class.st b/DebuggingSpy/DSSindarinStepToNextInstanceCreation.class.st
deleted file mode 100644
index 0f363ac..0000000
--- a/DebuggingSpy/DSSindarinStepToNextInstanceCreation.class.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-I specialize SindarinStepToNextInstanceCreation with debugging spy record creation.
-	I am meant to replace SindarinStepToNextInstanceCreation commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSSindarinStepToNextInstanceCreation',
-	#superclass : 'SindarinStepToNextInstanceCreation',
-	#traits : 'DSTCommandForTests',
-	#classTraits : 'DSTCommandForTests classTrait',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'executing' }
-DSSindarinStepToNextInstanceCreation >> execute [
-
-	[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #TO_NEXT_INSTANCE_CREATION].
-	self forTests ifTrue: [ ^ self ].
-	^ super execute
-]
diff --git a/DebuggingSpy/DSSindarinStepToReturnCommand.class.st b/DebuggingSpy/DSSindarinStepToReturnCommand.class.st
deleted file mode 100644
index f666f5e..0000000
--- a/DebuggingSpy/DSSindarinStepToReturnCommand.class.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-I specialize SindarinStepToReturnCommand with debugging spy record creation.
-	I am meant to replace SindarinStepToReturnCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSSindarinStepToReturnCommand',
-	#superclass : 'SindarinStepToReturnCommand',
-	#traits : 'DSTCommandForTests',
-	#classTraits : 'DSTCommandForTests classTrait',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'executing' }
-DSSindarinStepToReturnCommand >> execute [
-
-	[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #TO_RETURN].
-	self forTests ifTrue: [ ^ self ].
-	^ super execute
-]
diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 874b708..195ac39 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -57,6 +57,19 @@ DSSpyInstrumenter >> instrumentDebugIt [
 	SpCodePrintItCommand link: DSDebugItRecord link toAST: (SpCodeDebugItCommand >> #execute) ast
 ]
 
+{ #category : 'interactions' }
+DSSpyInstrumenter >> instrumentDebuggerCommands [
+	"Instruments different debugIt methods"
+
+	StProceedCommand link: DSStepActionRecord link toAST: (StProceedCommand >> #execute) ast.
+	StRestartCommand link: DSStepActionRecord link toAST: (StRestartCommand >> #execute) ast.
+	StReturnValueCommand link: DSStepActionRecord link toAST: (StReturnValueCommand >> #execute) ast.
+	StRunToSelectionCommand link: DSStepActionRecord link toAST: (StRunToSelectionCommand >> #execute) ast.
+	StStepIntoCommand link: DSStepActionRecord link toAST: (StStepIntoCommand >> #execute) ast.
+	StStepOverCommand link: DSStepActionRecord link toAST: (StStepOverCommand >> #execute) ast.
+	StStepThroughCommand link: DSStepActionRecord link toAST: (StStepThroughCommand >> #execute) ast
+]
+
 { #category : 'interactions' }
 DSSpyInstrumenter >> instrumentDoIt [
 	"Instruments different 'Do it' actions"
@@ -137,6 +150,21 @@ DSSpyInstrumenter >> instrumentSendersActions [
 	SpBrowseSendersCommand link: DSSendersRecord link toAST: (SpBrowseSendersCommand >> #execute) ast
 ]
 
+{ #category : 'interactions' }
+DSSpyInstrumenter >> instrumentSindarinCommands [
+	"Instruments different debugIt methods"
+
+	SindarinStepToMethodEntryCommand link: DSStepActionRecord link toAST: (SindarinStepToMethodEntryCommand >> #execute) ast.
+	SindarinStepToNextExecutionInClassCommand
+		link: DSStepActionRecord link
+		toAST: (SindarinStepToNextExecutionInClassCommand >> #execute) ast.
+	SindarinStepToNextExecutionInObjectCommand
+		link: DSStepActionRecord link
+		toAST: (SindarinStepToNextExecutionInObjectCommand >> #execute) ast.
+	SindarinStepToNextInstanceCreation link: DSStepActionRecord link toAST: (SindarinStepToNextInstanceCreation >> #execute) ast.
+	SindarinStepToReturnCommand link: DSStepActionRecord link toAST: (SindarinStepToReturnCommand >> #execute) ast
+]
+
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> instrumentSystem [
 	"Instrument every thing in the system, feel free to comment things you don't want to record"
@@ -154,6 +182,9 @@ DSSpyInstrumenter >> instrumentSystem [
 	self logMouseEvents.
 	self logCodeInteractions.
 	self logBrowsingActions.
+	self logDebuggerActions.
+	
+	"Intruments exceptions"
 	self instrumentExceptionSignalling
 ]
 
@@ -213,6 +244,14 @@ DSSpyInstrumenter >> logCodeInteractions [
 	self instrumentDoItAndGo
 ]
 
+{ #category : 'system-instrumentation' }
+DSSpyInstrumenter >> logDebuggerActions [
+	"Instruments actions on Debugger and Sindarin"
+
+	self instrumentDebuggerCommands.
+	self instrumentSindarinCommands
+]
+
 { #category : 'system-instrumentation' }
 DSSpyInstrumenter >> logMouseEvents [
 	"Instrument mouse events"
diff --git a/DebuggingSpy/DSStepActionRecord.class.st b/DebuggingSpy/DSStepActionRecord.class.st
index 993ceda..df918bb 100644
--- a/DebuggingSpy/DSStepActionRecord.class.st
+++ b/DebuggingSpy/DSStepActionRecord.class.st
@@ -5,7 +5,7 @@ In confidentiality mode, this signature and node should be replaced by the curre
 "
 Class {
 	#name : 'DSStepActionRecord',
-	#superclass : 'DSAbstractEventRecord',
+	#superclass : 'DSAbstractDebuggerActionRecord',
 	#instVars : [
 		'context',
 		'node',
diff --git a/DebuggingSpy/DSStepIntoCommand.class.st b/DebuggingSpy/DSStepIntoCommand.class.st
deleted file mode 100644
index 9f3b941..0000000
--- a/DebuggingSpy/DSStepIntoCommand.class.st
+++ /dev/null
@@ -1,17 +0,0 @@
-"
-I specialize StStepIntoCommand with debugging spy record creation.
-	I am meant to replace StStepIntoCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSStepIntoCommand',
-	#superclass : 'StStepIntoCommand',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'hooks' }
-DSStepIntoCommand >> execute [
-		[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #INTO].
-		^super execute.
-]
diff --git a/DebuggingSpy/DSStepOverCommand.class.st b/DebuggingSpy/DSStepOverCommand.class.st
deleted file mode 100644
index 2df8784..0000000
--- a/DebuggingSpy/DSStepOverCommand.class.st
+++ /dev/null
@@ -1,17 +0,0 @@
-"
-I specialize StStepOverCommand with debugging spy record creation.
-	I am meant to replace StStepOverCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSStepOverCommand',
-	#superclass : 'StStepOverCommand',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'hooks' }
-DSStepOverCommand >> execute [
-		[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #OVER].
-		^super execute.
-]
diff --git a/DebuggingSpy/DSStepThroughCommand.class.st b/DebuggingSpy/DSStepThroughCommand.class.st
deleted file mode 100644
index 0028f5f..0000000
--- a/DebuggingSpy/DSStepThroughCommand.class.st
+++ /dev/null
@@ -1,17 +0,0 @@
-"
-I specialize StStepThroughCommand with debugging spy record creation.
-	I am meant to replace StStepThroughCommand commands in the debugger in order to provide such instrumentation.
-"
-Class {
-	#name : 'DSStepThroughCommand',
-	#superclass : 'StStepThroughCommand',
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'hooks' }
-DSStepThroughCommand >> execute [
-		[DSStepActionRecord for: self] on: Error do:[:e| DSSpy log: #ERROR key: #THROUGH].
-		^super execute.
-]
diff --git a/DebuggingSpy/DSTCommandForTests.trait.st b/DebuggingSpy/DSTCommandForTests.trait.st
deleted file mode 100644
index f6b189f..0000000
--- a/DebuggingSpy/DSTCommandForTests.trait.st
+++ /dev/null
@@ -1,24 +0,0 @@
-"
-I provide an accessor to tell that a debugging command is used within a test, in order to avoid executing too much debugging code (and for example to make the execution loop indefinitely when we proceed an infinite recursion).
-"
-Trait {
-	#name : 'DSTCommandForTests',
-	#instVars : [
-		'forTests'
-	],
-	#category : 'DebuggingSpy-Commands',
-	#package : 'DebuggingSpy',
-	#tag : 'Commands'
-}
-
-{ #category : 'accessing' }
-DSTCommandForTests >> forTests [
-
-	^ forTests ifNil: [ forTests := false ]
-]
-
-{ #category : 'accessing' }
-DSTCommandForTests >> forTests: anObject [
-
-	forTests := anObject
-]
diff --git a/DebuggingSpy/StDebugger.extension.st b/DebuggingSpy/StDebugger.extension.st
deleted file mode 100644
index d481fdf..0000000
--- a/DebuggingSpy/StDebugger.extension.st
+++ /dev/null
@@ -1,81 +0,0 @@
-Extension { #name : 'StDebugger' }
-
-{ #category : '*DebuggingSpy' }
-StDebugger class >> buildInstrumentedCommandsWith: stDebuggerInstance forRoot: rootCommandGroup [
-
-	| toolbarGroup |
-	toolbarGroup := self executionCommandGroupIn: rootCommandGroup.
-	StDebuggerToolbarCommandTreeBuilder basicNew
-		executionControlCommandClasses do: [ :ec |
-		self replaceSubclass: ec inCommanderGroup: toolbarGroup ]
-]
-
-{ #category : '*DebuggingSpy' }
-StDebugger class >> buildSindarinExtentionCommandsGroupWith: stDebuggerInstance forRoot: rootCommandGroup [
-
-	<extensionCommands>
-	| commands codeGroup toolbarGroup toolbarSindarinGroup |
-	commands := { 
-		            DSSindarinStepToMethodEntryCommand.
-		            DSSindarinStepToNextExecutionInClassCommand.
-		            DSSindarinStepToNextExecutionInObjectCommand.
-		            DSSindarinStepToNextInstanceCreation.
-		            DSSindarinStepToReturnCommand } collect: [ :class | 		         
-		            class forSpecContext: stDebuggerInstance ].
-
-	codeGroup := self debuggerCodeCommandGroupFor: rootCommandGroup.
-	commands do: [ :c | codeGroup register: c ].
-
-	toolbarSindarinGroup := CmCommandGroup forSpec
-			beToolbarPopoverButton;
-			name: 'Advanced';
-			icon: (stDebuggerInstance application iconNamed: #smallDebugIt);
-			yourself.
-	(self debuggerToolbarCommandGroupFor: rootCommandGroup) register: toolbarSindarinGroup.
-	commands do: [ :c | toolbarSindarinGroup register: c ].
-]
-
-{ #category : '*DebuggingSpy' }
-StDebugger class >> executionCommandGroupIn: rootCommandGroup [
-
-	^ rootCommandGroup / StDebuggerToolbarCommandTreeBuilder groupName
-	  /
-	  StDebuggerToolbarCommandTreeBuilder basicNew
-		  executionControlGroupName
-]
-
-{ #category : '*DebuggingSpy' }
-StDebugger class >> instrumentCommandsWith: stDebuggerInstance forRoot: rootCommandGroup [
-
-	<extensionCommands>
-	DSSpy recordingSession ifTrue: [ self buildInstrumentedCommandsWith: stDebuggerInstance forRoot: rootCommandGroup ]
-]
-
-{ #category : '*DebuggingSpy' }
-StDebugger class >> replaceSubclass: ec inCommanderGroup: toolbarGroup [
-
-	| subcls |
-	subcls := ec allSubclasses.
-	subcls isEmpty ifTrue: [ ^ self ].
-	self
-		transformDebuggerCommandNamed: ec defaultName
-		as: subcls first
-		in: toolbarGroup entries
-]
-
-{ #category : '*DebuggingSpy' }
-StDebugger class >> specCommandNamed: aString inGroup: aGroup [
-
-	^ aGroup detect: [ :c | c decoratedCommand name = aString ]
-]
-
-{ #category : '*DebuggingSpy' }
-StDebugger class >> transformDebuggerCommandNamed: aDebuggerCommandUniqueName as: aDSDebuggerCommand in: aDebuggerCommandGroup [
-
-	| originalCommand |
-	originalCommand := self
-		                   specCommandNamed: aDebuggerCommandUniqueName
-		                   inGroup: aDebuggerCommandGroup.
-	originalCommand decoratedCommand:
-		(aDSDebuggerCommand forContext: originalCommand context)
-]

From c99c05a01b62713cbeede41fa2ba60b8a20780af Mon Sep 17 00:00:00 2001
From: Jules Boulet <julesboulet2000@gmail.com>
Date: Fri, 23 Jan 2026 16:50:50 +0100
Subject: [PATCH 49/49] fix: change sindarin instrumentation

---
 DebuggingSpy/DSSpyInstrumenter.class.st | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/DebuggingSpy/DSSpyInstrumenter.class.st b/DebuggingSpy/DSSpyInstrumenter.class.st
index 195ac39..63aa0f6 100644
--- a/DebuggingSpy/DSSpyInstrumenter.class.st
+++ b/DebuggingSpy/DSSpyInstrumenter.class.st
@@ -57,7 +57,7 @@ DSSpyInstrumenter >> instrumentDebugIt [
 	SpCodePrintItCommand link: DSDebugItRecord link toAST: (SpCodeDebugItCommand >> #execute) ast
 ]
 
-{ #category : 'interactions' }
+{ #category : 'debugger' }
 DSSpyInstrumenter >> instrumentDebuggerCommands [
 	"Instruments different debugIt methods"
 
@@ -150,17 +150,12 @@ DSSpyInstrumenter >> instrumentSendersActions [
 	SpBrowseSendersCommand link: DSSendersRecord link toAST: (SpBrowseSendersCommand >> #execute) ast
 ]
 
-{ #category : 'interactions' }
+{ #category : 'debugger' }
 DSSpyInstrumenter >> instrumentSindarinCommands [
 	"Instruments different debugIt methods"
 
 	SindarinStepToMethodEntryCommand link: DSStepActionRecord link toAST: (SindarinStepToMethodEntryCommand >> #execute) ast.
-	SindarinStepToNextExecutionInClassCommand
-		link: DSStepActionRecord link
-		toAST: (SindarinStepToNextExecutionInClassCommand >> #execute) ast.
-	SindarinStepToNextExecutionInObjectCommand
-		link: DSStepActionRecord link
-		toAST: (SindarinStepToNextExecutionInObjectCommand >> #execute) ast.
+	SindarinStepToNextExecutionCommand link: DSStepActionRecord link toAST: (SindarinStepToNextExecutionCommand >> #execute) ast.
 	SindarinStepToNextInstanceCreation link: DSStepActionRecord link toAST: (SindarinStepToNextInstanceCreation >> #execute) ast.
 	SindarinStepToReturnCommand link: DSStepActionRecord link toAST: (SindarinStepToReturnCommand >> #execute) ast
 ]
@@ -188,7 +183,7 @@ DSSpyInstrumenter >> instrumentSystem [
 	self instrumentExceptionSignalling
 ]
 
-{ #category : 'debugpoints  ' }
+{ #category : 'debugpoints' }
 DSSpyInstrumenter >> listenToDebugPointChanges [
 	"Listen to the announcements link to debugPoints modification and record the event"