diff --git a/mcp_examples/pubspec.yaml b/mcp_examples/pubspec.yaml
index a064d98d..3cf8518a 100644
--- a/mcp_examples/pubspec.yaml
+++ b/mcp_examples/pubspec.yaml
@@ -1,8 +1,9 @@
 name: dart_mcp_examples
 description: Examples for the Dart MCP package.
 publish_to: none
-version: 0.0.1
+version: 0.1.0
 
+resolution: workspace
 environment:
   sdk: ^3.7.0
 
@@ -10,11 +11,7 @@ dependencies:
   args: ^2.7.0
   async: ^2.13.0
   cli_util: ^0.4.2
-  dart_mcp: ^0.2.0
+  dart_mcp: ^0.4.0-wip
   google_generative_ai: ^0.4.7
   path: ^1.9.1
   stream_channel: ^2.1.4
-
-dependency_overrides:
-  dart_mcp:
-    path: ../pkgs/dart_mcp
diff --git a/pkgs/dart_mcp/pubspec.yaml b/pkgs/dart_mcp/pubspec.yaml
index 04a31543..d7fd77e1 100644
--- a/pkgs/dart_mcp/pubspec.yaml
+++ b/pkgs/dart_mcp/pubspec.yaml
@@ -1,20 +1,21 @@
 name: dart_mcp
-version: 0.3.4-wip
+version: 0.4.0-wip
 description: A package for making MCP servers and clients.
 repository: https://github.com/dart-lang/ai/tree/main/pkgs/dart_mcp
 issue_tracker: https://github.com/dart-lang/ai/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Adart_mcp
 
+resolution: workspace
 environment:
   sdk: ^3.7.0
 
 dependencies:
   async: ^2.13.0
   collection: ^1.19.1
-  json_rpc_2: ">=3.0.3 <5.0.0"
+  json_rpc_2: ^4.0.0
   meta: ^1.16.0
   stream_channel: ^2.1.4
   stream_transform: ^2.1.1
 
 dev_dependencies:
   dart_flutter_team_lints: ^3.2.1
-  test: ^1.25.15
+  test: ^1.26.1
diff --git a/pkgs/dart_mcp_server/pubspec.yaml b/pkgs/dart_mcp_server/pubspec.yaml
index c7346639..6c665f7c 100644
--- a/pkgs/dart_mcp_server/pubspec.yaml
+++ b/pkgs/dart_mcp_server/pubspec.yaml
@@ -3,6 +3,7 @@ description: >-
   An MCP server for Dart projects, exposing various developer tools to AI
   models.
 publish_to: none
+resolution: workspace
 environment:
   sdk: ^3.9.0-163.0.dev
 
@@ -13,7 +14,7 @@ dependencies:
   args: ^2.7.0
   async: ^2.13.0
   collection: ^1.19.1
-  dart_mcp: ^0.3.3
+  dart_mcp: ^0.4.0-wip
   dds_service_extensions: ^2.0.1
   devtools_shared: ^12.0.0
   dtd: ^4.0.0
@@ -43,10 +44,6 @@ dev_dependencies:
   analyzer: ^7.5.2
   dart_flutter_team_lints: ^3.2.1
   pub_semver: ^2.2.0
-  test: ^1.25.15
+  test: ^1.26.1
   test_descriptor: ^2.0.2
   test_process: ^2.1.1
-
-dependency_overrides:
-  dart_mcp:
-    path: ../dart_mcp
diff --git a/pkgs/dart_mcp_server/test_fixtures/counter_app/pubspec.yaml b/pkgs/dart_mcp_server/test_fixtures/counter_app/pubspec.yaml
index 47bd867d..a8e6d24b 100644
--- a/pkgs/dart_mcp_server/test_fixtures/counter_app/pubspec.yaml
+++ b/pkgs/dart_mcp_server/test_fixtures/counter_app/pubspec.yaml
@@ -1,8 +1,11 @@
 name: counter_app
 description: "A new Flutter project."
-publish_to: 'none'
+publish_to: "none"
 version: 0.1.0-wip
 
+# As this is a flutter project we exclude it from the workspace.
+# This avoids making flutter SDK a dependency during development.
+# resolution: workspace
 environment:
   sdk: ^3.6.1
 
diff --git a/pkgs/dart_mcp_server/test_fixtures/dart_cli_app/pubspec.yaml b/pkgs/dart_mcp_server/test_fixtures/dart_cli_app/pubspec.yaml
index d4bd315c..8cd45c7e 100644
--- a/pkgs/dart_mcp_server/test_fixtures/dart_cli_app/pubspec.yaml
+++ b/pkgs/dart_mcp_server/test_fixtures/dart_cli_app/pubspec.yaml
@@ -1,4 +1,5 @@
 name: example_dart_cli_app
 publish_to: none
+resolution: workspace
 environment:
   sdk: ^3.7.0
diff --git a/pubspec.yaml b/pubspec.yaml
new file mode 100644
index 00000000..a356072a
--- /dev/null
+++ b/pubspec.yaml
@@ -0,0 +1,15 @@
+name: _
+publish_to: none
+
+environment:
+  sdk: ^3.6.1
+
+workspace:
+  - mcp_examples/
+  - pkgs/dart_mcp/
+  - pkgs/dart_mcp_server/
+  - pkgs/dart_mcp_server/test_fixtures/dart_cli_app/
+# The flutter counter_app is excluded from workspace
+# This avoids making flutter SDK a dependency during
+# development.
+# - pkgs/dart_mcp_server/test_fixtures/counter_app/