From 1f1e5a88dd1a386be2152d9e7fa69392b1b7b8af Mon Sep 17 00:00:00 2001
From: Fiiranek <jellybean@onet.eu>
Date: Wed, 22 Oct 2025 18:17:08 +0200
Subject: [PATCH 1/4] Add `PartitionMessage`

---
 crates/forge/src/run_tests/messages/mod.rs    |  1 +
 .../forge/src/run_tests/messages/partition.rs | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 crates/forge/src/run_tests/messages/partition.rs

diff --git a/crates/forge/src/run_tests/messages/mod.rs b/crates/forge/src/run_tests/messages/mod.rs
index 9d28624e83..8919a4631f 100644
--- a/crates/forge/src/run_tests/messages/mod.rs
+++ b/crates/forge/src/run_tests/messages/mod.rs
@@ -1,6 +1,7 @@
 pub mod collected_tests_count;
 pub mod latest_blocks_numbers;
 pub mod overall_summary;
+pub mod partition;
 pub mod tests_failure_summary;
 pub mod tests_run;
 pub mod tests_summary;
diff --git a/crates/forge/src/run_tests/messages/partition.rs b/crates/forge/src/run_tests/messages/partition.rs
new file mode 100644
index 0000000000..122aed3688
--- /dev/null
+++ b/crates/forge/src/run_tests/messages/partition.rs
@@ -0,0 +1,33 @@
+use foundry_ui::Message;
+use serde::Serialize;
+use serde_json::{Value, json};
+
+use crate::partition::Partition;
+
+#[derive(Serialize)]
+pub struct PartitionMessage {
+    partition: Partition,
+}
+
+impl PartitionMessage {
+    #[must_use]
+    pub fn new(partition: Partition) -> Self {
+        Self { partition }
+    }
+}
+
+impl Message for PartitionMessage {
+    fn text(&self) -> String {
+        format!(
+            "Finished partition run: {}/{}",
+            self.partition.index(),
+            self.partition.total()
+        )
+    }
+
+    fn json(&self) -> Value {
+        json!({
+            "partition": format!("{}/{}", self.partition.index(), self.partition.total())
+        })
+    }
+}

From ee343c673012483354670017ebacfd9f05b8943a Mon Sep 17 00:00:00 2001
From: Fiiranek <jellybean@onet.eu>
Date: Wed, 22 Oct 2025 19:57:08 +0200
Subject: [PATCH 2/4] Use labeled message

---
 crates/forge/src/run_tests/messages/partition.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/forge/src/run_tests/messages/partition.rs b/crates/forge/src/run_tests/messages/partition.rs
index 122aed3688..2525de1a28 100644
--- a/crates/forge/src/run_tests/messages/partition.rs
+++ b/crates/forge/src/run_tests/messages/partition.rs
@@ -1,4 +1,5 @@
-use foundry_ui::Message;
+use console::style;
+use foundry_ui::{Message, components::labeled::LabeledMessage};
 use serde::Serialize;
 use serde_json::{Value, json};
 
@@ -18,16 +19,15 @@ impl PartitionMessage {
 
 impl Message for PartitionMessage {
     fn text(&self) -> String {
-        format!(
-            "Finished partition run: {}/{}",
-            self.partition.index(),
-            self.partition.total()
+        let styled_label = style("Finished partition run:").bold().to_string();
+        LabeledMessage::new(
+            &styled_label,
+            &format!("{}/{}", self.partition.index(), self.partition.total()),
         )
+        .text()
     }
 
     fn json(&self) -> Value {
-        json!({
-            "partition": format!("{}/{}", self.partition.index(), self.partition.total())
-        })
+        json!(self)
     }
 }

From 29ff138deb6201b9c83b7ca30b5bfcff93b97f7e Mon Sep 17 00:00:00 2001
From: Fiiranek <jellybean@onet.eu>
Date: Wed, 22 Oct 2025 20:00:13 +0200
Subject: [PATCH 3/4] Fix label

---
 crates/forge/src/run_tests/messages/partition.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/forge/src/run_tests/messages/partition.rs b/crates/forge/src/run_tests/messages/partition.rs
index 2525de1a28..c416f64b31 100644
--- a/crates/forge/src/run_tests/messages/partition.rs
+++ b/crates/forge/src/run_tests/messages/partition.rs
@@ -19,7 +19,7 @@ impl PartitionMessage {
 
 impl Message for PartitionMessage {
     fn text(&self) -> String {
-        let styled_label = style("Finished partition run:").bold().to_string();
+        let styled_label = style("Finished partition run").bold().to_string();
         LabeledMessage::new(
             &styled_label,
             &format!("{}/{}", self.partition.index(), self.partition.total()),

From 3c66b6451cb87e1966a05ff9d0415a7b8e4f8f81 Mon Sep 17 00:00:00 2001
From: Fiiranek <jellybean@onet.eu>
Date: Mon, 27 Oct 2025 11:17:22 +0100
Subject: [PATCH 4/4] Change "Started" -> "Running"

---
 crates/forge/src/run_tests/messages/partition_started.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/forge/src/run_tests/messages/partition_started.rs b/crates/forge/src/run_tests/messages/partition_started.rs
index 39ac2d4365..3d023c9d64 100644
--- a/crates/forge/src/run_tests/messages/partition_started.rs
+++ b/crates/forge/src/run_tests/messages/partition_started.rs
@@ -19,7 +19,7 @@ impl PartitionStartedMessage {
 
 impl Message for PartitionStartedMessage {
     fn text(&self) -> String {
-        let styled_label = style("Started partition run").bold().to_string();
+        let styled_label = style("Running partition run").bold().to_string();
         LabeledMessage::new(
             &styled_label,
             &format!("{}/{}", self.partition.index, self.partition.total),