switchroom 0.18.23 → 0.18.25

package/telegram-plugin/dist/server.js

@@ -17357,6 +17357,13 @@ function projectAssistantTextBlocks(content, make) {
   });
   return out;
 }
+function sumUsageTokens(usage) {
+  if (usage == null || typeof usage !== "object")
+    return 0;
+  const u = usage;
+  const n = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
+  return n(u.input_tokens) + n(u.output_tokens) + n(u.cache_creation_input_tokens);
+}
 function assistantLineCarriesAnswerSurface(content) {
   if (!Array.isArray(content))
     return false;
@@ -17412,6 +17419,15 @@ function projectTranscriptLine(line) {
     if (typeof mainModel === "string" && !isModelSentinel(mainModel)) {
       events.push({ kind: "model", model: mainModel });
     }
+    const mainUsageTotal = sumUsageTokens(message?.usage);
+    if (mainUsageTotal > 0) {
+      const mainMsgId = message?.id;
+      events.push({
+        kind: "usage",
+        messageId: typeof mainMsgId === "string" ? mainMsgId : null,
+        totalTokens: mainUsageTotal
+      });
+    }
     const textEvents = projectAssistantTextBlocks(content, (text, blockIndex, lastInMessage) => ({ kind: "text", text, blockIndex, lastInMessage }));
     content.forEach((c, i) => {
       const ct = c.type;
@@ -17518,6 +17534,16 @@ function projectSubagentLine(line, agentId, state) {
     if (typeof subModel === "string" && !isModelSentinel(subModel)) {
       events.push({ kind: "sub_agent_model", agentId, model: subModel });
     }
+    const subUsageTotal = sumUsageTokens(message?.usage);
+    if (subUsageTotal > 0) {
+      const subMsgId = message?.id;
+      events.push({
+        kind: "sub_agent_usage",
+        agentId,
+        messageId: typeof subMsgId === "string" ? subMsgId : null,
+        totalTokens: subUsageTotal
+      });
+    }
     const textEvents = projectAssistantTextBlocks(content, (text, blockIndex, lastInMessage) => ({
       kind: "sub_agent_text",
       agentId,

package/telegram-plugin/gateway/callback-query-handlers.ts

@@ -52,6 +52,7 @@ import {
 import {
   buildVaultGrantApprovedInbound,
   buildVaultGrantApprovedCardText,
+  normalizeGrantReason,
   buildVaultGrantDeniedInbound,
   buildVaultSaveCompletedInbound,
   buildVaultSaveFailedInbound,
@@ -786,6 +787,10 @@ async function performVaultAccessApproval(
   pendingCardStore.remove(stageId)
   if (pending.card_message_id != null) {
     const days = Math.round(pending.ttl_seconds / 86400)
+    // Normalize + cap the agent-supplied reason to a single line BEFORE
+    // escaping, so the value passed into the card builder is already
+    // safe to render inside the `_Reason: …_` italic clause.
+    const reasonNormalized = normalizeGrantReason(pending.reason)
     const footer =
       getVaultApprovalAuthMode() === 'telegram-id'
         ? `\n_Approver verified by Telegram identity — broker auto-unlocked at startup._`
@@ -801,6 +806,8 @@ async function performVaultAccessApproval(
             key: pending.key,
             days,
             grantId: id,
+            reasonEscaped:
+              reasonNormalized.length > 0 ? escapeHtmlForTg(reasonNormalized) : undefined,
             footer,
           }),
         ),