@t2000/engine 1.7.0 → 1.9.0

package/dist/index.js

@@ -215,19 +215,19 @@ ${note}`;
 
 // src/tool-flags.ts
 var TOOL_FLAGS = {
-  // Write tools — financial
-  save_deposit: { mutating: true, requiresBalance: true },
-  withdraw: { mutating: true, affectsHealth: true },
-  send_transfer: { mutating: true, requiresBalance: true, irreversible: true },
-  swap_execute: { mutating: true, requiresBalance: true },
-  borrow: { mutating: true, affectsHealth: true },
-  repay_debt: { mutating: true, requiresBalance: true },
-  claim_rewards: { mutating: true },
-  volo_stake: { mutating: true, requiresBalance: true },
-  volo_unstake: { mutating: true },
-  // Write tools — pay / services
+  // Write tools — financial (bundleable — SPEC 7 Layer 2)
+  save_deposit: { mutating: true, requiresBalance: true, bundleable: true },
+  withdraw: { mutating: true, affectsHealth: true, bundleable: true },
+  send_transfer: { mutating: true, requiresBalance: true, irreversible: true, bundleable: true },
+  swap_execute: { mutating: true, requiresBalance: true, bundleable: true },
+  borrow: { mutating: true, affectsHealth: true, bundleable: true },
+  repay_debt: { mutating: true, requiresBalance: true, bundleable: true },
+  claim_rewards: { mutating: true, bundleable: true },
+  volo_stake: { mutating: true, requiresBalance: true, bundleable: true },
+  volo_unstake: { mutating: true, bundleable: true },
+  // Write tools — pay / services (NOT bundleable — see ToolFlags.bundleable JSDoc)
   pay_api: { mutating: true, requiresBalance: true, costAware: true, producesArtifact: true, maxRetries: 1 },
-  // Write tools — lightweight (no financial guards)
+  // Write tools — lightweight (no financial guards, NOT bundleable — Postgres only)
   save_contact: {},
   // [SIMPLIFICATION DAY 7] Removed flag entries for deleted tools:
   //   create_schedule, cancel_schedule (DCA schedules retired)
@@ -248,6 +248,9 @@ function applyToolFlags(tools) {
 function getToolFlags(name) {
   return TOOL_FLAGS[name] ?? {};
 }
+function isBundleableTool(name) {
+  return TOOL_FLAGS[name]?.bundleable === true;
+}
 
 // src/navi-config.ts
 var NAVI_SERVER_NAME = "navi";
@@ -5476,6 +5479,51 @@ var CostTracker = class {
   }
 };
 
+// src/describe-action.ts
+function resolveTokenSymbol(nameOrType) {
+  if (!nameOrType.includes("::")) return nameOrType;
+  const parts = nameOrType.split("::");
+  return parts[parts.length - 1];
+}
+function describeAction(tool, call) {
+  const input = call.input;
+  switch (tool.name) {
+    case "save_deposit": {
+      return `Save ${input.amount} USDC into lending`;
+    }
+    case "withdraw": {
+      const wAsset = input.asset ?? "";
+      return `Withdraw ${input.amount}${wAsset ? " " + wAsset : ""} from lending`;
+    }
+    case "send_transfer":
+      return `Send $${input.amount} to ${input.to}`;
+    case "borrow":
+      return `Borrow $${input.amount} against collateral`;
+    case "repay_debt":
+      return `Repay $${input.amount} of outstanding debt`;
+    case "claim_rewards":
+      return "Claim all pending protocol rewards";
+    case "pay_api": {
+      const url = String(input.url ?? "");
+      const cost = estimatePayApiCost(url);
+      return `Pay for API call to ${url} (~$${cost})`;
+    }
+    case "swap_execute": {
+      const from = resolveTokenSymbol(String(input.from ?? "?"));
+      const to = resolveTokenSymbol(String(input.to ?? "?"));
+      const amt = input.amount ?? "?";
+      const slippagePct = (input.slippage ?? 0.01) * 100;
+      return `Swap ${amt} ${from} for ${to} (${slippagePct}% max slippage)`;
+    }
+    case "volo_stake":
+      return `Stake ${input.amount} SUI for vSUI`;
+    case "volo_unstake":
+      return `Unstake ${input.amount === "all" ? "all" : input.amount} vSUI`;
+    default:
+      return `Execute ${tool.name}`;
+  }
+}
+
 // src/thinking-budget.ts
 var EFFORT_THINKING_BUDGET_CAPS = {
   // null = thinking force-disabled (LEAN tier — single-fact reads need
@@ -6610,6 +6658,98 @@ async function executeTool(tool, call, context) {
   return { data: result.data, isError: false };
 }
 
+// src/tool-ttls.ts
+var TOOL_TTL_MS = {
+  swap_quote: 3e4,
+  rates_info: 9e4,
+  balance_check: 12e4,
+  portfolio_analysis: 12e4,
+  savings_info: 12e4,
+  health_check: 9e4
+};
+var DEFAULT_TOOL_TTL_MS = 6e4;
+function bundleShortestTtl(toolUseIds, toolNamesById) {
+  if (toolUseIds.length === 0) return DEFAULT_TOOL_TTL_MS;
+  let shortest = Number.POSITIVE_INFINITY;
+  for (const id of toolUseIds) {
+    const name = toolNamesById[id];
+    const ttl = (name !== void 0 ? TOOL_TTL_MS[name] : void 0) ?? DEFAULT_TOOL_TTL_MS;
+    if (ttl < shortest) shortest = ttl;
+  }
+  return Number.isFinite(shortest) ? shortest : DEFAULT_TOOL_TTL_MS;
+}
+var REGENERATABLE_READ_TOOLS = /* @__PURE__ */ new Set([
+  "swap_quote",
+  "rates_info",
+  "balance_check",
+  "portfolio_analysis",
+  "savings_info",
+  "health_check"
+]);
+
+// src/compose-bundle.ts
+function composeBundleFromToolResults(input) {
+  if (input.pendingWrites.length < 2) {
+    throw new Error(
+      "composeBundleFromToolResults requires \u22652 pending writes; use the legacy single-write path for N=1."
+    );
+  }
+  const steps = input.pendingWrites.map((call) => {
+    const tool = findTool(input.tools, call.name);
+    if (!tool) {
+      throw new Error(`Unknown tool '${call.name}' in bundle composition`);
+    }
+    if (tool.flags?.bundleable !== true) {
+      throw new Error(
+        `Tool '${call.name}' is not bundleable. Set ToolFlags.bundleable=true in tool-flags.ts before including it in a bundle. See SPEC 7 \xA7 "Layer 2 \u2014 Bundleable tools (v1)".`
+      );
+    }
+    const description = describeAction(tool, call);
+    const modifiableFields = getModifiableFields(call.name);
+    return {
+      toolName: call.name,
+      toolUseId: call.id,
+      attemptId: randomUUID(),
+      input: call.input,
+      description,
+      ...modifiableFields?.length ? { modifiableFields } : {}
+    };
+  });
+  const regenerateToolUseIds = input.readResults.filter((r) => REGENERATABLE_READ_TOOLS.has(r.toolName)).map((r) => r.toolUseId);
+  const canRegenerate = regenerateToolUseIds.length > 0;
+  let quoteAge;
+  if (regenerateToolUseIds.length > 0) {
+    const stalest = Math.min(
+      ...input.readResults.filter((r) => REGENERATABLE_READ_TOOLS.has(r.toolName)).map((r) => r.timestamp)
+    );
+    quoteAge = Math.max(0, Date.now() - stalest);
+  }
+  const allGuardInjections = [];
+  if (input.guardInjectionsByCallId) {
+    for (const call of input.pendingWrites) {
+      const injections = input.guardInjectionsByCallId[call.id];
+      if (injections?.length) allGuardInjections.push(...injections);
+    }
+  }
+  const firstStep = steps[0];
+  const action = {
+    toolName: firstStep.toolName,
+    toolUseId: firstStep.toolUseId,
+    input: firstStep.input,
+    description: firstStep.description,
+    assistantContent: input.assistantContent,
+    completedResults: input.completedResults,
+    ...allGuardInjections.length ? { guardInjections: allGuardInjections } : {},
+    turnIndex: input.turnIndex,
+    attemptId: firstStep.attemptId,
+    steps,
+    canRegenerate,
+    ...quoteAge !== void 0 ? { quoteAge } : {},
+    ...regenerateToolUseIds.length > 0 ? { regenerateInput: { toolUseIds: regenerateToolUseIds } } : {}
+  };
+  return action;
+}
+
 // src/engine.ts
 var DEFAULT_MAX_TURNS = 10;
 var DEFAULT_MAX_TOKENS = 4096;
@@ -6760,17 +6900,57 @@ var QueryEngine = class {
   async *resumeWithToolResult(action, response) {
     this.abortController = new AbortController();
     const signal = this.abortController.signal;
-    const writeResult = response.approved ? {
-      type: "tool_result",
-      toolUseId: action.toolUseId,
-      content: JSON.stringify(response.executionResult ?? { success: true }),
-      isError: false
-    } : {
-      type: "tool_result",
-      toolUseId: action.toolUseId,
-      content: JSON.stringify({ error: "User declined this action" }),
-      isError: true
-    };
+    const isBundle = Array.isArray(action.steps) && action.steps.length > 0;
+    const writeResultBlocks = [];
+    if (isBundle) {
+      const steps = action.steps;
+      const stepResults = response.stepResults ?? [];
+      const resultByToolUseId = new Map(stepResults.map((r) => [r.toolUseId, r]));
+      for (const step of steps) {
+        if (response.approved) {
+          const stepResult = resultByToolUseId.get(step.toolUseId);
+          if (stepResult) {
+            writeResultBlocks.push({
+              type: "tool_result",
+              toolUseId: step.toolUseId,
+              content: JSON.stringify(stepResult.result),
+              isError: stepResult.isError
+            });
+          } else {
+            writeResultBlocks.push({
+              type: "tool_result",
+              toolUseId: step.toolUseId,
+              content: JSON.stringify({
+                error: "Host omitted this step's execution result. Treating as failure \u2014 actual on-chain state is unknown. Re-check wallet via balance_check before re-attempting.",
+                _hostBugMissingStepResult: true
+              }),
+              isError: true
+            });
+          }
+        } else {
+          writeResultBlocks.push({
+            type: "tool_result",
+            toolUseId: step.toolUseId,
+            content: JSON.stringify({ error: "User declined this action" }),
+            isError: true
+          });
+        }
+      }
+    } else {
+      writeResultBlocks.push(
+        response.approved ? {
+          type: "tool_result",
+          toolUseId: action.toolUseId,
+          content: JSON.stringify(response.executionResult ?? { success: true }),
+          isError: false
+        } : {
+          type: "tool_result",
+          toolUseId: action.toolUseId,
+          content: JSON.stringify({ error: "User declined this action" }),
+          isError: true
+        }
+      );
+    }
     if (action.assistantContent?.length) {
       this.messages.push({ role: "assistant", content: action.assistantContent });
     }
@@ -6781,16 +6961,47 @@ var QueryEngine = class {
         content: r.content,
         isError: r.isError
       })),
-      writeResult
+      ...writeResultBlocks
     ];
     this.messages.push({ role: "user", content: allResults });
-    yield {
-      type: "tool_result",
-      toolName: action.toolName,
-      toolUseId: action.toolUseId,
-      result: response.approved ? response.executionResult ?? { success: true } : { error: "User declined this action" },
-      isError: !response.approved
-    };
+    if (isBundle) {
+      const steps = action.steps;
+      const stepResults = response.stepResults ?? [];
+      const resultByToolUseId = new Map(stepResults.map((r) => [r.toolUseId, r]));
+      for (const step of steps) {
+        const stepResult = resultByToolUseId.get(step.toolUseId);
+        let eventResult;
+        let eventIsError;
+        if (!response.approved) {
+          eventResult = { error: "User declined this action" };
+          eventIsError = true;
+        } else if (stepResult) {
+          eventResult = stepResult.result;
+          eventIsError = stepResult.isError;
+        } else {
+          eventResult = {
+            error: "Host omitted this step's execution result.",
+            _hostBugMissingStepResult: true
+          };
+          eventIsError = true;
+        }
+        yield {
+          type: "tool_result",
+          toolName: step.toolName,
+          toolUseId: step.toolUseId,
+          result: eventResult,
+          isError: eventIsError
+        };
+      }
+    } else {
+      yield {
+        type: "tool_result",
+        toolName: action.toolName,
+        toolUseId: action.toolUseId,
+        result: response.approved ? response.executionResult ?? { success: true } : { error: "User declined this action" },
+        isError: !response.approved
+      };
+    }
     if (!response.approved) {
       yield { type: "turn_complete", stopReason: "end_turn" };
       this.turnReadCache.clear();
@@ -6817,10 +7028,27 @@ var QueryEngine = class {
    * the fresh tool results and narrates from them.
    */
   async *runPostWriteRefresh(action, response, signal) {
-    const refreshList = this.postWriteRefresh?.[action.toolName];
-    if (!refreshList || refreshList.length === 0) return;
-    const exec = response.executionResult;
-    const writeFailed = exec != null && typeof exec === "object" && "success" in exec && exec.success === false;
+    const isBundle = Array.isArray(action.steps) && action.steps.length > 0;
+    const refreshSet = /* @__PURE__ */ new Set();
+    if (isBundle) {
+      for (const step of action.steps) {
+        const stepRefresh = this.postWriteRefresh?.[step.toolName];
+        if (stepRefresh) for (const t of stepRefresh) refreshSet.add(t);
+      }
+    } else {
+      const singleRefresh = this.postWriteRefresh?.[action.toolName];
+      if (singleRefresh) for (const t of singleRefresh) refreshSet.add(t);
+    }
+    if (refreshSet.size === 0) return;
+    const refreshList = Array.from(refreshSet);
+    const writeFailed = (() => {
+      if (isBundle) {
+        const stepResults = response.stepResults ?? [];
+        return stepResults.some((r) => r.isError);
+      }
+      const exec = response.executionResult;
+      return exec != null && typeof exec === "object" && "success" in exec && exec.success === false;
+    })();
     if (writeFailed) return;
     const refreshTools = refreshList.map((name) => findTool(this.tools, name)).filter(
       (t) => t !== void 0 && t.isReadOnly && t.isConcurrencySafe
@@ -6932,6 +7160,16 @@ var QueryEngine = class {
   getMessages() {
     return this.messages;
   }
+  /**
+   * [SPEC 7 P2.4b] Read-only access to the engine's tool registry.
+   * Exposed so out-of-band utilities like `regenerateBundle` can call
+   * `composeBundleFromToolResults({ tools: engine.getTools(), ... })`
+   * without forcing the host to hand-thread the tool array. Mirrors
+   * `getMessages()` access pattern.
+   */
+  getTools() {
+    return this.tools;
+  }
   getMatchedRecipe() {
     return this.matchedRecipe;
   }
@@ -7067,6 +7305,7 @@ var QueryEngine = class {
         pendingToolCalls: []
       };
       const dispatcher = new EarlyToolDispatcher(this.tools, context, this.turnReadCache);
+      const turnReadToolResults = [];
       try {
         const microcompacted = microcompact(this.messages, this.tools);
         this.messages = microcompacted;
@@ -7217,6 +7456,13 @@ ${recipeCtx}`;
                 };
               }
             }
+            if (!finalEvent.isError && tool && tool.isReadOnly) {
+              turnReadToolResults.push({
+                toolUseId: finalEvent.toolUseId,
+                toolName: finalEvent.toolName,
+                timestamp: Date.now()
+              });
+            }
             earlyResultBlocks.push({
               type: "tool_result",
               toolUseId: finalEvent.toolUseId,
@@ -7245,7 +7491,7 @@ ${recipeCtx}`;
       }
       const approved = [];
       const toolResultBlocks = [...earlyResultBlocks];
-      let pendingWrite = null;
+      const pendingWrites = [];
       for (const call of acc.pendingToolCalls) {
         const tool = findTool(this.tools, call.name);
         if (tool && tool.isReadOnly) {
@@ -7298,8 +7544,7 @@ ${recipeCtx}`;
           yield { type: "tool_start", toolName: call.name, toolUseId: call.id, input: call.input };
           continue;
         }
-        pendingWrite = { call, tool };
-        break;
+        pendingWrites.push({ call, tool });
       }
       const guardedApproved = [];
       if (this.guardConfig) {
@@ -7396,6 +7641,11 @@ ${recipeCtx}`;
                 result: finalEvent.result,
                 sourceToolUseId: finalEvent.toolUseId
               });
+              turnReadToolResults.push({
+                toolUseId: finalEvent.toolUseId,
+                toolName: finalEvent.toolName,
+                timestamp: Date.now()
+              });
             } else {
               this.turnReadCache.clear();
             }
@@ -7447,46 +7697,101 @@ ${recipeCtx}`;
         }
         yield toolEvent;
       }
-      if (pendingWrite && this.guardConfig) {
+      const guardPassedWrites = [];
+      const guardInjectionsByCallId = {};
+      let anyGuardBlocked = false;
+      if (this.guardConfig && pendingWrites.length > 0) {
         const convCtx = extractConversationText(this.messages);
-        const check = runGuards(
-          pendingWrite.tool,
-          pendingWrite.call,
-          this.guardState,
-          this.guardConfig,
-          convCtx,
-          this.onGuardFired,
-          { contacts: this.contacts, walletAddress: this.walletAddress }
-        );
-        this.guardEvents.push(...check.events);
-        if (check.blocked) {
-          yield {
-            type: "tool_result",
-            toolName: pendingWrite.call.name,
-            toolUseId: pendingWrite.call.id,
-            result: { error: check.blockReason, _gate: check.blockGate },
-            isError: true
-          };
-          toolResultBlocks.push({
-            type: "tool_result",
-            toolUseId: pendingWrite.call.id,
-            content: JSON.stringify({ error: check.blockReason, _gate: check.blockGate }),
-            isError: true
-          });
+        for (const write of pendingWrites) {
+          const check = runGuards(
+            write.tool,
+            write.call,
+            this.guardState,
+            this.guardConfig,
+            convCtx,
+            this.onGuardFired,
+            { contacts: this.contacts, walletAddress: this.walletAddress }
+          );
+          this.guardEvents.push(...check.events);
+          if (check.blocked) {
+            anyGuardBlocked = true;
+            yield {
+              type: "tool_result",
+              toolName: write.call.name,
+              toolUseId: write.call.id,
+              result: { error: check.blockReason, _gate: check.blockGate },
+              isError: true
+            };
+            toolResultBlocks.push({
+              type: "tool_result",
+              toolUseId: write.call.id,
+              content: JSON.stringify({ error: check.blockReason, _gate: check.blockGate }),
+              isError: true
+            });
+            continue;
+          }
+          if (check.injections.length > 0) {
+            guardInjectionsByCallId[write.call.id] = check.injections;
+            write.call._guardInjections = check.injections;
+          }
+          guardPassedWrites.push(write);
+        }
+        if (anyGuardBlocked) {
           this.messages.push({ role: "assistant", content: acc.assistantBlocks });
           this.messages.push({ role: "user", content: toolResultBlocks });
           continue;
         }
-        if (check.injections.length > 0) {
-          pendingWrite.call._guardInjections = check.injections;
-        }
+      } else {
+        guardPassedWrites.push(...pendingWrites);
       }
-      if (pendingWrite) {
-        const writeGuardInjections = pendingWrite.call._guardInjections;
-        const modifiableFields = getModifiableFields(pendingWrite.call.name);
+      if (guardPassedWrites.length > 0) {
+        const allBundleable = guardPassedWrites.length >= 2 && guardPassedWrites.every((w) => w.tool.flags?.bundleable === true);
         const turnIndex = this.messages.filter((m) => m.role === "assistant").length;
-        const attemptId = randomUUID();
         this.turnPaused = true;
+        if (allBundleable) {
+          const completedResults = toolResultBlocks.map((b) => ({
+            toolUseId: b.toolUseId,
+            content: b.content,
+            isError: b.isError ?? false
+          }));
+          const bundleAction = composeBundleFromToolResults({
+            pendingWrites: guardPassedWrites.map((w) => w.call),
+            tools: this.tools,
+            readResults: turnReadToolResults,
+            assistantContent: acc.assistantBlocks,
+            completedResults,
+            guardInjectionsByCallId,
+            turnIndex
+          });
+          yield { type: "pending_action", action: bundleAction };
+          return;
+        }
+        const pendingWrite = guardPassedWrites[0];
+        if (guardPassedWrites.length > 1) {
+          for (let i = 1; i < guardPassedWrites.length; i++) {
+            const dropped = guardPassedWrites[i];
+            const errBody = JSON.stringify({
+              error: "This write was emitted alongside another write that requires a separate confirmation. Re-emit it after the first write resolves.",
+              _droppedDueToMixedBundleability: true
+            });
+            yield {
+              type: "tool_result",
+              toolName: dropped.call.name,
+              toolUseId: dropped.call.id,
+              result: { error: errBody },
+              isError: true
+            };
+            toolResultBlocks.push({
+              type: "tool_result",
+              toolUseId: dropped.call.id,
+              content: errBody,
+              isError: true
+            });
+          }
+        }
+        const writeGuardInjections = guardInjectionsByCallId[pendingWrite.call.id];
+        const modifiableFields = getModifiableFields(pendingWrite.call.name);
+        const attemptId = randomUUID();
         yield {
           type: "pending_action",
           action: {
@@ -7697,49 +8002,6 @@ function validateHistory(messages) {
   }
   return merged;
 }
-function resolveTokenSymbol(nameOrType) {
-  if (!nameOrType.includes("::")) return nameOrType;
-  const parts = nameOrType.split("::");
-  return parts[parts.length - 1];
-}
-function describeAction(tool, call) {
-  const input = call.input;
-  switch (tool.name) {
-    case "save_deposit": {
-      return `Save ${input.amount} USDC into lending`;
-    }
-    case "withdraw": {
-      const wAsset = input.asset ?? "";
-      return `Withdraw ${input.amount}${wAsset ? " " + wAsset : ""} from lending`;
-    }
-    case "send_transfer":
-      return `Send $${input.amount} to ${input.to}`;
-    case "borrow":
-      return `Borrow $${input.amount} against collateral`;
-    case "repay_debt":
-      return `Repay $${input.amount} of outstanding debt`;
-    case "claim_rewards":
-      return "Claim all pending protocol rewards";
-    case "pay_api": {
-      const url = String(input.url ?? "");
-      const cost = estimatePayApiCost(url);
-      return `Pay for API call to ${url} (~$${cost})`;
-    }
-    case "swap_execute": {
-      const from = resolveTokenSymbol(String(input.from ?? "?"));
-      const to = resolveTokenSymbol(String(input.to ?? "?"));
-      const amt = input.amount ?? "?";
-      const slippagePct = (input.slippage ?? 0.01) * 100;
-      return `Swap ${amt} ${from} for ${to} (${slippagePct}% max slippage)`;
-    }
-    case "volo_stake":
-      return `Stake ${input.amount} SUI for vSUI`;
-    case "volo_unstake":
-      return `Unstake ${input.amount === "all" ? "all" : input.amount} vSUI`;
-    default:
-      return `Execute ${tool.name}`;
-  }
-}
 function flagSuspiciousResult(toolName, result) {
   if (!result || typeof result !== "object") return null;
   const r = result;
@@ -7770,6 +8032,158 @@ function harnessShapeForEffort(effort) {
       return "max";
   }
 }
+async function regenerateBundle(engine, action) {
+  if (!action.steps || action.steps.length < 2) {
+    return {
+      success: false,
+      reason: "pending_action_not_found",
+      message: "Action is not a multi-step bundle"
+    };
+  }
+  if (action.canRegenerate !== true) {
+    return {
+      success: false,
+      reason: "cannot_regenerate",
+      message: "Bundle has canRegenerate=false (no upstream reads contributed)"
+    };
+  }
+  const regenIds = action.regenerateInput?.toolUseIds ?? [];
+  if (regenIds.length === 0) {
+    return {
+      success: false,
+      reason: "cannot_regenerate",
+      message: "Bundle has no regenerateInput.toolUseIds"
+    };
+  }
+  const messages = engine.getMessages();
+  const tools = [...engine.getTools()];
+  const originalReads = [];
+  for (const id of regenIds) {
+    let found = null;
+    outer: for (const msg of messages) {
+      if (msg.role !== "assistant") continue;
+      for (const block of msg.content) {
+        if (block.type === "tool_use" && block.id === id) {
+          found = {
+            name: block.name,
+            input: block.input
+          };
+          break outer;
+        }
+      }
+    }
+    if (!found) {
+      return {
+        success: false,
+        reason: "engine_error",
+        message: `Original tool_use ${id} not found in session history`
+      };
+    }
+    if (!REGENERATABLE_READ_TOOLS.has(found.name)) {
+      continue;
+    }
+    originalReads.push({ toolName: found.name, input: found.input });
+  }
+  if (originalReads.length === 0) {
+    return {
+      success: false,
+      reason: "cannot_regenerate",
+      message: "No regeneratable read tool_use blocks found in session history"
+    };
+  }
+  const timelineEvents = [];
+  const newReads = [];
+  for (const r of originalReads) {
+    const newToolUseId = `regen_${randomUUID().replace(/-/g, "").slice(0, 16)}`;
+    timelineEvents.push({
+      type: "tool_start",
+      toolName: r.toolName,
+      toolUseId: newToolUseId,
+      input: r.input
+    });
+    const t0 = Date.now();
+    let outcome;
+    try {
+      outcome = await engine.invokeReadTool(r.toolName, r.input);
+    } catch (err) {
+      outcome = {
+        data: { error: err instanceof Error ? err.message : String(err) },
+        isError: true
+      };
+    }
+    const durationMs = Date.now() - t0;
+    timelineEvents.push({
+      type: "tool_result",
+      toolName: r.toolName,
+      toolUseId: newToolUseId,
+      result: outcome.data,
+      isError: outcome.isError,
+      durationMs
+    });
+    if (outcome.isError) {
+      return {
+        success: false,
+        reason: "engine_error",
+        message: `Re-execution of ${r.toolName} failed`
+      };
+    }
+    newReads.push({
+      toolUseId: newToolUseId,
+      toolName: r.toolName,
+      input: r.input,
+      result: outcome.data,
+      isError: false,
+      timestamp: t0
+    });
+  }
+  const synthAssistantBlocks = newReads.map((r) => ({
+    type: "tool_use",
+    id: r.toolUseId,
+    name: r.toolName,
+    input: r.input
+  }));
+  const synthUserBlocks = newReads.map((r) => ({
+    type: "tool_result",
+    toolUseId: r.toolUseId,
+    content: typeof r.result === "string" ? r.result : JSON.stringify(r.result),
+    isError: r.isError
+  }));
+  const synthMessages = [
+    { role: "assistant", content: synthAssistantBlocks },
+    { role: "user", content: synthUserBlocks }
+  ];
+  engine.loadMessages([...messages, ...synthMessages]);
+  const pendingWrites = action.steps.map((step) => ({
+    id: step.toolUseId,
+    name: step.toolName,
+    input: step.input
+  }));
+  const readResults = newReads.map((r) => ({
+    toolUseId: r.toolUseId,
+    toolName: r.toolName,
+    timestamp: r.timestamp
+  }));
+  const assistantContent = action.assistantContent ?? [];
+  const completedResults = action.completedResults ?? [];
+  let newPendingAction;
+  try {
+    newPendingAction = composeBundleFromToolResults({
+      pendingWrites,
+      tools,
+      readResults,
+      assistantContent,
+      completedResults,
+      turnIndex: action.turnIndex
+    });
+  } catch (err) {
+    return {
+      success: false,
+      reason: "engine_error",
+      message: err instanceof Error ? err.message : "Bundle rebuild failed"
+    };
+  }
+  return { success: true, newPendingAction, timelineEvents };
+}
 
 // src/streaming.ts
 function serializeSSE(event) {
@@ -7870,7 +8284,8 @@ var StepSchema = z.object({
   flags: z.record(z.unknown()).optional(),
   on_error: OnErrorSchema.optional(),
   input_template: z.record(z.string()).optional(),
-  cost_per_unit: z.string().optional()
+  cost_per_unit: z.string().optional(),
+  bundle: z.boolean().optional()
 });
 var RecipeSchema = z.object({
   name: z.string().min(1),
@@ -7885,6 +8300,19 @@ var RecipeSchema = z.object({
     return new Set(names).size === names.length;
   },
   { message: "Step names must be unique within a recipe" }
+).refine(
+  (r) => {
+    for (const step of r.steps) {
+      if (step.bundle === true) {
+        if (!step.tool) return false;
+        if (!isBundleableTool(step.tool)) return false;
+      }
+    }
+    return true;
+  },
+  {
+    message: "Steps with bundle: true must reference a bundleable confirm-tier write tool. Allowed: save_deposit, withdraw, borrow, repay_debt, send_transfer, swap_execute, claim_rewards, volo_stake, volo_unstake. Forbidden: pay_api, save_contact, any read tool, any auto-tier write."
+  }
 );
 function loadRecipes(yamlDir) {
   const files = readdirSync(yamlDir).filter((f) => f.endsWith(".yaml") || f.endsWith(".yml"));
@@ -8857,6 +9285,6 @@ function sanitizeAnthropicMessages(messages) {
   return merged;
 }
 
-export { AnthropicProvider, BalanceTracker, CANVAS_TEMPLATES, ContextBudget, CostTracker, DEFAULT_GUARD_CONFIG, DEFAULT_LEASE_SEC, DEFAULT_PERMISSION_CONFIG, DEFAULT_POLL_BUDGET_MS, DEFAULT_POLL_INTERVAL_MS, DEFAULT_SYSTEM_PROMPT, EFFORT_THINKING_BUDGET_CAPS, EarlyToolDispatcher, InMemoryDefiCacheStore, InMemoryFetchLock, InMemoryNaviCacheStore, InMemoryWalletCacheStore, InvalidAddressError, McpClientManager, McpResponseCache, MemorySessionStore, NAVI_ADDR_TTL_SEC, NAVI_MCP_CONFIG, NAVI_MCP_URL, NAVI_RATES_TTL_SEC, NAVI_SERVER_NAME, NaviTools, PERMISSION_PRESETS, QueryEngine, READ_TOOLS, RecipeRegistry, RetryTracker, SUINS_NAME_REGEX, SUI_ADDRESS_REGEX, SUI_ADDRESS_STRICT_REGEX, SuinsNotRegisteredError, SuinsRpcError, TOOL_FLAGS, TOOL_MODIFIABLE_FIELDS, TxMutex, WRITE_TOOLS, _resetNaviCircuitBreaker, activitySummaryTool, adaptAllMcpTools, adaptAllServerTools, adaptMcpTool, applyToolFlags, awaitOrFetch, balanceCheckTool, borrowTool, budgetToolResult, buildCachedSystemPrompt, buildMcpTools, buildProactivenessInstructions, buildProfileContext, buildSelfEvaluationInstruction, buildStateContext, buildTool, claimRewardsTool, clampThinkingForEffort, classifyEffort, clearPortfolioCache, clearPortfolioCacheFor, clearPriceMapCache, compactMessages, createGuardRunnerState, engineToSSE, estimateTokens, explainTxTool, extractConversationText, extractMcpText, fetchAddressDefiPortfolio, fetchAddressPortfolio, fetchAudricHistory, fetchAudricPortfolio, fetchAvailableRewards, fetchBalance, fetchHealthFactor, fetchPositions, fetchProtocolStats, fetchRates, fetchSavings, fetchTokenPrices, fetchWalletCoins, findTool, getAudricApiBase, getDefaultTools, getDefiCacheStore, getFetchLock, getMcpManager, getModifiableFields, getNaviCacheStore, getTelemetrySink, getToolFlags, getWalletAddress, getWalletCacheStore, guardArtifactPreview, guardStaleData, harnessShapeForEffort, hasNaviMcp, healthCheckTool, loadRecipes, looksLikeSuiNs, microcompact, mppServicesTool, naviKey, normalizeAddressInput, parseEvalSummary, parseMcpJson, parseRecipe, parseSSE, payApiTool, portfolioAnalysisTool, protocolDeepDiveTool, ratesInfoTool, registerEngineTools, renderCanvasTool, repayDebtTool, requireAgent, resetDefiCacheStore, resetFetchLock, resetNaviCacheStore, resetTelemetrySink, resetWalletCacheStore, resolveAddressToSuinsViaRpc, resolvePermissionTier, resolveSuinsTool, resolveSuinsViaRpc, resolveUsdValue, runGuards, runTools, saveContactTool, saveDepositTool, savingsInfoTool, sendTransferTool, serializeSSE, setDefiCacheStore, setFetchLock, setNaviCacheStore, setTelemetrySink, setWalletCacheStore, spendingAnalyticsTool, swapExecuteTool, swapQuoteTool, tokenPricesTool, toolNameToOperation, toolsToDefinitions, transactionHistoryTool, transformBalance, transformHealthFactor, transformPositions, transformRates, transformRewards, transformSavings, updateGuardStateAfterToolResult, updateTodoTool, validateHistory, voloStakeTool, voloStatsTool, voloUnstakeTool, webSearchTool, withdrawTool, yieldSummaryTool };
+export { AnthropicProvider, BalanceTracker, CANVAS_TEMPLATES, ContextBudget, CostTracker, DEFAULT_GUARD_CONFIG, DEFAULT_LEASE_SEC, DEFAULT_PERMISSION_CONFIG, DEFAULT_POLL_BUDGET_MS, DEFAULT_POLL_INTERVAL_MS, DEFAULT_SYSTEM_PROMPT, DEFAULT_TOOL_TTL_MS, EFFORT_THINKING_BUDGET_CAPS, EarlyToolDispatcher, InMemoryDefiCacheStore, InMemoryFetchLock, InMemoryNaviCacheStore, InMemoryWalletCacheStore, InvalidAddressError, McpClientManager, McpResponseCache, MemorySessionStore, NAVI_ADDR_TTL_SEC, NAVI_MCP_CONFIG, NAVI_MCP_URL, NAVI_RATES_TTL_SEC, NAVI_SERVER_NAME, NaviTools, PERMISSION_PRESETS, QueryEngine, READ_TOOLS, REGENERATABLE_READ_TOOLS, RecipeRegistry, RetryTracker, SUINS_NAME_REGEX, SUI_ADDRESS_REGEX, SUI_ADDRESS_STRICT_REGEX, SuinsNotRegisteredError, SuinsRpcError, TOOL_FLAGS, TOOL_MODIFIABLE_FIELDS, TOOL_TTL_MS, TxMutex, WRITE_TOOLS, _resetNaviCircuitBreaker, activitySummaryTool, adaptAllMcpTools, adaptAllServerTools, adaptMcpTool, applyToolFlags, awaitOrFetch, balanceCheckTool, borrowTool, budgetToolResult, buildCachedSystemPrompt, buildMcpTools, buildProactivenessInstructions, buildProfileContext, buildSelfEvaluationInstruction, buildStateContext, buildTool, bundleShortestTtl, claimRewardsTool, clampThinkingForEffort, classifyEffort, clearPortfolioCache, clearPortfolioCacheFor, clearPriceMapCache, compactMessages, createGuardRunnerState, engineToSSE, estimateTokens, explainTxTool, extractConversationText, extractMcpText, fetchAddressDefiPortfolio, fetchAddressPortfolio, fetchAudricHistory, fetchAudricPortfolio, fetchAvailableRewards, fetchBalance, fetchHealthFactor, fetchPositions, fetchProtocolStats, fetchRates, fetchSavings, fetchTokenPrices, fetchWalletCoins, findTool, getAudricApiBase, getDefaultTools, getDefiCacheStore, getFetchLock, getMcpManager, getModifiableFields, getNaviCacheStore, getTelemetrySink, getToolFlags, getWalletAddress, getWalletCacheStore, guardArtifactPreview, guardStaleData, harnessShapeForEffort, hasNaviMcp, healthCheckTool, isBundleableTool, loadRecipes, looksLikeSuiNs, microcompact, mppServicesTool, naviKey, normalizeAddressInput, parseEvalSummary, parseMcpJson, parseRecipe, parseSSE, payApiTool, portfolioAnalysisTool, protocolDeepDiveTool, ratesInfoTool, regenerateBundle, registerEngineTools, renderCanvasTool, repayDebtTool, requireAgent, resetDefiCacheStore, resetFetchLock, resetNaviCacheStore, resetTelemetrySink, resetWalletCacheStore, resolveAddressToSuinsViaRpc, resolvePermissionTier, resolveSuinsTool, resolveSuinsViaRpc, resolveUsdValue, runGuards, runTools, saveContactTool, saveDepositTool, savingsInfoTool, sendTransferTool, serializeSSE, setDefiCacheStore, setFetchLock, setNaviCacheStore, setTelemetrySink, setWalletCacheStore, spendingAnalyticsTool, swapExecuteTool, swapQuoteTool, tokenPricesTool, toolNameToOperation, toolsToDefinitions, transactionHistoryTool, transformBalance, transformHealthFactor, transformPositions, transformRates, transformRewards, transformSavings, updateGuardStateAfterToolResult, updateTodoTool, validateHistory, voloStakeTool, voloStatsTool, voloUnstakeTool, webSearchTool, withdrawTool, yieldSummaryTool };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map