@t2000/engine 1.24.12 → 1.24.14

package/dist/index.js

@@ -735,6 +735,13 @@ function cbRecord429(now) {
     cb429Timestamps = [];
   }
 }
+function emitTerminalRetry(vendor, attemptZeroIndexed, outcome) {
+  getTelemetrySink().counter("external.retry_count", {
+    vendor,
+    outcome,
+    attempts: String(attemptZeroIndexed + 1)
+  });
+}
 async function fetchBlockVisionWithRetry(url, init, opts = {}) {
   const rng = opts.rng ?? Math.random;
   const sleep2 = opts.sleep ?? ((ms) => new Promise((resolve, reject) => {
@@ -780,10 +787,12 @@ async function fetchBlockVisionWithRetry(url, init, opts = {}) {
     }
     if (lastResponse.ok) {
       getTelemetrySink().counter("bv.requests", { status: "2xx", attempt: String(attempt) });
+      emitTerminalRetry("bv", attempt, attempt === 0 ? "first_try" : "retried_success");
       return lastResponse;
     }
     if (lastResponse.status !== 429 && lastResponse.status < 500) {
       getTelemetrySink().counter("bv.requests", { status: String(lastResponse.status), attempt: String(attempt) });
+      emitTerminalRetry("bv", attempt, attempt === 0 ? "first_try" : "retried_success");
       return lastResponse;
     }
     if (lastResponse.status === 429) {
@@ -791,12 +800,14 @@ async function fetchBlockVisionWithRetry(url, init, opts = {}) {
       const now = (opts.now ?? Date.now)();
       cbRecord429(now);
       if (cbIsOpen(now)) {
+        emitTerminalRetry("bv", attempt, "exhausted");
         return lastResponse;
       }
     } else {
       getTelemetrySink().counter("bv.requests", { status: "5xx", attempt: String(attempt) });
     }
   }
+  emitTerminalRetry("bv", BV_RETRY_MAX_ATTEMPTS - 1, "exhausted");
   if (lastResponse) return lastResponse;
   throw lastError ?? new Error("fetch failed after retries");
 }
@@ -7581,7 +7592,10 @@ var QueryEngine = class {
       );
     }
     if (action.assistantContent?.length) {
-      this.messages.push({ role: "assistant", content: action.assistantContent });
+      this.messages.push({
+        role: "assistant",
+        content: stripPseudoThinking(action.assistantContent)
+      });
     }
     const allResults = [
       ...(action.completedResults ?? []).map((r) => ({
@@ -7687,7 +7701,7 @@ var QueryEngine = class {
     if (pendingInput.assistantContent.length > 0) {
       this.messages.push({
         role: "assistant",
-        content: pendingInput.assistantContent
+        content: stripPseudoThinking(pendingInput.assistantContent)
       });
     }
     const tool = findTool(this.tools, pendingInput.toolName);
@@ -7856,10 +7870,6 @@ var QueryEngine = class {
       blockvisionApiKey: this.blockvisionApiKey,
       portfolioCache: this.portfolioCache
     };
-    const canSafetyNet = !!(this.walletAddress && this.suiRpcUrl);
-    const safetyNetBaseline = canSafetyNet ? fetchWalletCoins(this.walletAddress, this.suiRpcUrl).then(
-      (coins) => new Map(coins.map((c) => [c.coinType, BigInt(c.totalBalance)]))
-    ).catch(() => null) : null;
     const cacheInvalidationStart = Date.now();
     if (this.walletAddress) {
       this.portfolioCache?.delete(this.walletAddress);
@@ -7871,8 +7881,7 @@ var QueryEngine = class {
       { has_wallet: this.walletAddress ? "1" : "0" }
     );
     getTelemetrySink().counter("engine.pwr.skipped_sleep_count", {
-      has_wallet: this.walletAddress ? "1" : "0",
-      can_safety_net: canSafetyNet ? "1" : "0"
+      has_wallet: this.walletAddress ? "1" : "0"
     });
     if (signal.aborted) return;
     const refreshStart = Date.now();
@@ -7978,35 +7987,6 @@ var QueryEngine = class {
         is_bundle: isBundle ? "1" : "0"
       }
     );
-    if (safetyNetBaseline && canSafetyNet) {
-      const wallet = this.walletAddress;
-      const rpc = this.suiRpcUrl;
-      void (async () => {
-        try {
-          const [baseline, current] = await Promise.all([
-            safetyNetBaseline,
-            fetchWalletCoins(wallet, rpc).then(
-              (coins) => new Map(
-                coins.map((c) => [c.coinType, BigInt(c.totalBalance)])
-              )
-            ).catch(() => null)
-          ]);
-          if (!baseline || !current) return;
-          const stale = !walletStateChanged(baseline, current);
-          if (stale) {
-            getTelemetrySink().counter(
-              "engine.pwr.observed_stale_balance_check",
-              {
-                stale: "1",
-                is_bundle: isBundle ? "1" : "0",
-                tool_count: String(refreshTools.length)
-              }
-            );
-          }
-        } catch {
-        }
-      })();
-    }
   }
   interrupt() {
     this.abortController?.abort();
@@ -8370,14 +8350,20 @@ ${recipeCtx}`;
       const hasEarlyResults = earlyResultBlocks.length > 0;
       const hasRemainingCalls = acc.pendingToolCalls.length > 0;
       if (!hasEarlyResults && !hasRemainingCalls) {
-        this.messages.push({ role: "assistant", content: acc.assistantBlocks });
+        this.messages.push({
+          role: "assistant",
+          content: stripPseudoThinking(acc.assistantBlocks)
+        });
         getTelemetrySink().histogram("anthropic.latency_ms", Date.now() - turnStartMs);
         yield { type: "turn_complete", stopReason: acc.stopReason };
         recordTurnOutcome("turn_complete", { stopReason: acc.stopReason });
         return;
       }
       if (signal.aborted) {
-        this.messages.push({ role: "assistant", content: acc.assistantBlocks });
+        this.messages.push({
+          role: "assistant",
+          content: stripPseudoThinking(acc.assistantBlocks)
+        });
         if (hasEarlyResults) {
           this.messages.push({ role: "user", content: earlyResultBlocks });
         }
@@ -8683,7 +8669,10 @@ ${recipeCtx}`;
           guardPassedWrites.push(write);
         }
         if (anyGuardBlocked) {
-          this.messages.push({ role: "assistant", content: acc.assistantBlocks });
+          this.messages.push({
+            role: "assistant",
+            content: stripPseudoThinking(acc.assistantBlocks)
+          });
           this.messages.push({ role: "user", content: toolResultBlocks });
           getTelemetrySink().counter("engine.turn_outcome", {
             entry: freshPrompt !== null ? "submit" : "resume",
@@ -8714,7 +8703,10 @@ ${recipeCtx}`;
             isError: true
           });
         }
-        this.messages.push({ role: "assistant", content: acc.assistantBlocks });
+        this.messages.push({
+          role: "assistant",
+          content: stripPseudoThinking(acc.assistantBlocks)
+        });
         this.messages.push({ role: "user", content: toolResultBlocks });
         getTelemetrySink().counter("engine.turn_outcome", {
           entry: freshPrompt !== null ? "submit" : "resume",
@@ -8799,7 +8791,10 @@ ${recipeCtx}`;
         recordTurnOutcome("pending_action_single");
         return;
       }
-      this.messages.push({ role: "assistant", content: acc.assistantBlocks });
+      this.messages.push({
+        role: "assistant",
+        content: stripPseudoThinking(acc.assistantBlocks)
+      });
       this.messages.push({ role: "user", content: toolResultBlocks });
       const toolUseBlocks = acc.assistantBlocks.filter((b) => b.type === "tool_use");
       const allUpdateTodo = toolUseBlocks.length > 0 && toolUseBlocks.every((b) => b.name === "update_todo");
@@ -8937,17 +8932,27 @@ ${recipeCtx}`;
     }
   }
 };
-function walletStateChanged(before, after) {
-  if (before.size !== after.size) return true;
-  for (const [coinType, balance] of before) {
-    if (after.get(coinType) !== balance) 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");
 }
+function stripPseudoThinking(blocks) {
+  const out = [];
+  for (const b of blocks) {
+    if (b.type !== "text") {
+      out.push(b);
+      continue;
+    }
+    const stripped = b.text.replace(/<thinking\b[^>]*>[\s\S]*?(?:<\/thinking>|$)/gi, "").trim();
+    if (stripped.length > 0) {
+      out.push({ ...b, text: stripped });
+    }
+  }
+  if (out.length === 0 && blocks.length > 0) {
+    out.push({ type: "text", text: "[narration omitted]" });
+  }
+  return out;
+}
 function validateHistory(messages) {
   const result = [];
   let i = 0;
@@ -10091,31 +10096,48 @@ var AnthropicProvider = class {
   }
   async *chat(params) {
     let attempt = 0;
-    while (true) {
-      let yieldedAnything = false;
-      const inner = this.streamOnce(params);
-      try {
-        for (; ; ) {
-          const next = await inner.next();
-          if (next.done) return;
-          yieldedAnything = true;
-          yield next.value;
-        }
-      } catch (err) {
+    let success = false;
+    try {
+      while (true) {
+        let yieldedAnything = false;
+        const inner = this.streamOnce(params);
         try {
-          await inner.return?.(void 0);
-        } catch {
-        }
-        if (!yieldedAnything && isRetriableError(err) && attempt < this.maxRetries) {
-          attempt++;
-          const delayMs = computeBackoffMs(attempt);
-          console.warn(
-            `[anthropic] retriable error (attempt ${attempt}/${this.maxRetries}, retrying in ${delayMs}ms): ${rawErrorMessage(err)}`
-          );
-          await sleep(delayMs);
-          continue;
+          for (; ; ) {
+            const next = await inner.next();
+            if (next.done) {
+              success = true;
+              return;
+            }
+            yieldedAnything = true;
+            yield next.value;
+          }
+        } catch (err) {
+          try {
+            await inner.return?.(void 0);
+          } catch {
+          }
+          if (!yieldedAnything && isRetriableError(err) && attempt < this.maxRetries) {
+            attempt++;
+            const delayMs = computeBackoffMs(attempt);
+            console.warn(
+              `[anthropic] retriable error (attempt ${attempt}/${this.maxRetries}, retrying in ${delayMs}ms): ${rawErrorMessage(err)}`
+            );
+            await sleep(delayMs);
+            continue;
+          }
+          throw new Error(friendlyErrorMessage(err));
         }
-        throw new Error(friendlyErrorMessage(err));
+      }
+    } finally {
+      const retried = attempt > 0;
+      const outcome = !retried ? "first_try" : success ? "retried_success" : "exhausted";
+      try {
+        getTelemetrySink().counter("external.retry_count", {
+          vendor: "anthropic",
+          outcome,
+          attempts: String(attempt + 1)
+        });
+      } catch {
       }
     }
   }