diff --git a/agentscope-examples/documentation/pom.xml b/agentscope-examples/documentation/pom.xml
index 74a19e18c3..40cc44f79f 100644
--- a/agentscope-examples/documentation/pom.xml
+++ b/agentscope-examples/documentation/pom.xml
@@ -177,4 +177,15 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Declared without executions so the spring-boot:run prefix resolves; the default lifecycle is unaffected -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/channel/ChannelSendExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/channel/ChannelSendExample.java
index c792f008d1..decbdf8165 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/channel/ChannelSendExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/channel/ChannelSendExample.java
@@ -38,7 +38,7 @@
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
  *   mvn exec:java -pl agentscope-examples/documentation \
- *       -Dexec.mainClass=io.agentscope.examples.documentation2.harness.GatewayBasicExample
+ *       -Dexec.mainClass=io.agentscope.examples.documentation2.harness.channel.ChannelSendExample
  * </pre>
  */
 public class ChannelSendExample {
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/channel/GatewayMultiAgentExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/channel/GatewayMultiAgentExample.java
index 2095ce1262..8170d8e5cf 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/channel/GatewayMultiAgentExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/channel/GatewayMultiAgentExample.java
@@ -32,7 +32,7 @@
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
  *   mvn exec:java -pl agentscope-examples/documentation \
- *       -Dexec.mainClass=io.agentscope.examples.documentation2.harness.GatewayMultiAgentExample
+ *       -Dexec.mainClass=io.agentscope.examples.documentation2.harness.channel.GatewayMultiAgentExample
  * </pre>
  */
 public class GatewayMultiAgentExample {
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/subagent/SubagentSendDirectlyExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/subagent/SubagentSendDirectlyExample.java
index c73840513c..acf1c04eb8 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/subagent/SubagentSendDirectlyExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/subagent/SubagentSendDirectlyExample.java
@@ -44,7 +44,7 @@
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
  *   mvn exec:java -pl agentscope-examples/documentation \
- *       -Dexec.mainClass=io.agentscope.examples.documentation2.harness.GatewayStreamingThreadExample
+ *       -Dexec.mainClass=io.agentscope.examples.documentation2.harness.subagent.SubagentSendDirectlyExample
  * </pre>
  */
 public class SubagentSendDirectlyExample {
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/subagent/SubagentStreamingExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/subagent/SubagentStreamingExample.java
index c59c095410..32081ebdbd 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/subagent/SubagentStreamingExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/harness/subagent/SubagentStreamingExample.java
@@ -54,7 +54,7 @@
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
  *   mvn exec:java -pl agentscope-examples/documentation \
- *       -Dexec.mainClass=io.agentscope.examples.documentation2.streaming.SubagentStreamingExample
+ *       -Dexec.mainClass=io.agentscope.examples.documentation2.harness.subagent.SubagentStreamingExample
  * </pre>
  */
 public class SubagentStreamingExample {
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/hitl/PermissionHITLExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/hitl/PermissionHITLExample.java
index 8eac8a2906..c4ea00e3e6 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/hitl/PermissionHITLExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/hitl/PermissionHITLExample.java
@@ -60,7 +60,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.hitl.PermissionHITLExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpSseExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpSseExample.java
index 2a6900276c..d81bce5dfd 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpSseExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpSseExample.java
@@ -44,7 +44,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.mcp.McpSseExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpStdioExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpStdioExample.java
index e0608e171e..8936a1f259 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpStdioExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpStdioExample.java
@@ -42,7 +42,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.mcp.McpStdioExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpStreamableHttpExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpStreamableHttpExample.java
index 2de5ad80fd..0d1e211dd3 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpStreamableHttpExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/mcp/McpStreamableHttpExample.java
@@ -43,7 +43,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.mcp.McpStreamableHttpExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/middleware/ModelCallMiddlewareExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/middleware/ModelCallMiddlewareExample.java
index 6333aaeb43..6da911d474 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/middleware/ModelCallMiddlewareExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/middleware/ModelCallMiddlewareExample.java
@@ -59,7 +59,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.middleware.ModelCallMiddlewareExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/middleware/SystemPromptMiddlewareExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/middleware/SystemPromptMiddlewareExample.java
index 7977836ee2..da6d318d50 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/middleware/SystemPromptMiddlewareExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/middleware/SystemPromptMiddlewareExample.java
@@ -47,7 +47,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.middleware.SystemPromptMiddlewareExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/model/ModelRegistryExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/model/ModelRegistryExample.java
index 0a2f62b1d3..f0e329ce32 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/model/ModelRegistryExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/model/ModelRegistryExample.java
@@ -41,7 +41,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.model.ModelRegistryExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/skill/AgentSkillExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/skill/AgentSkillExample.java
index 20d08a0718..60e7990303 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/skill/AgentSkillExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/skill/AgentSkillExample.java
@@ -52,7 +52,7 @@ public class AgentSkillExample {
      * Output directory where the agent may write new skill files during the demo.
      */
     private static final String OUTPUT_DIR =
-            "agentscope-examples/documentation2/target/skill-output";
+            "agentscope-examples/documentation/target/skill-output";
 
     /**
      * Runs the agent skill example.
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/skill/SkillWithToolGroupExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/skill/SkillWithToolGroupExample.java
index 0356e0de0b..1fd1fc323e 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/skill/SkillWithToolGroupExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/skill/SkillWithToolGroupExample.java
@@ -60,7 +60,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.skill.SkillWithToolGroupExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/state/StateAutoSaveExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/state/StateAutoSaveExample.java
index a1e8e3d438..627183550f 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/state/StateAutoSaveExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/state/StateAutoSaveExample.java
@@ -50,8 +50,8 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
- *       -Dexec.mainClass=io.agentscope.examples.documentation2.session.SessionAutoSaveExample
+ *   mvn exec:java -pl agentscope-examples/documentation \
+ *       -Dexec.mainClass=io.agentscope.examples.documentation2.state.StateAutoSaveExample
  * </pre>
  */
 public class StateAutoSaveExample {
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/streaming/StreamingConsoleExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/streaming/StreamingConsoleExample.java
index ca4fb438f5..94b3dc24dd 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/streaming/StreamingConsoleExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/streaming/StreamingConsoleExample.java
@@ -56,7 +56,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.streaming.StreamingConsoleExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/streaming/StreamingWebExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/streaming/StreamingWebExample.java
index a0ec707308..ec54c4afc3 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/streaming/StreamingWebExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/streaming/StreamingWebExample.java
@@ -47,8 +47,8 @@
  * <p>Usage:
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn spring-boot:run -pl agentscope-examples/documentation2 \
- *       -Dspring-boot.run.mainClass=io.agentscope.examples.documentation2.StreamingWebExample
+ *   mvn spring-boot:run -pl agentscope-examples/documentation \
+ *       -Dspring-boot.run.mainClass=io.agentscope.examples.documentation2.streaming.StreamingWebExample
  *
  *   curl -N "http://localhost:8080/chat?message=Hello"
  *   curl -N "http://localhost:8080/chat?message=What+is+AI?&amp;sessionId=my-session"
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/PermissionContextExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/PermissionContextExample.java
index e2137599d1..fd80f2c5af 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/PermissionContextExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/PermissionContextExample.java
@@ -54,7 +54,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.tool.PermissionContextExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/ToolBaseExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/ToolBaseExample.java
index f765c539c5..ce7f6815e7 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/ToolBaseExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/ToolBaseExample.java
@@ -56,7 +56,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.tool.ToolBaseExample
  * </pre>
  */
diff --git a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/ToolExecutionContextExample.java b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/ToolExecutionContextExample.java
index 579ca22fb9..ff181734b4 100644
--- a/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/ToolExecutionContextExample.java
+++ b/agentscope-examples/documentation/src/main/java/io/agentscope/examples/documentation2/tool/ToolExecutionContextExample.java
@@ -49,7 +49,7 @@
  * <p><b>Run:</b>
  * <pre>
  *   export DASHSCOPE_API_KEY=your_key
- *   mvn exec:java -pl agentscope-examples/documentation2 \
+ *   mvn exec:java -pl agentscope-examples/documentation \
  *       -Dexec.mainClass=io.agentscope.examples.documentation2.tool.ToolExecutionContextExample
  * </pre>
  */