@genesislcap/ai-assistant 15.10.3 → 15.10.5

package/dist/chat-driver.mjs

@@ -3044,10 +3044,11 @@ function triggerReason(trigger) {
       return "superseded";
   }
 }
-function condenseStub(target, tool, trigger, origLen) {
+function condenseStub(target, tool, trigger, origLen, restorable) {
   const what = target === "args" ? "args" : "result";
   const key = trigger.kind === "superseded" ? ` ${trigger.by}` : "";
-  return `[${tool}${key} \u2014 ${what} elided, ~${origLen} chars (${triggerReason(trigger)}); re-call to restore]`;
+  const restore = restorable ? "; re-call to restore" : "";
+  return `[${tool}${key} \u2014 ${what} elided, ~${origLen} chars (${triggerReason(trigger)})${restore}]`;
 }
 function triggerLabel(trigger) {
   switch (trigger.kind) {
@@ -3104,9 +3105,14 @@ function applyCondensation(history, policies, ctx, onCondensed) {
         return latestByKey.get(trig.by) !== toolCallId;
     }
   };
-  const firstFired = (toolCallId, entry) => triggersOf(entry).find(
-    (t) => (marksDiscontinuity(t.kind) || withinBatch(entry)) && triggerFires(toolCallId, entry, t)
-  );
+  const firstFired = (toolCallId, entry) => {
+    if (entry.firedTrigger) return entry.firedTrigger;
+    const fired = triggersOf(entry).find(
+      (t) => (marksDiscontinuity(t.kind) || withinBatch(entry)) && triggerFires(toolCallId, entry, t)
+    );
+    if (fired) entry.firedTrigger = fired;
+    return fired;
+  };
   return history.map((msg) => {
     if (msg.toolCalls?.length) {
       let changed = false;
@@ -3119,8 +3125,8 @@ function applyCondensation(history, policies, ctx, onCondensed) {
         if (origLen < CONDENSE_MIN_CHARS) return tc;
         changed = true;
         const result = entry.policy.args;
-        const args = result === "drop" ? {} : {
-          [CONDENSED_ARGS_KEY]: result === "pointer" ? condenseStub("args", tc.name, fired, origLen) : result.replaceWith
+        const args = {
+          [CONDENSED_ARGS_KEY]: result === "drop" || result === "pointer" ? condenseStub("args", tc.name, fired, origLen, result === "pointer") : result.replaceWith
         };
         if (!entry.reportedArgs) {
           entry.reportedArgs = true;
@@ -3146,7 +3152,7 @@ function applyCondensation(history, policies, ctx, onCondensed) {
       if (entry && fired && origLen >= CONDENSE_MIN_CHARS) {
         const tool = nameById.get(msg.toolResult.toolCallId) ?? msg.toolResult.toolCallId;
         const result = entry.policy.response;
-        const content = result === "drop" ? "[elided]" : result === "pointer" ? condenseStub("response", tool, fired, origLen) : result.replaceWith;
+        const content = result === "drop" || result === "pointer" ? condenseStub("response", tool, fired, origLen, result === "pointer") : result.replaceWith;
         if (!entry.reportedResponse) {
           entry.reportedResponse = true;
           onCondensed({
@@ -3520,13 +3526,13 @@ var ChatDriver = class _ChatDriver extends EventTarget {
       maxTurnSnapshots = DEFAULT_MAX_TURN_SNAPSHOTS,
       sessionKey = "",
       activityBus = NOOP_ACTIVITY_BUS,
-      budgetExhaustedMessage = DEFAULT_BUDGET_EXHAUSTED_MESSAGE
+      budgetExhaustedMessage
     } = config;
     this.maxToolIterations = maxToolIterations;
     this.condenseBatchCalls = condenseBatchCalls;
     this.sessionKey = sessionKey;
     this.activityBus = activityBus;
-    this.budgetExhaustedMessage = budgetExhaustedMessage;
+    this.budgetExhaustedMessageOverride = budgetExhaustedMessage;
     if (typeof toolHandlers === "function") {
       this.toolHandlersFactory = toolHandlers;
       this.toolHandlers = {};
@@ -3663,6 +3669,12 @@ var ChatDriver = class _ChatDriver extends EventTarget {
    *
    * @internal
    */
+  budgetExhaustedBubble(wall) {
+    if (this.budgetExhaustedMessageOverride != null) return this.budgetExhaustedMessageOverride;
+    if (wall?.otherVendorAvailable !== true) return DEFAULT_BUDGET_EXHAUSTED_MESSAGE;
+    const subject = wall?.vendorLabel ? `${wall.vendorLabel}'s AI usage limit` : "your AI usage limit";
+    return `You've reached ${subject}. Switch to another AI provider in Settings to keep going, or contact your administrator to raise it.`;
+  }
   reportBudgetExhausted(e, pendingUserMessage) {
     if (pendingUserMessage) this.appendToHistory(pendingUserMessage);
     this.budgetExhaustedThisTurn = true;
@@ -3681,7 +3693,7 @@ var ChatDriver = class _ChatDriver extends EventTarget {
       spentUsd: e.spentUsd,
       isSubAgent: this.isSubAgent
     });
-    this.appendToHistory({ role: "assistant", content: this.budgetExhaustedMessage });
+    this.appendToHistory({ role: "assistant", content: this.budgetExhaustedBubble(e) });
     return this.turnDone("budget-exhausted", budgetDetailOf(e));
   }
   /** The typed failure reason on a loop result, or `undefined` for a clean turn / handoff. */
@@ -4810,7 +4822,10 @@ Output format (strict):
         if (this.isSubAgent) {
           this.failSubAgent("budget_exhausted", this.budgetWallDetail);
         } else {
-          this.appendToHistory({ role: "assistant", content: this.budgetExhaustedMessage });
+          this.appendToHistory({
+            role: "assistant",
+            content: this.budgetExhaustedBubble(this.budgetWallDetail)
+          });
         }
         return this.turnDone("budget-exhausted", this.budgetWallDetail);
       }