feenkcom
diff --git a/‎src/Gt4LlmCore/GtLOnDemandMcpServer.class.st‎
Lines changed: 23 additions & 9 deletions b/‎src/Gt4LlmCore/GtLOnDemandMcpServer.class.st‎
Lines changed: 23 additions & 9 deletions
diff --git a/‎src/Gt4LlmCore/GtLOnDemandMcpServerExamples.class.st‎
Lines changed: 1 addition & 1 deletion b/‎src/Gt4LlmCore/GtLOnDemandMcpServerExamples.class.st‎
Lines changed: 1 addition & 1 deletion
@@ -18,6 +18,22 @@ GtLOnDemandMcpServer class >> onRemoveUniqueInstance: anInstance [
 	anInstance onRemovedAsUniqueInstance
 ]
 
+{ #category : #accessing }
+GtLOnDemandMcpServer class >> uniqueInstance [
+	^ uniqueInstance ifNil: [ uniqueInstance := self new start ]
+]
+
+{ #category : #accessing }
+GtLOnDemandMcpServer class >> uniqueInstanceOnPort: anInteger [
+
+	(self hasUniqueInstance and: [ self uniqueInstance port ~= anInteger ]) ifTrue:
+		[ self error: 'An instance on port ', self uniqueInstance port asString, ' already started' ].
+	^ uniqueInstance ifNil: 
+		[ uniqueInstance := self new
+				port: anInteger;
+				start ]
+]
+
 { #category : #private }
 GtLOnDemandMcpServer >> findAvailablePort [
 	| socket |
@@ -26,12 +42,6 @@ GtLOnDemandMcpServer >> findAvailablePort [
 		ensure: [ socket ifNotNil: [ socket closeAndDestroy ] ]
 ]
 
-{ #category : #initialization }
-GtLOnDemandMcpServer >> initialize [
-	super initialize.
-	self start
-]
-
 { #category : #testing }
 GtLOnDemandMcpServer >> isRunning [
 	^ server notNil and: [ server isRunning ]
@@ -49,7 +59,12 @@ GtLOnDemandMcpServer >> onRemovedAsUniqueInstance [
 
 { #category : #accessing }
 GtLOnDemandMcpServer >> port [
-	^ port
+	^ port ifNil: [ port := self findAvailablePort ]
+]
+
+{ #category : #accessing }
+GtLOnDemandMcpServer >> port: anInteger [
+	port := anInteger
 ]
 
 { #category : #accessing }
@@ -60,9 +75,8 @@ GtLOnDemandMcpServer >> server [
 { #category : #starting }
 GtLOnDemandMcpServer >> start [
 	self isRunning ifTrue: [ ^ self ].
-	port := self findAvailablePort.
 	server := GtLMcpServer new
-		port: port;
+		port: self port;
 		addTools: GtLTools gt;
 		start.
 	GtLOnDemandMcpServerStartupSignal new
 
@@ -11,7 +11,7 @@ Class {
 GtLOnDemandMcpServerExamples >> runningServer [
 	<gtExample>
 	| onDemandServer |
-	onDemandServer := GtLOnDemandMcpServer new.
+	onDemandServer := GtLOnDemandMcpServer new start.
 	[ self assert: onDemandServer isRunning.
 	self assert: onDemandServer port > 0.
 	self assert: onDemandServer server tools isEmpty not ]