chore(deadcode): inline approval abort classification · o...
vincentkoc
·
2026-06-21
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -98,20 +98,6 @@ export type ToolOutcomeObservation = {
|
98 | 98 | |
99 | 99 | export type ToolOutcomeObserver = (observation: ToolOutcomeObservation) => void; |
100 | 100 | |
101 | | -/** Detect abort-related errors produced by the supplied signal. */ |
102 | | -export function isAbortSignalCancellation(err: unknown, signal?: AbortSignal): boolean { |
103 | | -if (!signal?.aborted) { |
104 | | -return false; |
105 | | -} |
106 | | -if (err === signal.reason) { |
107 | | -return true; |
108 | | -} |
109 | | -return ( |
110 | | -err instanceof Error && |
111 | | -(err.name === "AbortError" || ("cause" in err && err.cause === signal.reason)) |
112 | | -); |
113 | | -} |
114 | | - |
115 | 101 | export type HookContext = { |
116 | 102 | agentId?: string; |
117 | 103 | config?: OpenClawConfig; |
@@ -791,7 +777,13 @@ async function requestPluginToolApproval(params: {
|
791 | 777 | }; |
792 | 778 | } catch (err) { |
793 | 779 | notifyPluginApprovalResolution(approval, PluginApprovalResolutions.CANCELLED); |
794 | | -if (isAbortSignalCancellation(err, params.signal)) { |
| 780 | +const signal = params.signal; |
| 781 | +const abortCancelled = |
| 782 | +signal?.aborted === true && |
| 783 | +(err === signal.reason || |
| 784 | +(err instanceof Error && |
| 785 | +(err.name === "AbortError" || ("cause" in err && err.cause === signal.reason)))); |
| 786 | +if (abortCancelled) { |
795 | 787 | log.warn(`plugin approval wait cancelled by run abort: ${String(err)}`); |
796 | 788 | return { |
797 | 789 | blocked: true, |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
