diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 0000000..5cfa585
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,84 @@
+{
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Task",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "entire hooks claude-code post-task"
+          }
+        ]
+      },
+      {
+        "matcher": "TodoWrite",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "entire hooks claude-code post-todo"
+          }
+        ]
+      }
+    ],
+    "PreToolUse": [
+      {
+        "matcher": "Task",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "entire hooks claude-code pre-task"
+          }
+        ]
+      }
+    ],
+    "SessionEnd": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "entire hooks claude-code session-end"
+          }
+        ]
+      }
+    ],
+    "SessionStart": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "entire hooks claude-code session-start"
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "entire hooks claude-code stop"
+          }
+        ]
+      }
+    ],
+    "UserPromptSubmit": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "entire hooks claude-code user-prompt-submit"
+          }
+        ]
+      }
+    ]
+  },
+  "permissions": {
+    "deny": [
+      "Read(./.entire/metadata/**)"
+    ]
+  }
+}
diff --git a/.entire/settings.json b/.entire/settings.json
new file mode 100644
index 0000000..1e4f9e0
--- /dev/null
+++ b/.entire/settings.json
@@ -0,0 +1,4 @@
+{
+  "enabled": true,
+  "telemetry": false
+}
diff --git a/go-backend/internal/http/handler/control_plane.go b/go-backend/internal/http/handler/control_plane.go
index 93eefe7..7ec8976 100644
--- a/go-backend/internal/http/handler/control_plane.go
+++ b/go-backend/internal/http/handler/control_plane.go
@@ -110,9 +110,11 @@ func (h *Handler) buildDiagnosisStreamStartItems(workItems []diagnosisWorkItem)
 const diagnosisMaxConcurrency = 8
 
 const (
-	defaultNodeCommandTimeout = 6 * time.Second
-	diagnosisCommandTimeout   = 2 * time.Minute
-	diagnosisRequestTimeout   = 2 * time.Minute
+	defaultNodeCommandTimeout  = 6 * time.Second
+	diagnosisCommandTimeout    = 30 * time.Second
+	diagnosisRequestTimeout    = 2 * time.Minute
+	diagnosisCommandTimeoutMsg = "诊断超时（30秒）"
+	diagnosisRequestTimeoutMsg = "诊断超时（2分钟）"
 )
 
 func (h *Handler) resolveForwardAccess(r *http.Request, forwardID int64) (*forwardRecord, int64, int, error) {
@@ -848,15 +850,15 @@ func resolveDiagnosisTargets(remoteAddr string) ([]diagnosisTarget, error) {
 
 func diagnosisContextMessage(ctx context.Context) string {
 	if ctx == nil {
-		return "诊断超时（2分钟）"
+		return diagnosisRequestTimeoutMsg
 	}
 	switch ctx.Err() {
 	case context.DeadlineExceeded:
-		return "诊断超时（2分钟）"
+		return diagnosisRequestTimeoutMsg
 	case context.Canceled:
 		return "诊断已取消"
 	default:
-		return "诊断超时（2分钟）"
+		return diagnosisRequestTimeoutMsg
 	}
 }
 
@@ -895,7 +897,7 @@ func newDiagnosisTimeoutItem(workItem diagnosisWorkItem, message string) map[str
 	item := newDiagnosisResultItem(workItem.fromNodeID, workItem.targetIP, targetPort, workItem.description, workItem.metadata)
 	item["success"] = false
 	if strings.TrimSpace(message) == "" {
-		message = "诊断超时（2分钟）"
+		message = diagnosisCommandTimeoutMsg
 	}
 	item["message"] = message
 	return item
@@ -993,7 +995,7 @@ enqueueLoop:
 
 	for i := range results {
 		if results[i] == nil {
-			results[i] = newDiagnosisTimeoutItem(workItems[i], "诊断超时（2分钟）")
+			results[i] = newDiagnosisTimeoutItem(workItems[i], diagnosisCommandTimeoutMsg)
 		}
 	}
 	return results
diff --git a/vite-frontend/src/pages/forward.tsx b/vite-frontend/src/pages/forward.tsx
index b35aa1e..d2de647 100644
--- a/vite-frontend/src/pages/forward.tsx
+++ b/vite-frontend/src/pages/forward.tsx
@@ -1003,7 +1003,7 @@ export default function ForwardPage() {
         toast.error(streamErrorMessage);
       }
       if (streamResult.timedOut) {
-        toast.error("诊断达到2分钟超时，已返回当前结果");
+        toast.error("诊断超时（单条30秒 / 整体2分钟），已返回当前结果");
       }
     } catch {
       if (abortController.signal.aborted) {
@@ -3491,7 +3491,7 @@ export default function ForwardPage() {
                     {diagnosisProgress.timedOut && (
                       <Alert
                         color="warning"
-                        description="诊断已达到2分钟超时，以下为当前已完成结果。"
+                        description="诊断超时（单条30秒 / 整体2分钟），以下为当前已完成结果。"
                         title="诊断超时"
                         variant="flat"
                       />
diff --git a/vite-frontend/src/pages/tunnel.tsx b/vite-frontend/src/pages/tunnel.tsx
index 89e268b..e263f6a 100644
--- a/vite-frontend/src/pages/tunnel.tsx
+++ b/vite-frontend/src/pages/tunnel.tsx
@@ -605,7 +605,7 @@ export default function TunnelPage() {
         toast.error(streamErrorMessage);
       }
       if (streamResult.timedOut) {
-        toast.error("诊断达到2分钟超时，已返回当前结果");
+        toast.error("诊断超时（单条30秒 / 整体2分钟），已返回当前结果");
       }
     } catch {
       if (abortController.signal.aborted) {
@@ -2141,7 +2141,7 @@ export default function TunnelPage() {
                     {diagnosisProgress.timedOut && (
                       <Alert
                         color="warning"
-                        description="诊断已达到2分钟超时，以下为当前已完成结果。"
+                        description="诊断超时（单条30秒 / 整体2分钟），以下为当前已完成结果。"
                         title="诊断超时"
                         variant="flat"
                       />