@t2000/engine 1.25.1 → 1.25.3

package/dist/index.js

@@ -1110,7 +1110,7 @@ function parseNumberOrNull(input) {
   const n = Number(input);
   return Number.isFinite(n) ? n : null;
 }
-var DEFI_PORTFOLIO_TIMEOUT_MS = 4e3;
+var DEFI_PORTFOLIO_TIMEOUT_MS = 2e3;
 var DEFI_FRESH_TTL_MS_BLOCKVISION = 6e4;
 var DEFI_FRESH_TTL_MS_PARTIAL = 15e3;
 var DEFI_FRESH_TTL_MS_PARTIAL_STALE = 0;
@@ -1334,6 +1334,10 @@ async function fetchOneDefiProtocol(address, protocol, apiKey, retryStats) {
       { signal, retryStats }
     );
   } catch (err) {
+    const errName = err?.name;
+    if (errName === "AbortError" || errName === "TimeoutError") {
+      getTelemetrySink().counter("defi.protocol_timeout_count", { protocol });
+    }
     console.warn(`[defi] ${protocol} fetch threw:`, err);
     return null;
   }
@@ -7668,7 +7672,7 @@ var QueryEngine = class {
       })),
       ...writeResultBlocks
     ];
-    const canonicalRouteText = response.approved ? buildCanonicalRouteText(action) : null;
+    const canonicalRouteText = response.approved ? buildCanonicalRouteText(action, response) : null;
     if (canonicalRouteText) {
       allResults.push({ type: "text", text: canonicalRouteText });
     }
@@ -9028,16 +9032,33 @@ ${recipeCtx}`;
     }
   }
 };
-function buildCanonicalRouteText(action) {
+function buildCanonicalRouteText(action, response) {
+  const failedToolUseIds = /* @__PURE__ */ new Set();
+  if (Array.isArray(action.steps) && action.steps.length > 0) {
+    const stepResultByToolUseId = new Map(
+      (response.stepResults ?? []).map((sr) => [sr.toolUseId, sr])
+    );
+    for (const step of action.steps) {
+      const sr = stepResultByToolUseId.get(step.toolUseId);
+      if (!sr || sr.isError === true) {
+        failedToolUseIds.add(step.toolUseId);
+      }
+    }
+  } else if (isExecutionResultFailure(response.executionResult)) {
+    failedToolUseIds.add(action.toolUseId);
+  }
   const swaps = [];
   if (Array.isArray(action.steps) && action.steps.length > 0) {
     for (const step of action.steps) {
       if (step.toolName === "swap_execute" && step.cetusRoute) {
+        if (failedToolUseIds.has(step.toolUseId)) continue;
         swaps.push({ input: step.input, cetusRoute: step.cetusRoute });
       }
     }
   } else if (action.toolName === "swap_execute" && action.cetusRoute) {
-    swaps.push({ input: action.input, cetusRoute: action.cetusRoute });
+    if (!failedToolUseIds.has(action.toolUseId)) {
+      swaps.push({ input: action.input, cetusRoute: action.cetusRoute });
+    }
   }
   if (swaps.length === 0) return null;
   const blocks = swaps.map(({ input, cetusRoute }) => {
@@ -9057,6 +9078,24 @@ function buildCanonicalRouteText(action) {
   });
   return blocks.join("\n\n");
 }
+function isExecutionResultFailure(executionResult) {
+  if (executionResult === null || executionResult === void 0) return false;
+  if (typeof executionResult !== "object") return false;
+  const er = executionResult;
+  if (er.success === false) return true;
+  if (typeof er.error === "string" && er.error.length > 0) return true;
+  if (er._bundleReverted === true) return true;
+  if (er._sessionExpired === true) return true;
+  if (er._txReverted === true) return true;
+  if (er.data && typeof er.data === "object") {
+    const d = er.data;
+    if (typeof d.error === "string" && d.error.length > 0) return true;
+    if (d._bundleReverted === true) return true;
+    if (d._sessionExpired === true) return true;
+    if (d._txReverted === true) return true;
+  }
+  return false;
+}
 function isCorruptHistoryError(err) {
   const msg = err instanceof Error ? err.message : String(err);
   return msg.includes("tool_use") && msg.includes("tool_result") || msg.includes("roles must alternate") || msg.includes("400") && msg.includes("invalid_request_error");