diff --git a/agentscope-harness/src/main/java/io/agentscope/harness/agent/HarnessAgent.java b/agentscope-harness/src/main/java/io/agentscope/harness/agent/HarnessAgent.java
index dc136a9761..2c1118781f 100644
--- a/agentscope-harness/src/main/java/io/agentscope/harness/agent/HarnessAgent.java
+++ b/agentscope-harness/src/main/java/io/agentscope/harness/agent/HarnessAgent.java
@@ -2412,6 +2412,8 @@ public HarnessAgent build() {
             if (agentTracingLogEnabled) {
                 inner.middleware(new AgentTraceMiddleware());
             }
+            boolean artifactDeliveryEnabled =
+                    artifactDeliveryTarget != null && !disableFilesystemTools;
             if (!disableWorkspaceContext) {
                 WorkspaceContextMiddleware markdownMw =
                         new WorkspaceContextMiddleware(
@@ -2422,8 +2424,7 @@ public HarnessAgent build() {
                                 disableMemoryTools,
                                 disableMemoryHooks);
                 markdownMw.setAdditionalContextFiles(additionalContextFiles);
-                markdownMw.setArtifactDeliveryEnabled(
-                        artifactDeliveryTarget != null && !disableFilesystemTools);
+                markdownMw.setArtifactDeliveryEnabled(artifactDeliveryEnabled);
                 inner.middleware(markdownMw);
             }
             if (!disableAtPathExpansion) {
@@ -2602,7 +2603,7 @@ public HarnessAgent build() {
             if (!disableFilesystemTools) {
                 agentToolkit.registerTool(new FilesystemTool(filesystem, pathNormalizer));
             }
-            if (artifactDeliveryTarget != null && !disableFilesystemTools) {
+            if (artifactDeliveryEnabled) {
                 agentToolkit.registerTool(
                         new ArtifactDeliveryTool(
                                 filesystem, pathNormalizer, artifactDeliveryTarget));
diff --git a/agentscope-harness/src/main/java/io/agentscope/harness/agent/tool/ArtifactDeliveryTool.java b/agentscope-harness/src/main/java/io/agentscope/harness/agent/tool/ArtifactDeliveryTool.java
index 7d2e1d45a0..1b0c53514b 100644
--- a/agentscope-harness/src/main/java/io/agentscope/harness/agent/tool/ArtifactDeliveryTool.java
+++ b/agentscope-harness/src/main/java/io/agentscope/harness/agent/tool/ArtifactDeliveryTool.java
@@ -36,11 +36,6 @@
  */
 public class ArtifactDeliveryTool {
 
-    /**
-     * Registered tool name.
-     */
-    public static final String NAME = "deliver_artifact";
-
     private final AbstractFilesystem filesystem;
     private final WorkspacePathNormalizer pathNormalizer;
     private final ArtifactDeliveryTarget target;
diff --git a/agentscope-harness/src/test/java/io/agentscope/harness/agent/tool/ArtifactDeliveryToolTest.java b/agentscope-harness/src/test/java/io/agentscope/harness/agent/tool/ArtifactDeliveryToolTest.java
index 836d958ef2..2bbd6c47ae 100644
--- a/agentscope-harness/src/test/java/io/agentscope/harness/agent/tool/ArtifactDeliveryToolTest.java
+++ b/agentscope-harness/src/test/java/io/agentscope/harness/agent/tool/ArtifactDeliveryToolTest.java
@@ -18,6 +18,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -76,7 +77,7 @@ void deliverArtifact_downloadsBytesAndForwardsToTarget_withDefaults() {
         assertEquals("outputs/report.docx", request.filePath());
         assertArrayEquals(content, request.content());
         assertEquals("report.docx", request.fileName());
-        assertEquals(null, request.description());
+        assertNull(request.description());
         assertFalse(request.force());
     }