From 7fd9c9923e07f1a9c6da23080d5b93e2e479d1a4 Mon Sep 17 00:00:00 2001
From: barry01_hash <henryebube62@gmail.com>
Date: Tue, 2 Jun 2026 12:02:14 +0100
Subject: [PATCH 1/2] docs: add README table of contents

---
 CHANGELOG.md            |  4 +--
 CONTRIBUTING.md         |  2 +-
 Cargo.toml              |  4 +--
 README.md               | 70 ++++++++++++++++++++++++++++++++---------
 cliff.toml              |  6 ++--
 docs/getting-started.md |  2 +-
 docs/plugin-api.md      |  2 +-
 7 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6f7450c..3ae73469 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,5 +38,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Basic test coverage
 - Contribution guidelines
 
-[Unreleased]: https://github.com/Timi16/soroban-debugger/compare/v0.1.0...HEAD
-[0.1.0]: https://github.com/Timi16/soroban-debugger/releases/tag/v0.1.0
+[Unreleased]: https://github.com/barry01-hash/soroban-debugger/compare/v0.1.0...HEAD
+[0.1.0]: https://github.com/barry01-hash/soroban-debugger/releases/tag/v0.1.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 36430b7a..048e2396 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -78,7 +78,7 @@ cd soroban-debugger
 3. **Add the upstream remote**:
 
 ```bash
-git remote add upstream https://github.com/Timi16/soroban-debugger.git
+git remote add upstream https://github.com/barry01-hash/soroban-debugger.git
 ```
 
 4. **Create a branch** for your work:
diff --git a/Cargo.toml b/Cargo.toml
index 6f5533e2..3bc00849 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,8 +11,8 @@ version = "0.1.0"
 edition = "2021"
 authors = ["Soroban Debugger Contributors"]
 description = "A debugging tool for Soroban smart contracts"
-repository = "https://github.com/Timi16/soroban-debugger"
-homepage = "https://github.com/Timi16/soroban-debugger"
+repository = "https://github.com/barry01-hash/soroban-debugger"
+homepage = "https://github.com/barry01-hash/soroban-debugger"
 documentation = "https://docs.rs/soroban-debugger"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
diff --git a/README.md b/README.md
index e5a08a0e..055f9f14 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,52 @@
 # Soroban Debugger
 
-[![CI](https://github.com/Timi16/soroban-debugger/actions/workflows/ci.yml/badge.svg)](https://github.com/Timi16/soroban-debugger/actions/workflows/ci.yml)
-[![codecov](https://codecov.io/gh/Timi16/soroban-debugger/branch/main/graph/badge.svg)](https://codecov.io/gh/Timi16/soroban-debugger)
-[![Latest Release](https://img.shields.io/github/v/release/Timi16/soroban-debugger?logo=github)](https://github.com/Timi16/soroban-debugger/releases)
+[![CI](https://github.com/barry01-hash/soroban-debugger/actions/workflows/ci.yml/badge.svg)](https://github.com/barry01-hash/soroban-debugger/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/barry01-hash/soroban-debugger/branch/main/graph/badge.svg)](https://codecov.io/gh/barry01-hash/soroban-debugger)
+[![Latest Release](https://img.shields.io/github/v/release/barry01-hash/soroban-debugger?logo=github)](https://github.com/barry01-hash/soroban-debugger/releases)
 
 A command-line debugger for Soroban smart contracts on the Stellar network. Debug your contracts interactively with breakpoints, step-through execution, state inspection, and budget tracking.
 
-Check out the [Getting Started Guide](https://github.com/Timi16/soroban-debugger/blob/main/docs/getting-started.md) to begin debugging in under 10 minutes, or see the [FAQ](https://github.com/Timi16/soroban-debugger/blob/main/docs/faq.md) for help with common issues.
+Check out the [Getting Started Guide](docs/getting-started.md) to begin debugging in under 10 minutes, or see the [FAQ](docs/faq.md) for help with common issues.
+
+## Table of Contents
+
+- [Features](#features)
+- [Installation](#installation)
+- [Installation - From Source](#from-source)
+- [Installation - Using Cargo](#using-cargo)
+- [Installation - Man Page](#man-page)
+- [Quick Start](#quick-start)
+- [Quick Start - Basic Usage](#basic-usage)
+- [Quick Start - Complex Argument Types](#complex-argument-types)
+- [Quick Start - Interactive Mode](#interactive-mode)
+- [Commands](#commands)
+- [Commands - Run Command](#run-command)
+- [Commands - Server Command](#server-command)
+- [Commands - Automatic Test Generation](#automatic-test-generation)
+- [Commands - Watch Mode](#watch-mode)
+- [Commands - Batch Execution](#batch-execution)
+- [Commands - Storage Filtering](#storage-filtering)
+- [Commands - Interactive Command](#interactive-command)
+- [Commands - Inspect Command](#inspect-command)
+- [Commands - Completions Command](#completions-command)
+- [Commands - Compare Command](#compare-command)
+- [Examples](#examples)
+- [Supported Argument Types](#supported-argument-types)
+- [Interactive Commands Reference](#interactive-commands-reference)
+- [Configuration File](#configuration-file)
+- [Accessibility](#accessibility)
+- [Use Cases](#use-cases)
+- [Project Structure](#project-structure)
+- [Development](#development)
+- [Benchmarks](#benchmarks)
+- [Requirements](#requirements)
+- [Contributing](#contributing)
+- [License](#license)
+- [Resources](#resources)
+- [Acknowledgments](#acknowledgments)
+- [Docker](#docker)
+- [Guides](#guides)
+- [JSON Output Mode](#json-output-mode)
 
 
 ## Features
@@ -27,7 +67,7 @@ Check out the [Getting Started Guide](https://github.com/Timi16/soroban-debugger
 ### From Source
 
 ```bash
-git clone https://github.com/Timi16/soroban-debugger.git
+git clone https://github.com/barry01-hash/soroban-debugger.git
 cd soroban-debugger
 cargo install --path .
 ```
@@ -182,7 +222,7 @@ soroban-debug run \
   --watch
 ```
 
-Perfect for development - edit your contract, rebuild, and see results immediately. See [docs/watch-mode.md](https://github.com/Timi16/soroban-debugger/blob/main/docs/watch-mode.md) for details.
+Perfect for development - edit your contract, rebuild, and see results immediately. See [docs/watch-mode.md](docs/watch-mode.md) for details.
 
 ### Batch Execution
 
@@ -212,7 +252,7 @@ The batch args file should contain a JSON array of test cases:
 ]
 ```
 
-See [docs/batch-execution.md](https://github.com/Timi16/soroban-debugger/blob/main/docs/batch-execution.md) for detailed documentation.
+See [docs/batch-execution.md](docs/batch-execution.md) for detailed documentation.
 
 ### Storage Filtering
 
@@ -329,7 +369,7 @@ Options:
       --dependency-graph     Export cross-contract dependency graph (DOT + Mermaid)
 ```
 
-For full examples, see [docs/dependency-graph.md](https://github.com/Timi16/soroban-debugger/blob/main/docs/dependency-graph.md).
+For full examples, see [docs/dependency-graph.md](docs/dependency-graph.md).
 
 ### Completions Command
 
@@ -390,7 +430,7 @@ soroban-debug compare examples/trace_a.json examples/trace_b.json
 soroban-debug compare baseline.json new.json --output diff_report.txt
 ```
 
-See [`doc/compare.md`](https://github.com/Timi16/soroban-debugger/blob/main/docs/doc/compare.md) for the full trace JSON format reference
+See [`doc/compare.md`](docs/doc/compare.md) for the full trace JSON format reference
 and a regression testing workflow guide.
 
 ## Examples
@@ -654,7 +694,7 @@ soroban-debugger/
 ### Building from Source
 
 ```bash
-git clone https://github.com/Timi16/soroban-debugger.git
+git clone https://github.com/barry01-hash/soroban-debugger.git
 cd soroban-debugger
 cargo build --release
 ```
@@ -704,7 +744,7 @@ Benchmarks are run automatically in CI to ensure performance stays within accept
 
 ## Contributing
 
-Contributions are welcome. Please see [CONTRIBUTING.md](https://github.com/Timi16/soroban-debugger/blob/main/CONTRIBUTING.md) for setup, workflow, code style, and PR guidelines.
+Contributions are welcome. Please see [CONTRIBUTING.md](CONTRIBUTING.md) for setup, workflow, code style, and PR guidelines.
 
 <!-- ## Roadmap
 
@@ -738,11 +778,11 @@ at your option.
 
 ## Resources
 
-- [FAQ](https://github.com/Timi16/soroban-debugger/blob/main/docs/faq.md) - Common problems and workarounds
+- [FAQ](docs/faq.md) - Common problems and workarounds
 - Soroban Documentation: https://soroban.stellar.org/docs
 - Stellar Developer Discord: https://discord.gg/stellardev
-- Issue Tracker: https://github.com/Timi16/soroban-debugger/issues
-- [CHANGELOG](https://github.com/Timi16/soroban-debugger/blob/main/CHANGELOG.md) - Release history and changes
+- Issue Tracker: https://github.com/barry01-hash/soroban-debugger/issues
+- [CHANGELOG](CHANGELOG.md) - Release history and changes
 
 ## Acknowledgments
 
@@ -775,7 +815,7 @@ docker compose run --rm soroban-debug run --contract /contracts/token.wasm --fun
 ```
 ## Guides
 
-- [Writing Budget-Efficient Soroban Contracts](https://github.com/Timi16/soroban-debugger/blob/main/docs/optimization-guide.md)
+- [Writing Budget-Efficient Soroban Contracts](docs/optimization-guide.md)
 
 
 
diff --git a/cliff.toml b/cliff.toml
index e0e65922..8b1b729a 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -22,7 +22,7 @@ body = """
 {% for group, commits in commits | group_by(attribute="group") %}
 ### {{ group | striptags | trim }}
 {% for commit in commits %}
-- {{ commit.message | striptags | first_line }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/Timi16/soroban-debugger/commit/{{ commit.id }}))
+- {{ commit.message | striptags | first_line }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/barry01-hash/soroban-debugger/commit/{{ commit.id }}))
 {% endfor %}
 {% endfor %}
 """
@@ -51,6 +51,6 @@ filter_commits = []
 [基石]
 # Link replacement rules
 link_parsers = [
-    { pattern = "#(\\d+)", replace = "[#${1}](https://github.com/Timi16/soroban-debugger/issues/${1})" },
-    { pattern = "([0-9a-f]{7})[0-9a-f]*", replace = "[${1}](https://github.com/Timi16/soroban-debugger/commit/${1})" },
+    { pattern = "#(\\d+)", replace = "[#${1}](https://github.com/barry01-hash/soroban-debugger/issues/${1})" },
+    { pattern = "([0-9a-f]{7})[0-9a-f]*", replace = "[${1}](https://github.com/barry01-hash/soroban-debugger/commit/${1})" },
 ]
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 525ec5a8..e3643675 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -17,7 +17,7 @@ cargo install soroban-debugger
 
 ### Option B: Download Pre-built Binaries
 
-Download the latest binary for your operating system from the [GitHub Releases](https://github.com/Timi16/soroban-debugger/releases) page. Extract the archive and add the `soroban-debug` executable to your system's PATH.
+Download the latest binary for your operating system from the [GitHub Releases](https://github.com/barry01-hash/soroban-debugger/releases) page. Extract the archive and add the `soroban-debug` executable to your system's PATH.
 
 ---
 
diff --git a/docs/plugin-api.md b/docs/plugin-api.md
index a17eb6d8..7570d1dc 100644
--- a/docs/plugin-api.md
+++ b/docs/plugin-api.md
@@ -699,4 +699,4 @@ Check `min_debugger_version` in your manifest to specify the minimum required de
 
 - [Example Logger Plugin](../examples/plugins/example_logger/)
 - [Plugin API Reference](https://docs.rs/soroban-debugger/latest/soroban_debugger/plugin/)
-- [GitHub Issues](https://github.com/Timi16/soroban-debugger/issues)
+- [GitHub Issues](https://github.com/barry01-hash/soroban-debugger/issues)

From cc2514a5ae2a6d3770afb9380d1944a9e84bf7cc Mon Sep 17 00:00:00 2001
From: barry01_hash <henryebube62@gmail.com>
Date: Tue, 2 Jun 2026 12:12:11 +0100
Subject: [PATCH 2/2] fix: restore protocol compatibility

---
 src/plugin/registry.rs     | 116 ++++++++++++++++++++++++++++---------
 src/server/debug_server.rs |   7 ++-
 src/server/protocol.rs     |  13 +++--
 3 files changed, 102 insertions(+), 34 deletions(-)

diff --git a/src/plugin/registry.rs b/src/plugin/registry.rs
index 473e14d8..6070b694 100644
--- a/src/plugin/registry.rs
+++ b/src/plugin/registry.rs
@@ -1,6 +1,7 @@
 use super::api::{OutputFormatter, PluginCommand, PluginError, PluginResult};
 use super::events::{
-    EventContext, ExecutionEvent, PluginInvocationKind, PluginInvocationOutcome, PluginTelemetryEvent,
+    EventContext, ExecutionEvent, PluginInvocationKind, PluginInvocationOutcome,
+    PluginTelemetryEvent,
 };
 use super::loader::{LoadedPlugin, PluginLoader, PluginTrustPolicy};
 use std::collections::{HashMap, HashSet, VecDeque};
@@ -413,7 +414,9 @@ impl PluginRegistry {
             .insert(name.clone(), Arc::new(RwLock::new(plugin)));
         self.health
             .write()
-            .map_err(|_| PluginError::ExecutionFailed("Failed to update plugin health".to_string()))?
+            .map_err(|_| {
+                PluginError::ExecutionFailed("Failed to update plugin health".to_string())
+            })?
             .insert(name, PluginHealth::default());
         Ok(())
     }
@@ -439,7 +442,9 @@ impl PluginRegistry {
 
         let names: Vec<String> = self.plugins.keys().cloned().collect();
         for name in names {
-            let Some(plugin_arc) = self.plugins.get(&name) else { continue };
+            let Some(plugin_arc) = self.plugins.get(&name) else {
+                continue;
+            };
             let mut health = match self.health.write() {
                 Ok(health) => health,
                 Err(_) => {
@@ -600,7 +605,9 @@ impl PluginRegistry {
     pub fn execute_command(&self, command: &str, args: &[String]) -> PluginResult<Option<String>> {
         let names: Vec<String> = self.plugins.keys().cloned().collect();
         for name in names {
-            let Some(plugin_arc) = self.plugins.get(&name) else { continue };
+            let Some(plugin_arc) = self.plugins.get(&name) else {
+                continue;
+            };
             {
                 let plugin = plugin_arc.read().map_err(|_| {
                     PluginError::ExecutionFailed(format!("Failed to acquire plugin lock: {}", name))
@@ -608,7 +615,12 @@ impl PluginRegistry {
                 if !plugin.manifest().capabilities.provides_commands {
                     continue;
                 }
-                if !plugin.plugin().commands().iter().any(|cmd| cmd.name == command) {
+                if !plugin
+                    .plugin()
+                    .commands()
+                    .iter()
+                    .any(|cmd| cmd.name == command)
+                {
                     continue;
                 }
             }
@@ -616,7 +628,8 @@ impl PluginRegistry {
             let mut health = self.health.write().map_err(|_| {
                 PluginError::ExecutionFailed("Failed to update plugin health".to_string())
             })?;
-            let result = self.run_command_with_policy(&mut health, &name, plugin_arc, command, args)?;
+            let result =
+                self.run_command_with_policy(&mut health, &name, plugin_arc, command, args)?;
             return Ok(Some(result));
         }
 
@@ -626,7 +639,9 @@ impl PluginRegistry {
     pub fn format_output(&self, formatter: &str, data: &str) -> PluginResult<Option<String>> {
         let names: Vec<String> = self.plugins.keys().cloned().collect();
         for name in names {
-            let Some(plugin_arc) = self.plugins.get(&name) else { continue };
+            let Some(plugin_arc) = self.plugins.get(&name) else {
+                continue;
+            };
             {
                 let plugin = plugin_arc.read().map_err(|_| {
                     PluginError::ExecutionFailed(format!("Failed to acquire plugin lock: {}", name))
@@ -634,7 +649,12 @@ impl PluginRegistry {
                 if !plugin.manifest().capabilities.provides_formatters {
                     continue;
                 }
-                if !plugin.plugin().formatters().iter().any(|fmt| fmt.name == formatter) {
+                if !plugin
+                    .plugin()
+                    .formatters()
+                    .iter()
+                    .any(|fmt| fmt.name == formatter)
+                {
                     continue;
                 }
             }
@@ -675,7 +695,9 @@ impl PluginRegistry {
             let mut plugin = plugin_arc.write().map_err(|_| {
                 PluginError::ExecutionFailed(format!("Failed to acquire plugin lock: {}", name))
             })?;
-            catch_unwind(AssertUnwindSafe(|| plugin.plugin_mut().on_event(event, context)))
+            catch_unwind(AssertUnwindSafe(|| {
+                plugin.plugin_mut().on_event(event, context)
+            }))
         };
         self.record_outcome(
             health,
@@ -684,7 +706,9 @@ impl PluginRegistry {
             PluginInvocationKind::Hook,
             self.policy.hook_timeout,
             start.elapsed(),
-            result.map_err(|_| PluginError::ExecutionFailed("Plugin panicked during hook execution".to_string())),
+            result.map_err(|_| {
+                PluginError::ExecutionFailed("Plugin panicked during hook execution".to_string())
+            }),
         )
     }
 
@@ -708,7 +732,9 @@ impl PluginRegistry {
             let mut plugin = plugin_arc.write().map_err(|_| {
                 PluginError::ExecutionFailed(format!("Failed to acquire plugin lock: {}", name))
             })?;
-            catch_unwind(AssertUnwindSafe(|| plugin.plugin_mut().execute_command(command, args)))
+            catch_unwind(AssertUnwindSafe(|| {
+                plugin.plugin_mut().execute_command(command, args)
+            }))
         };
         self.record_outcome(
             health,
@@ -717,7 +743,9 @@ impl PluginRegistry {
             PluginInvocationKind::Command,
             self.policy.command_timeout,
             start.elapsed(),
-            result.map_err(|_| PluginError::ExecutionFailed("Plugin panicked during command execution".to_string())),
+            result.map_err(|_| {
+                PluginError::ExecutionFailed("Plugin panicked during command execution".to_string())
+            }),
         )
     }
 
@@ -741,7 +769,9 @@ impl PluginRegistry {
             let plugin = plugin_arc.write().map_err(|_| {
                 PluginError::ExecutionFailed(format!("Failed to acquire plugin lock: {}", name))
             })?;
-            catch_unwind(AssertUnwindSafe(|| plugin.plugin().format_output(formatter, data)))
+            catch_unwind(AssertUnwindSafe(|| {
+                plugin.plugin().format_output(formatter, data)
+            }))
         };
         self.record_outcome(
             health,
@@ -750,7 +780,11 @@ impl PluginRegistry {
             PluginInvocationKind::Formatter,
             self.policy.formatter_timeout,
             start.elapsed(),
-            result.map_err(|_| PluginError::ExecutionFailed("Plugin panicked during formatter execution".to_string())),
+            result.map_err(|_| {
+                PluginError::ExecutionFailed(
+                    "Plugin panicked during formatter execution".to_string(),
+                )
+            }),
         )
     }
 
@@ -806,7 +840,7 @@ impl PluginRegistry {
                 }
                 Err(err)
             }
-            Ok(Ok(value)) if elapsed > timeout => {
+            Ok(Ok(_value)) if elapsed > timeout => {
                 state.total_timeouts += 1;
                 state.total_failures += 1;
                 state.timeout_count += 1;
@@ -871,7 +905,10 @@ impl PluginRegistry {
     }
 
     fn circuit_open(health: &HashMap<String, PluginHealth>, name: &str) -> bool {
-        health.get(name).map(|state| state.circuit_open).unwrap_or(false)
+        health
+            .get(name)
+            .map(|state| state.circuit_open)
+            .unwrap_or(false)
     }
 }
 
@@ -965,7 +1002,11 @@ mod tests {
         }
 
         fn next_behavior(queue: &Arc<Mutex<VecDeque<Behavior>>>) -> Behavior {
-            queue.lock().unwrap().pop_front().unwrap_or(Behavior::Success)
+            queue
+                .lock()
+                .unwrap()
+                .pop_front()
+                .unwrap_or(Behavior::Success)
         }
     }
 
@@ -974,7 +1015,11 @@ mod tests {
             self.manifest.clone()
         }
 
-        fn on_event(&mut self, _event: &ExecutionEvent, _context: &mut EventContext) -> PluginResult<()> {
+        fn on_event(
+            &mut self,
+            _event: &ExecutionEvent,
+            _context: &mut EventContext,
+        ) -> PluginResult<()> {
             match Self::next_behavior(&self.hook_behavior) {
                 Behavior::Success => Ok(()),
                 Behavior::Fail => Err(PluginError::ExecutionFailed("hook failed".to_string())),
@@ -1221,7 +1266,12 @@ mod tests {
     fn hook_failures_are_contained_and_open_circuit_after_budget() {
         let plugin = TestPlugin::new(
             "failing",
-            vec![Behavior::Fail, Behavior::Fail, Behavior::Fail, Behavior::Success],
+            vec![
+                Behavior::Fail,
+                Behavior::Fail,
+                Behavior::Fail,
+                Behavior::Success,
+            ],
             vec![],
         );
         let registry = registry_with_plugin_and_policy(
@@ -1242,10 +1292,9 @@ mod tests {
         let stats = registry.statistics();
         assert_eq!(stats.plugin_failures, 3);
         assert_eq!(stats.open_circuits, 1);
-        assert!(context.plugin_telemetry.iter().any(|entry|
-            entry.outcome == PluginInvocationOutcome::SkippedCircuitOpen
-                && entry.kind == PluginInvocationKind::Hook
-        ));
+        assert!(context.plugin_telemetry.iter().any(|entry| entry.outcome
+            == PluginInvocationOutcome::SkippedCircuitOpen
+            && entry.kind == PluginInvocationKind::Hook));
     }
 
     #[test]
@@ -1277,9 +1326,10 @@ mod tests {
         let stats = registry.statistics();
         assert_eq!(stats.plugin_timeouts, 2);
         assert_eq!(stats.open_circuits, 1);
-        assert!(context.plugin_telemetry.iter().any(|entry|
-            entry.outcome == PluginInvocationOutcome::Timeout
-        ));
+        assert!(context
+            .plugin_telemetry
+            .iter()
+            .any(|entry| entry.outcome == PluginInvocationOutcome::Timeout));
     }
 
     #[test]
@@ -1287,7 +1337,12 @@ mod tests {
         let plugin = TestPlugin::new(
             "commandy",
             vec![],
-            vec![Behavior::Fail, Behavior::Fail, Behavior::Fail, Behavior::Success],
+            vec![
+                Behavior::Fail,
+                Behavior::Fail,
+                Behavior::Fail,
+                Behavior::Success,
+            ],
         );
         let registry = registry_with_plugin_and_policy(
             plugin,
@@ -1308,7 +1363,12 @@ mod tests {
     fn successful_hook_resets_failure_streak() {
         let plugin = TestPlugin::new(
             "recovering",
-            vec![Behavior::Fail, Behavior::Success, Behavior::Fail, Behavior::Success],
+            vec![
+                Behavior::Fail,
+                Behavior::Success,
+                Behavior::Fail,
+                Behavior::Success,
+            ],
             vec![],
         );
         let registry = registry_with_plugin_and_policy(
diff --git a/src/server/debug_server.rs b/src/server/debug_server.rs
index 430733ed..76b4b2fe 100644
--- a/src/server/debug_server.rs
+++ b/src/server/debug_server.rs
@@ -116,8 +116,8 @@ impl DebugServer {
                 Err(e) => {
                     warn!("Failed to parse request: {}", e);
                     let response = DebugMessage::response(
-                        0, // ID might be unknown if parse failed, but often it's available. 
-                           // For now use 0 or try to extract it if possible.
+                        0, // ID might be unknown if parse failed, but often it's available.
+                        // For now use 0 or try to extract it if possible.
                         DebugResponse::Error {
                             message: format!("Malformed request: {}", e),
                         },
@@ -770,6 +770,9 @@ impl DebugServer {
                 },
                 DebugRequest::Ping => DebugResponse::Pong,
                 DebugRequest::Disconnect => DebugResponse::Disconnected,
+                DebugRequest::Unknown => DebugResponse::Error {
+                    message: "Unsupported request type".to_string(),
+                },
             };
 
             let response = DebugMessage::response(message.id, response);
diff --git a/src/server/protocol.rs b/src/server/protocol.rs
index 6376934e..2f92cf80 100644
--- a/src/server/protocol.rs
+++ b/src/server/protocol.rs
@@ -94,6 +94,8 @@ pub struct DynamicTraceEvent {
     pub message: String,
     pub caller: Option<String>,
     pub function: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub call_depth: Option<usize>,
     pub storage_key: Option<String>,
     pub storage_value: Option<String>,
 }
@@ -375,9 +377,8 @@ impl DebugMessage {
     /// Parse a JSON string into a DebugMessage with field-aware error reporting.
     pub fn parse(json: &str) -> std::result::Result<Self, String> {
         let deserializer = &mut serde_json::Deserializer::from_str(json);
-        serde_path_to_error::deserialize(deserializer).map_err(|e| {
-            format!("Protocol error at '{}': {}", e.path(), e.inner())
-        })
+        serde_path_to_error::deserialize(deserializer)
+            .map_err(|e| format!("Protocol error at '{}': {}", e.path(), e.inner()))
     }
 }
 
@@ -453,7 +454,11 @@ mod tests {
             }
         }"#;
         let err = DebugMessage::parse(json).unwrap_err();
-        assert!(err.contains("request.client_version"), "Error should mention missing field: {}", err);
+        assert!(
+            err.contains("request.client_version"),
+            "Error should mention missing field: {}",
+            err
+        );
     }
 
     #[test]