refactor(outbound): distill reserved target delivery cleanup · openclaw/openclaw@1adb119
obviyus
·
2026-06-25
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -146,23 +146,17 @@ export async function resolveAgentDeliveryPlanWithSessionRoute(
|
146 | 146 | }, |
147 | 147 | ): Promise<AgentDeliveryPlan> { |
148 | 148 | const plan = resolveAgentDeliveryPlan(params); |
149 | | -if ( |
150 | | -!params.wantsDelivery || |
151 | | -!plan.resolvedTo || |
152 | | -!isDeliverableMessageChannel(plan.resolvedChannel) || |
153 | | -!resolveOutboundChannelPlugin({ |
154 | | -channel: plan.resolvedChannel, |
155 | | -cfg: params.cfg, |
156 | | -allowBootstrap: true, |
157 | | -})?.messaging?.resolveOutboundSessionRoute |
158 | | -) { |
| 149 | +const plugin = |
| 150 | +params.wantsDelivery && plan.resolvedTo && isDeliverableMessageChannel(plan.resolvedChannel) |
| 151 | + ? resolveOutboundChannelPlugin({ |
| 152 | +channel: plan.resolvedChannel, |
| 153 | +cfg: params.cfg, |
| 154 | +allowBootstrap: true, |
| 155 | +}) |
| 156 | + : undefined; |
| 157 | +if (!plugin?.messaging?.resolveOutboundSessionRoute) { |
159 | 158 | return plan; |
160 | 159 | } |
161 | | -const plugin = resolveOutboundChannelPlugin({ |
162 | | -channel: plan.resolvedChannel, |
163 | | -cfg: params.cfg, |
164 | | -allowBootstrap: true, |
165 | | -}); |
166 | 160 | const normalizedTarget = resolveOutboundTarget({ |
167 | 161 | channel: plan.resolvedChannel, |
168 | 162 | to: plan.resolvedTo, |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -512,9 +512,7 @@ export async function resolveMessagingTarget(params: {
|
512 | 512 | candidates: match.entries, |
513 | 513 | }; |
514 | 514 | } |
515 | | -// Directory miss: reject reserved literals before falling back to plugin |
516 | | -// resolution, so a bare reserved word without a matching directory entry |
517 | | -// does not accidentally resolve to a public channel or incorrect target. |
| 515 | +// Directory misses are the fail-closed boundary for reserved literals. |
518 | 516 | if (reservedLiteral) { |
519 | 517 | return { ok: false, error: reservedTargetLiteralError(providerLabel, reservedLiteral, hint) }; |
520 | 518 | } |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -81,11 +81,7 @@ export function resolveOutboundTargetWithPlugin(params: {
|
81 | 81 | return { ok: false, error: targetPrefixError }; |
82 | 82 | } |
83 | 83 | const hint = plugin.messaging?.targetResolver?.hint; |
84 | | -// Reserved-literal rejection is skipped for heartbeat mode so the |
85 | | -// async directory-capable resolver (resolveChannelTarget → |
86 | | -// resolveMessagingTarget) can do directory-first lookup before deciding. |
87 | | -// Rejecting here would suppress a heartbeat route to an existing directory |
88 | | -// entry whose name matches a reserved literal. |
| 84 | +// Heartbeats defer reserved literals to the async resolver so directory hits can win. |
89 | 85 | if (params.target.mode !== "heartbeat") { |
90 | 86 | const reservedLiteral = resolveReservedTargetLiteral({ raw: effectiveTo, plugin }); |
91 | 87 | if (reservedLiteral) { |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。