fix: 修复调试模块无法识别 agent custom 的问题 #84

kqcoxn · kqcoxn · commit 20f768ea9c7a · 2026-05-29T21:43:35.000+08:00
diff --git a/LocalBridge/internal/debug/runtime/agent_pool.go b/LocalBridge/internal/debug/runtime/agent_pool.go
@@ -10,6 +10,8 @@ import (
 	"github.com/kqcoxn/MaaPipelineEditor/LocalBridge/internal/mfw"
 )
 
+// AgentPool 缓存 AgentClient 实例及其绑定的 Resource。
+// Pool 拥有 Resource 的生命周期，确保 agent 连接不会因 Runtime 销毁而断开。
 type AgentPool struct {
 	mu      sync.Mutex
 	clients map[string]*agentEntry
@@ -27,6 +29,7 @@ func NewAgentPool() *AgentPool {
 	}
 }
 
+// Acquire 获取或创建一个 AgentClient 实例（不做 Resource 绑定）。
 func (p *AgentPool) Acquire(agent protocol.AgentProfile) (*maa.AgentClient, error) {
 	key, err := agentPoolKey(agent)
 	if err != nil {
@@ -49,6 +52,8 @@ func (p *AgentPool) Acquire(agent protocol.AgentProfile) (*maa.AgentClient, erro
 	return client, nil
 }
 
+// EnsureBound 确保 agent 已绑定到指定 resourcePaths 对应的 Resource 上。
+// Pool 拥有该 Resource 的生命周期，不会随 Runtime 销毁。
 func (p *AgentPool) EnsureBound(agent protocol.AgentProfile, resourcePaths []string) (*maa.AgentClient, error) {
 	key, err := agentPoolKey(agent)
 	if err != nil {
@@ -104,6 +109,24 @@ func (p *AgentPool) EnsureBound(agent protocol.AgentProfile, resourcePaths []str
 	return entry.client, nil
 }
 
+// GetResource 获取指定 agent 在 Pool 中绑定的 Resource。
+// 如果 agent 未绑定 Resource，返回 nil。
+func (p *AgentPool) GetResource(agent protocol.AgentProfile) *maa.Resource {
+	key, err := agentPoolKey(agent)
+	if err != nil {
+		return nil
+	}
+
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	entry := p.clients[key]
+	if entry == nil || entry.resourceAdapter == nil {
+		return nil
+	}
+	return entry.resourceAdapter.GetResource()
+}
+
 func normalizeAgentProfile(agent protocol.AgentProfile) (protocol.AgentProfile, error) {
 	prepared := agent
 	prepared.Transport = strings.TrimSpace(prepared.Transport)
diff --git a/LocalBridge/internal/debug/runtime/runtime.go b/LocalBridge/internal/debug/runtime/runtime.go
@@ -91,12 +91,74 @@ func New(
 	}
 	adapter.SetController(controller, controllerInfo.Type, controllerInfo.UUID)
 
-	emitResourceLoadDiagnostics(sessionID, runID, emit, "starting", resourcePaths, nil)
-	if err := adapter.LoadResourcesWithProgress(resourcePaths, func(index int, total int, resolution mfw.ResourceBundleResolution, status string, err error) {
-		emitResourceLoadDiagnostic(sessionID, runID, emit, index, total, resolution, status, err)
-	}); err != nil {
-		adapter.Destroy()
-		return nil, fmt.Errorf("加载资源失败: %w", err)
+	// 判断是否有启用的 agent，决定 Resource 的来源
+	enabledAgents := filterEnabledAgents(req.Profile.Agents)
+	usePoolResource := len(enabledAgents) > 0 && agentPool != nil
+
+	if usePoolResource {
+		// 通过 Pool 确保 agent 已绑定 Resource。
+		// Pool 拥有 Resource 生命周期，agent 连接不会因 Runtime 销毁而断开。
+		for _, agent := range enabledAgents {
+			prepared, prepErr := normalizeAgentProfile(agent)
+			if prepErr != nil {
+				continue
+			}
+			if _, ensureErr := agentPool.EnsureBound(prepared, resourcePaths); ensureErr != nil {
+				if requiredAgent(prepared) {
+					adapter.Destroy()
+					return nil, fmt.Errorf("agent EnsureBound 失败: %w", ensureErr)
+				}
+			}
+		}
+		// 获取 Pool 的 Resource 供 Tasker 使用（与 agent 共享同一个 Resource）
+		var poolResource *maa.Resource
+		for _, agent := range enabledAgents {
+			prepared, prepErr := normalizeAgentProfile(agent)
+			if prepErr != nil {
+				continue
+			}
+			if r := agentPool.GetResource(prepared); r != nil {
+				poolResource = r
+				break
+			}
+		}
+		if poolResource == nil {
+			adapter.Destroy()
+			return nil, fmt.Errorf("agent pool resource 为空")
+		}
+		adapter.SetBorrowedResource(poolResource)
+
+		// Connect agent（必须在 InitTasker 之前，确保 handlers 已注册到 Resource）
+		for _, agent := range enabledAgents {
+			prepared, prepErr := normalizeAgentProfile(agent)
+			if prepErr != nil {
+				continue
+			}
+			client, _ := agentPool.Acquire(prepared)
+			if client == nil {
+				continue
+			}
+			if !client.Connected() {
+				if prepared.TimeoutMS > 0 {
+					_ = client.SetTimeout(time.Duration(prepared.TimeoutMS) * time.Millisecond)
+				}
+				if err := connectAgent(prepared, client); err != nil {
+					if requiredAgent(prepared) {
+						adapter.Destroy()
+						return nil, fmt.Errorf("agent 连接失败: %w", err)
+					}
+				}
+			}
+		}
+	} else {
+		// 无 agent 时，adapter 自己创建并拥有 Resource
+		emitResourceLoadDiagnostics(sessionID, runID, emit, "starting", resourcePaths, nil)
+		if err := adapter.LoadResourcesWithProgress(resourcePaths, func(index int, total int, resolution mfw.ResourceBundleResolution, status string, err error) {
+			emitResourceLoadDiagnostic(sessionID, runID, emit, index, total, resolution, status, err)
+		}); err != nil {
+			adapter.Destroy()
+			return nil, fmt.Errorf("加载资源失败: %w", err)
+		}
 	}
 
 	overrideBundle, err := buildPipelineOverrideBundle(root, req)
@@ -144,9 +206,24 @@ func New(
 		emit:          emit,
 	}
 
-	if err := r.connectAgents(req.Profile.Agents); err != nil {
-		r.Destroy()
-		return nil, err
+	if usePoolResource {
+		// agent 已在 InitTasker 之前连接，记录到 Runtime
+		for _, agent := range enabledAgents {
+			prepared, prepErr := normalizeAgentProfile(agent)
+			if prepErr != nil {
+				continue
+			}
+			client, _ := agentPool.Acquire(prepared)
+			if client != nil && client.Connected() && client.Alive() {
+				r.agentClients = append(r.agentClients, client)
+				r.emitAgentDiagnostic(prepared, "info", "debug.agent.connected", "agent 复用已有连接", nil, nil)
+			}
+		}
+	} else if len(req.Profile.Agents) > 0 {
+		if err := r.connectAgents(req.Profile.Agents); err != nil {
+			r.Destroy()
+			return nil, err
+		}
 	}
 
 	return r, nil
@@ -435,6 +512,8 @@ func (r *Runtime) Destroy() {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
+	// 不 Disconnect agent —— Pool 拥有连接生命周期，agent server 进程需要保持运行。
+	// adapter 使用的是 Pool 的 Resource（borrowed），Destroy 时不会释放它。
 	r.agentClients = nil
 
 	if r.adapter == nil {
@@ -539,6 +618,8 @@ func (r *Runtime) directModeOverride(mode protocol.RunMode) (map[string]interfac
 }
 
 func (r *Runtime) connectAgents(agents []protocol.AgentProfile) error {
+	resource := r.adapter.GetResource()
+
 	for _, agent := range agents {
 		if !agent.Enabled {
 			continue
@@ -560,31 +641,45 @@ func (r *Runtime) connectAgents(agents []protocol.AgentProfile) error {
 			r.emitAgentDiagnostic(prepared, "warning", "debug.agent.create_failed", err.Error(), nil, nil)
 			continue
 		}
-		alreadyConnected := client.Connected()
-		if !alreadyConnected && prepared.TimeoutMS > 0 {
-			if err := client.SetTimeout(time.Duration(prepared.TimeoutMS) * time.Millisecond); err != nil {
+
+		// 如果 agent 已连接（来自 Pool 复用），需要先断开再重连，
+		// 因为 handlers 只在 Connect() 时注册到当时绑定的 Resource 上。
+		if client.Connected() {
+			_ = client.Disconnect()
+		}
+
+		// 绑定到 Runtime 的 Resource（Tasker 使用的同一个）
+		if resource != nil {
+			if err := client.BindResource(resource); err != nil {
 				if requiredAgent(prepared) {
 					return err
 				}
-				r.emitAgentDiagnostic(prepared, "warning", "debug.agent.timeout_failed", err.Error(), nil, nil)
+				r.emitAgentDiagnostic(prepared, "warning", "debug.agent.bind_failed", err.Error(), nil, nil)
 				continue
 			}
 		}
-		if !alreadyConnected {
-			if err := connectAgent(prepared, client); err != nil {
+
+		if prepared.TimeoutMS > 0 {
+			if err := client.SetTimeout(time.Duration(prepared.TimeoutMS) * time.Millisecond); err != nil {
 				if requiredAgent(prepared) {
 					return err
 				}
-				r.emitAgentDiagnostic(prepared, "warning", "debug.agent.connect_failed", err.Error(), nil, nil)
+				r.emitAgentDiagnostic(prepared, "warning", "debug.agent.timeout_failed", err.Error(), nil, nil)
 				continue
 			}
 		}
-		r.agentClients = append(r.agentClients, client)
-		message := "agent 已连接"
-		if alreadyConnected {
-			message = "agent 复用已有连接"
+
+		// Connect 会将 agent server 的 custom handlers 注册到当前绑定的 Resource 上
+		if err := connectAgent(prepared, client); err != nil {
+			if requiredAgent(prepared) {
+				return err
+			}
+			r.emitAgentDiagnostic(prepared, "warning", "debug.agent.connect_failed", err.Error(), nil, nil)
+			continue
 		}
-		r.emitAgentDiagnostic(prepared, "info", "debug.agent.connected", message, nil, nil)
+
+		r.agentClients = append(r.agentClients, client)
+		r.emitAgentDiagnostic(prepared, "info", "debug.agent.connected", "agent 已连接", nil, nil)
 	}
 	return nil
 }
@@ -619,18 +714,9 @@ func (r *Runtime) emitAgentDiagnostic(agent protocol.AgentProfile, severity stri
 
 func (r *Runtime) acquireAgentClient(agent protocol.AgentProfile) (*maa.AgentClient, error) {
 	if r.agentPool != nil {
-		return r.agentPool.EnsureBound(agent, r.resourcePaths)
-	}
-	client, err := createAgentClient(agent)
-	if err != nil {
-		return nil, err
-	}
-	if resource := r.adapter.GetResource(); resource != nil {
-		if err := client.BindResource(resource); err != nil {
-			return nil, err
-		}
+		return r.agentPool.Acquire(agent)
 	}
-	return client, nil
+	return createAgentClient(agent)
 }
 
 func (r *Runtime) labelForRuntimeName(runtimeName string) string {
@@ -851,6 +937,16 @@ func requiredAgent(agent protocol.AgentProfile) bool {
 	return agent.Required == nil || *agent.Required
 }
 
+func filterEnabledAgents(agents []protocol.AgentProfile) []protocol.AgentProfile {
+	var enabled []protocol.AgentProfile
+	for _, agent := range agents {
+		if agent.Enabled {
+			enabled = append(enabled, agent)
+		}
+	}
+	return enabled
+}
+
 func emitResourceLoadDiagnostics(sessionID string, runID string, emit events.EmitFunc, status string, paths []string, err error) {
 	if emit == nil {
 		return
diff --git a/LocalBridge/internal/mfw/adapter.go b/LocalBridge/internal/mfw/adapter.go
@@ -39,6 +39,7 @@ type MaaFWAdapter struct {
 
 	// 所有权标记
 	ownsController bool // 是否拥有控制器（true=自己创建的，false=借用的共享控制器）
+	ownsResource   bool // 是否拥有资源（true=自己创建的，false=借用的共享资源）
 
 	// 元信息
 	controllerType string // ADB/Win32/WlRoots
@@ -305,6 +306,7 @@ func (a *MaaFWAdapter) loadResolvedResourcesLocked(resolutions []ResourceBundleR
 	}
 
 	a.resource = res
+	a.ownsResource = true
 	a.resourceLoaded = true
 
 	logger.Debug("MaaFW", "资源已加载(共 %d 个路径)", len(resolutions))
@@ -382,6 +384,18 @@ func (a *MaaFWAdapter) GetResource() *maa.Resource {
 	return a.resource
 }
 
+// SetBorrowedResource 设置借用的外部 Resource（不拥有所有权，Destroy 时不释放）
+func (a *MaaFWAdapter) SetBorrowedResource(res *maa.Resource) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	if a.resource != nil && a.ownsResource {
+		a.resource.Destroy()
+	}
+	a.resource = res
+	a.ownsResource = false
+	a.resourceLoaded = res != nil
+}
+
 // IsResourceLoaded 检查资源是否已加载
 func (a *MaaFWAdapter) IsResourceLoaded() bool {
 	a.mu.RLock()
@@ -842,11 +856,11 @@ func (a *MaaFWAdapter) Destroy() {
 	}
 	a.initialized = false
 
-	// 销毁 Resource
-	if a.resource != nil {
+	// 销毁 Resource（只销毁自己拥有的）
+	if a.resource != nil && a.ownsResource {
 		a.resource.Destroy()
-		a.resource = nil
 	}
+	a.resource = nil
 	a.resourceLoaded = false
 
 	// 只销毁自己拥有的 Controller，借用的不销毁
diff --git a/src/data/updateLogs.ts b/src/data/updateLogs.ts
@@ -122,6 +122,7 @@ export const updateLogs: UpdateLogItem[] = [
         "调试事件线 trace 支持毫秒级时间戳",
       ],
       fixes: [
+        "修复调试模块无法识别 agent custom 的问题",
         "修复调试模块点击 JSON 查看时错误出现图片的问题",
         "修复多资源加载会导致预期外的重名节点提示问题",
       ],
