botmux 3.7.1 → 3.8.0

package/dist/services/bridge-fallback-gate.js

@@ -8,6 +8,14 @@
  * disk and threads them through here.
  *
  * Rules:
+ *   - Non-adopt + no-reply sentinel terminator: suppress the whole turn.
+ *     Botmux-aware models use this explicit protocol when a turn genuinely
+ *     needs no chat response. The signal is the LAST non-empty line of the
+ *     final being exactly `BOTMUX_NO_REPLY` — models almost always explain
+ *     the silence first and then append the token on its own line, so a
+ *     full-string exact match leaked the literal token into Lark. A token
+ *     that only appears inline (mid-sentence, or with prose after it) is
+ *     still a normal answer and is NOT guessed away. See isBridgeNoReplyFinal.
  *   - Adopt mode never suppresses: in /adopt the model in the adopted
  *     session is unaware of botmux, so transcript drain is the ONLY
  *     channel from model to Lark. There's no `botmux send` to compete
@@ -33,11 +41,65 @@
 import { normaliseForFingerprint } from './bridge-turn-queue.js';
 const MATERIAL_FINAL_LENGTH_RATIO = 2;
 const MATERIAL_FINAL_MIN_EXTRA_CHARS = 120;
+export const BRIDGE_NO_REPLY_SENTINEL = 'BOTMUX_NO_REPLY';
+export function isBridgeNoReplyFinal(finalText) {
+    if (finalText === undefined)
+        return false;
+    // Suppress the whole turn when the model's final ENDS WITH a standalone
+    // no-reply sentinel line. We look at the LAST non-empty line only:
+    //   - pure `BOTMUX_NO_REPLY`                       → suppress
+    //   - `<prose>\n\nBOTMUX_NO_REPLY`                 → suppress the whole turn
+    //   - a final whose last non-empty line is prose   → NOT a no-reply signal
+    //     (the token inline in a sentence, or followed by more prose, still posts)
+    // Full-string exact match was too brittle: botmux-aware models almost always
+    // explain the silence first ("...no reply needed.") and then append the token
+    // on its own line, which exact match let leak the literal token into Lark.
+    // Trade-off (accepted): a genuine answer that happens to end with a bare
+    // sentinel line is dropped WHOLE — the product wants a fully silent no-reply
+    // turn over the safer strip-and-forward. The last-non-empty-line rule (not a
+    // substring / endsWith test) keeps that risk to finals the model deliberately
+    // terminated with the sentinel.
+    const lines = finalText.split('\n');
+    for (let i = lines.length - 1; i >= 0; i--) {
+        const line = lines[i].trim();
+        if (line.length === 0)
+            continue;
+        return line === BRIDGE_NO_REPLY_SENTINEL;
+    }
+    return false;
+}
+const BRIDGE_SEND_PREVIEW_MAX_CHARS = 4_000;
+/** Bounded, newline-preserving copy of a `botmux send` body for dashboard
+ *  previews. Unlike the fingerprint normaliser (which collapses ALL whitespace
+ *  incl. newlines into single spaces — right for dedup, wrong for display), this
+ *  keeps line breaks so the dashboard can render the reply's Markdown structure
+ *  (paragraphs / lists / code blocks). Horizontal runs of spaces/tabs within a
+ *  line are collapsed and trailing spaces trimmed to keep the stored copy tidy;
+ *  blank-line runs are capped at one to bound size without flattening structure. */
+export function buildBridgeSendPreviewText(content) {
+    const tidy = String(content ?? '')
+        .replace(/\r\n?/g, '\n')
+        .replace(/[^\S\n]+\n/g, '\n')
+        .replace(/\n{3,}/g, '\n\n')
+        .replace(/^\n+/, '')
+        .replace(/\s+$/, '');
+    if (!tidy)
+        return undefined;
+    return tidy.length > BRIDGE_SEND_PREVIEW_MAX_CHARS
+        ? `${tidy.slice(0, BRIDGE_SEND_PREVIEW_MAX_CHARS - 1)}…`
+        : tidy;
+}
 export function buildBridgeSendMarkerContent(content) {
     const normalized = normaliseForFingerprint(content);
     if (!normalized)
         return undefined;
-    return { contentLength: normalized.length };
+    return {
+        // Length stays fingerprint-normalized: the fallback gate compares it against
+        // normalise(finalText).length, so it must not count preview-only newlines.
+        contentLength: normalized.length,
+        // Preview keeps newlines — derive it from the raw body, NOT `normalized`.
+        previewText: buildBridgeSendPreviewText(content),
+    };
 }
 function hasStructuredContentMarker(marker) {
     return typeof marker.contentLength === 'number';
@@ -63,6 +125,8 @@ function markerSetCoversFinal(markers, finalText) {
 export function shouldSuppressBridgeEmit(turn, nextBoundaryMs, markers, adoptMode) {
     if (adoptMode)
         return false;
+    if (isBridgeNoReplyFinal(turn.finalText))
+        return true;
     if (turn.isLocal)
         return true;
     if (turn.markTimeMs === undefined)

package/dist/services/bridge-fallback-gate.js.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-fallback-gate.js","sourceRoot":"","sources":["../../src/services/bridge-fallback-gate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bridge-fallback-gate.js","sourceRoot":"","sources":["../../src/services/bridge-fallback-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,2BAA2B,GAAG,CAAC,CAAC;AACtC,MAAM,8BAA8B,GAAG,GAAG,CAAC;AAE3C,MAAM,CAAC,MAAM,wBAAwB,GAAG,iBAAiB,CAAC;AAE1D,MAAM,UAAU,oBAAoB,CAAC,SAA6B;IAChE,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1C,wEAAwE;IACxE,mEAAmE;IACnE,8DAA8D;IAC9D,6EAA6E;IAC7E,2EAA2E;IAC3E,+EAA+E;IAC/E,6EAA6E;IAC7E,8EAA8E;IAC9E,2EAA2E;IAC3E,yEAAyE;IACzE,6EAA6E;IAC7E,6EAA6E;IAC7E,8EAA8E;IAC9E,gCAAgC;IAChC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,OAAO,IAAI,KAAK,wBAAwB,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AA2BD,MAAM,6BAA6B,GAAG,KAAK,CAAC;AAE5C;;;;;;oFAMoF;AACpF,MAAM,UAAU,0BAA0B,CAAC,OAAe;IACxD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;SAC/B,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC;SACvB,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC;SAC5B,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;SAC1B,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;SACnB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvB,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,OAAO,IAAI,CAAC,MAAM,GAAG,6BAA6B;QAChD,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,6BAA6B,GAAG,CAAC,CAAC,GAAG;QACxD,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,OAAe;IAEf,MAAM,UAAU,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,OAAO;QACL,6EAA6E;QAC7E,2EAA2E;QAC3E,aAAa,EAAE,UAAU,CAAC,MAAM;QAChC,0EAA0E;QAC1E,WAAW,EAAE,0BAA0B,CAAC,OAAO,CAAC;KACjD,CAAC;AACJ,CAAC;AAMD,SAAS,0BAA0B,CAAC,MAAwB;IAC1D,OAAO,OAAO,MAAM,CAAC,aAAa,KAAK,QAAQ,CAAC;AAClD,CAAC;AAED,SAAS,gCAAgC,CAAC,WAAmB,EAAE,OAA8C;IAC3G,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9F,OAAO,WAAW,IAAI,aAAa,GAAG,2BAA2B;WAC5D,WAAW,GAAG,aAAa,IAAI,8BAA8B,CAAC;AACrE,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAoC,EAAE,SAA6B;IAC/F,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvC,2EAA2E;IAC3E,yEAAyE;IACzE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnE,MAAM,eAAe,GAAG,uBAAuB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACjE,IAAI,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IAElC,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;IACrE,OAAO,CAAC,gCAAgC,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,IAAqB,EACrB,cAAkC,EAClC,OAAoC,EACpC,SAAkB;IAElB,IAAI,SAAS;QAAE,OAAO,KAAK,CAAC;IAC5B,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IACtD,IAAI,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC9B,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;IAC9B,MAAM,KAAK,GAAG,cAAc,IAAI,MAAM,CAAC,iBAAiB,CAAC;IACzD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,KAAK,IAAI,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC;IACvF,OAAO,oBAAoB,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;AAC/D,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;2DA2B2D;AAC3D,MAAM,UAAU,sCAAsC,CACpD,IAAqB,EACrB,cAAkC,EAClC,OAAoC,EACpC,SAAkB;IAElB,IAAI,SAAS;QAAE,OAAO,KAAK,CAAC;IAC5B,IAAI,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC/B,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,IAAI,IAAI,CAAC,cAAc,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAC3F,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3D,OAAO,CAAC,wBAAwB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAC7E,CAAC"}

package/dist/services/card-prefs-store.d.ts

@@ -1,5 +1,9 @@
-import { type ChatReplyMode } from '../bot-registry.js';
+import { type ChatReplyMode, type UsageDisplayMode } from '../bot-registry.js';
 export interface BotCardPrefs {
+    /** Where to show native Context / Token usage:
+     *  'streaming' (default) = live streaming card body, 'footer' = ordinary
+     *  reply-card footer, 'off' = nowhere. */
+    usageDisplay: UsageDisplayMode;
     disableStreamingCard: boolean;
     silentTurnReactions: boolean;
     /** Experimental Codex App presentation mode. Default false preserves the
@@ -29,7 +33,8 @@ export interface BotCardPrefs {
     /** 文档订阅新订阅默认评论触发范围（default 'mention-only'）。 */
     docSubscribeDefaultMode: 'mention-only' | 'all';
 }
-/** Current card prefs for a bot (booleans default false, prompt defaults '' when unset). */
+/** Current card prefs for a bot (`usageDisplay` defaults to 'streaming';
+ * `botToBotSameDir` defaults true; other booleans default false). */
 export declare function getBotCardPrefs(larkAppId: string): BotCardPrefs;
 /**
  * Persist a partial card-prefs change. Only the keys present in `patch` are

package/dist/services/card-prefs-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"card-prefs-store.d.ts","sourceRoot":"","sources":["../../src/services/card-prefs-store.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAU,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGhE,MAAM,WAAW,YAAY;IAC3B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,mBAAmB,EAAE,OAAO,CAAC;IAC7B;;wDAEoD;IACpD,kBAAkB,EAAE,OAAO,CAAC;IAC5B,0BAA0B,EAAE,OAAO,CAAC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB;;8EAE0E;IAC1E,aAAa,EAAE,OAAO,CAAC;IACvB;;kFAE8E;IAC9E,eAAe,EAAE,OAAO,CAAC;IACzB,2EAA2E;IAC3E,oBAAoB,EAAE,OAAO,CAAC;IAC9B,wEAAwE;IACxE,0BAA0B,EAAE,MAAM,CAAC;IACnC,kEAAkE;IAClE,mBAAmB,EAAE,OAAO,CAAC;IAC7B,2FAA2F;IAC3F,qBAAqB,EAAE,aAAa,CAAC;IACrC,iFAAiF;IACjF,uBAAuB,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;IAClE,+CAA+C;IAC/C,uBAAuB,EAAE,cAAc,GAAG,KAAK,CAAC;CACjD;AAED,4FAA4F;AAC5F,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,CAoC/D;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,GAC3B,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CA4I5E"}
+{"version":3,"file":"card-prefs-store.d.ts","sourceRoot":"","sources":["../../src/services/card-prefs-store.ts"],"names":[],"mappings":"AAyBA,OAAO,EAIL,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAG5B,MAAM,WAAW,YAAY;IAC3B;;8CAE0C;IAC1C,YAAY,EAAE,gBAAgB,CAAC;IAC/B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,mBAAmB,EAAE,OAAO,CAAC;IAC7B;;wDAEoD;IACpD,kBAAkB,EAAE,OAAO,CAAC;IAC5B,0BAA0B,EAAE,OAAO,CAAC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB;;8EAE0E;IAC1E,aAAa,EAAE,OAAO,CAAC;IACvB;;kFAE8E;IAC9E,eAAe,EAAE,OAAO,CAAC;IACzB,2EAA2E;IAC3E,oBAAoB,EAAE,OAAO,CAAC;IAC9B,wEAAwE;IACxE,0BAA0B,EAAE,MAAM,CAAC;IACnC,kEAAkE;IAClE,mBAAmB,EAAE,OAAO,CAAC;IAC7B,2FAA2F;IAC3F,qBAAqB,EAAE,aAAa,CAAC;IACrC,iFAAiF;IACjF,uBAAuB,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;IAClE,+CAA+C;IAC/C,uBAAuB,EAAE,cAAc,GAAG,KAAK,CAAC;CACjD;AAED;qEACqE;AACrE,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,CAsC/D;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,GAC3B,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CA4J5E"}

package/dist/services/card-prefs-store.js

@@ -4,7 +4,11 @@
  * in-memory registry sync so the daemon's own card builders pick up the change
  * without a restart.
  *
- * Three independent toggles:
+ * Per-bot card and related session preferences:
+ *   • usageDisplay              — where to show native Context / Token usage:
+ *                                  'streaming' (default) = live streaming card
+ *                                  body, 'footer' = ordinary reply-card footer,
+ *                                  'off' = nowhere
  *   • disableStreamingCard      — suppress the live streaming session card
  *   • silentTurnReactions       — in card-off sessions, also drop the ✋→✅
  *                                  lightweight status reactions on the trigger
@@ -19,13 +23,15 @@
  *                                  (see chat-reply-mode-store). Default 'chat'.
  */
 import { rmwBotEntry } from './config-store.js';
-import { getBot } from '../bot-registry.js';
+import { getBot, normalizeUsageDisplay, DEFAULT_USAGE_DISPLAY, } from '../bot-registry.js';
 import { logger } from '../utils/logger.js';
-/** Current card prefs for a bot (booleans default false, prompt defaults '' when unset). */
+/** Current card prefs for a bot (`usageDisplay` defaults to 'streaming';
+ * `botToBotSameDir` defaults true; other booleans default false). */
 export function getBotCardPrefs(larkAppId) {
     try {
         const c = getBot(larkAppId).config;
         return {
+            usageDisplay: normalizeUsageDisplay(c),
             disableStreamingCard: c.disableStreamingCard === true,
             silentTurnReactions: c.silentTurnReactions === true,
             codexAppCleanInput: c.codexAppCleanInput === true,
@@ -44,6 +50,7 @@ export function getBotCardPrefs(larkAppId) {
     }
     catch {
         return {
+            usageDisplay: DEFAULT_USAGE_DISPLAY,
             disableStreamingCard: false,
             silentTurnReactions: false,
             codexAppCleanInput: false,
@@ -130,7 +137,18 @@ export async function updateBotCardPrefs(larkAppId, patch) {
         else
             delete entry[key];
     };
+    // 用量显示位置：只存非默认模式；'streaming'（默认）删键保持 bots.json 干净
+    // （absent === 'streaming'）。
+    const applyUsageDisplay = (entry, key, val) => {
+        if (val === undefined)
+            return;
+        if (val === 'footer' || val === 'off')
+            entry[key] = val;
+        else
+            delete entry[key];
+    };
     const r = await rmwBotEntry(larkAppId, (entry) => {
+        applyUsageDisplay(entry, 'usageDisplay', patch.usageDisplay);
         apply(entry, 'disableStreamingCard', patch.disableStreamingCard);
         apply(entry, 'silentTurnReactions', patch.silentTurnReactions);
         apply(entry, 'codexAppCleanInput', patch.codexAppCleanInput);
@@ -147,6 +165,7 @@ export async function updateBotCardPrefs(larkAppId, patch) {
         return {
             write: true,
             result: {
+                usageDisplay: normalizeUsageDisplay(entry),
                 disableStreamingCard: entry.disableStreamingCard === true,
                 silentTurnReactions: entry.silentTurnReactions === true,
                 codexAppCleanInput: entry.codexAppCleanInput === true,
@@ -170,6 +189,12 @@ export async function updateBotCardPrefs(larkAppId, patch) {
     if (!r.ok)
         return { ok: false, reason: r.reason };
     // Sync in-memory config so live card builders / routing react without a restart.
+    if (patch.usageDisplay !== undefined) {
+        // Store only a non-default mode; 'streaming' (default) clears the key.
+        bot.config.usageDisplay = (patch.usageDisplay && patch.usageDisplay !== DEFAULT_USAGE_DISPLAY)
+            ? patch.usageDisplay
+            : undefined;
+    }
     if (patch.disableStreamingCard !== undefined) {
         bot.config.disableStreamingCard = patch.disableStreamingCard || undefined;
     }
@@ -214,7 +239,8 @@ export async function updateBotCardPrefs(larkAppId, patch) {
     if (patch.docSubscribeDefaultMode !== undefined) {
         bot.config.docSubscribeDefaultMode = patch.docSubscribeDefaultMode === 'all' ? 'all' : undefined;
     }
-    logger.info(`[card-prefs:${larkAppId}] disableStreamingCard=${r.result.disableStreamingCard} ` +
+    logger.info(`[card-prefs:${larkAppId}] usageDisplay=${r.result.usageDisplay} ` +
+        `disableStreamingCard=${r.result.disableStreamingCard} ` +
         `silentTurnReactions=${r.result.silentTurnReactions} ` +
         `codexAppCleanInput=${r.result.codexAppCleanInput} ` +
         `writableTerminalLinkInCard=${r.result.writableTerminalLinkInCard} privateCard=${r.result.privateCard} ` +

package/dist/services/card-prefs-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"card-prefs-store.js","sourceRoot":"","sources":["../../src/services/card-prefs-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"card-prefs-store.js","sourceRoot":"","sources":["../../src/services/card-prefs-store.ts"],"names":[],"mappings":"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"}

package/dist/services/codex-app-runner-protocol.d.ts

@@ -17,6 +17,15 @@ export interface CodexAppFinalMarker {
     replyTurnId?: string;
     /** Pre-steer Codex App and Mira markers used one id for both domains. */
     legacyTurnId?: string;
+    /** Per-turn token usage (four mutually-exclusive buckets), when the turn's
+     *  thread/tokenUsage/updated notifications yielded a coherent total. Omitted
+     *  when no usage was observed / a protocol anomaly was detected. */
+    usage?: {
+        inputTokens: number;
+        outputTokens: number;
+        cacheReadTokens: number;
+        cacheCreateTokens: number;
+    };
 }
 interface CodexAppLifecycleBase {
     atMs: number;

package/dist/services/codex-app-runner-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-app-runner-protocol.d.ts","sourceRoot":"","sources":["../../src/services/codex-app-runner-protocol.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAE5D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,qBAAqB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,0BAA0B,GAAG,YAAY,GAAG,YAAY,GAAG,QAAQ,CAAC;AAChF,MAAM,MAAM,yBAAyB,GACjC,oBAAoB,GACpB,iBAAiB,GACjB,WAAW,GACX,KAAK,GACL,UAAU,GACV,SAAS,CAAC;AAEd,MAAM,MAAM,sBAAsB,GAC9B,CAAC,qBAAqB,GAAG;IACzB,IAAI,EAAE,cAAc,GAAG,oBAAoB,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,GACA,CAAC,qBAAqB,GAAG;IACzB,IAAI,EAAE,cAAc,GAAG,eAAe,GAAG,gBAAgB,CAAC;IAC1D,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,GACA,CAAC,qBAAqB,GAAG;IACzB,IAAI,EAAE,yBAAyB,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC,GACA,CAAC,qBAAqB,GAAG;IACzB,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,iBAAiB,CAAC;CAC7B,CAAC,GACA,CAAC,qBAAqB,GAAG;IACzB,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,YAAY,GAAG,YAAY,CAAC;IACvC,QAAQ,EAAE,WAAW,GAAG,KAAK,GAAG,UAAU,CAAC;CAC5C,CAAC,GACA,CAAC,qBAAqB,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,0BAA0B,CAAC;IACtC,QAAQ,EAAE,WAAW,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,CAAC;CACxD,CAAC,CAAC;AAEL,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAwBD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAkCvF;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,mBAAmB,GAAG,SAAS,CAU/F;AAED,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,GAAG,sBAAsB,GAAG,SAAS,CA2FpG;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,mBAAmB,EAC3B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,mBAAmB,EAAE,MAAM,GAC1B,iBAAiB,CASnB"}
+{"version":3,"file":"codex-app-runner-protocol.d.ts","sourceRoot":"","sources":["../../src/services/codex-app-runner-protocol.ts"],"names":[],"mappings":"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"}

package/dist/services/codex-app-runner-protocol.js

@@ -65,8 +65,25 @@ export function normalizeAppRunnerFinalMarker(payload) {
         appTurnId: optionalNonEmptyString(payload.appTurnId),
         replyTurnId: optionalNonEmptyString(payload.replyTurnId),
         legacyTurnId: optionalNonEmptyString(payload.turnId),
+        usage: normalizeFinalUsage(payload.usage),
     };
 }
+/** Accept the four-bucket usage only when every field is a non-negative integer
+ *  (a token count), else drop it (daemon omits usage rather than persisting a
+ *  negative/fractional/partial value that a compromised or buggy runner sent). */
+function normalizeFinalUsage(raw) {
+    if (!isRecord(raw))
+        return undefined;
+    const keys = ['inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheCreateTokens'];
+    const out = {};
+    for (const k of keys) {
+        const v = raw[k];
+        if (typeof v !== 'number' || !Number.isInteger(v) || v < 0)
+            return undefined;
+        out[k] = v;
+    }
+    return out;
+}
 export function normalizeCodexAppLifecycleEvent(payload) {
     if (!isRecord(payload) || typeof payload.kind !== 'string')
         return undefined;

package/dist/services/codex-app-runner-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-app-runner-protocol.js","sourceRoot":"","sources":["../../src/services/codex-app-runner-protocol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-app-runner-protocol.js","sourceRoot":"","sources":["../../src/services/codex-app-runner-protocol.ts"],"names":[],"mappings":"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"}

package/dist/services/codex-app-token-usage.d.ts

@@ -0,0 +1,93 @@
+/**
+ * Per-turn token-usage accumulator for the codex app-server protocol.
+ *
+ * codex emits token usage via `thread/tokenUsage/updated` notifications, NOT on
+ * `turn/completed` (whose Turn object carries no usage). A single codex turn can
+ * produce MANY upstream completions (tool-call loops), so the notification's
+ * `tokenUsage.last` is only the LAST completion's usage — never the whole turn.
+ * The authoritative per-turn figure is a delta of the cumulative `total`:
+ *
+ *   - on the first notification for a turn, derive baseline = total - last
+ *     (per field), so a resumed session needs no prior session-total knowledge;
+ *   - the turn's usage so far = latestTotal - baseline (per field);
+ *   - later notifications only advance latestTotal (total-delta is idempotent
+ *     against duplicate notifications — never sum `last`, never overwrite).
+ *
+ * Fail-closed: if `total` regresses or any derived field goes negative, the
+ * usage is dropped (returns null) and the caller logs a protocol warning rather
+ * than reporting corrupt numbers.
+ *
+ * Ref: codex protocol TokenUsageInfo::append_last_usage (total += last; last =
+ * this completion) and app-server ThreadTokenUsageUpdatedNotification /
+ * TokenUsageBreakdown (0.145 generated types).
+ */
+/** codex TokenUsageBreakdown (0.145). All numbers; cumulative on `total`. */
+export interface CodexTokenBreakdown {
+    totalTokens: number;
+    inputTokens: number;
+    cachedInputTokens: number;
+    cacheWriteInputTokens: number;
+    outputTokens: number;
+    reasoningOutputTokens: number;
+}
+/** riff-facing four-bucket usage (mutually exclusive input buckets). */
+export interface TurnTokenUsage {
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadTokens: number;
+    cacheCreateTokens: number;
+}
+/** Validate a raw notification payload's breakdown into a typed one, or null.
+ *  0.145 fields are REQUIRED except `cacheWriteInputTokens` (added later, so a
+ *  compat default of 0 is honest for it only). Any other missing/non-numeric
+ *  field returns null — defaulting them to 0 would misreport a protocol gap as a
+ *  real 0.
+ *
+ *  NOTE: when `total` and `last` are consumed together (the accumulator), prefer
+ *  `parseTokenUsagePair` — it additionally enforces that the back-compat
+ *  cacheWrite default is only honored when BOTH sides omit the field. A lone
+ *  breakdown parsed here cannot see its counterpart, so a `cacheWrite=0` default
+ *  here is provisional until the pair check confirms symmetry. */
+export declare function parseCodexTokenBreakdown(raw: unknown): CodexTokenBreakdown | null;
+/** Parse the `{ total, last }` pair from one notification, enforcing the
+ *  cross-breakdown invariant the single parser can't see: the back-compat
+ *  `cacheWriteInputTokens → 0` default is honest ONLY when BOTH breakdowns omit
+ *  the field (a genuinely old codex). If exactly one side carries it, the two
+ *  disagree (version skew / corruption): silently defaulting the missing side to
+ *  0 would misattribute real cache-create tokens into fresh input AND poison the
+ *  baseline for later completions with a plausible-looking undercount. Return
+ *  null so the caller poisons the turn instead of emitting corrupt buckets. */
+export declare function parseTokenUsagePair(rawTotal: unknown, rawLast: unknown): {
+    total: CodexTokenBreakdown;
+    last: CodexTokenBreakdown;
+} | null;
+/** Map a cumulative-delta codex breakdown to riff's four mutually-exclusive
+ *  buckets. codex `inputTokens` INCLUDES cached-read + cache-write, so the
+ *  fresh-input bucket subtracts both. Returns null if the split is incoherent
+ *  (buckets exceed input) — caller drops usage + warns rather than emit garbage. */
+export declare function toFourBucket(d: CodexTokenBreakdown): TurnTokenUsage | null;
+/** Accumulates per-turn usage from `thread/tokenUsage/updated` notifications for
+ *  ONE appTurnId, using the total-delta algorithm. */
+export declare class TurnTokenUsageAccumulator {
+    private baseline;
+    private latestTotal;
+    private protocolWarning;
+    /** Feed a notification's `tokenUsage` = { total, last, ... }. `total` is
+     *  cumulative; `last` is the most recent completion's usage. */
+    update(total: CodexTokenBreakdown, last: CodexTokenBreakdown): void;
+    /** Mark this turn's usage as unusable (sticky). Called when a notification for
+     *  the turn arrives but its breakdown is malformed: skipping it silently would
+     *  let a LATER valid notification rebuild a fresh baseline and report only the
+     *  last completion — a plausible-looking undercount. Poisoning makes result()
+     *  omit + warn instead. */
+    poison(reason: string): void;
+    /** The turn's usage so far as four buckets, or null if no usage seen / a
+     *  protocol anomaly was detected / the bucket split is incoherent. When usage
+     *  is dropped for an incoherent delta or bucket split (as opposed to simply
+     *  never having seen a notification), a warning is recorded so the caller can
+     *  surface the omission rather than dropping it silently. */
+    result(): TurnTokenUsage | null;
+    /** Non-null when the accumulator gave up on usage for a protocol reason. */
+    get warning(): string | undefined;
+}
+//# sourceMappingURL=codex-app-token-usage.d.ts.map

package/dist/services/codex-app-token-usage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-app-token-usage.d.ts","sourceRoot":"","sources":["../../src/services/codex-app-token-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,6EAA6E;AAC7E,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,wEAAwE;AACxE,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAYD;;;;;;;;;;kEAUkE;AAClE,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,mBAAmB,GAAG,IAAI,CAgBjF;AAUD;;;;;;;+EAO+E;AAC/E,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,OAAO,GACf;IAAE,KAAK,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,mBAAmB,CAAA;CAAE,GAAG,IAAI,CAQlE;AAED;;;oFAGoF;AACpF,wBAAgB,YAAY,CAAC,CAAC,EAAE,mBAAmB,GAAG,cAAc,GAAG,IAAI,CAO1E;AAED;sDACsD;AACtD,qBAAa,yBAAyB;IACpC,OAAO,CAAC,QAAQ,CAAoC;IACpD,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,eAAe,CAAqB;IAE5C;oEACgE;IAChE,MAAM,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAuBnE;;;;+BAI2B;IAC3B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI5B;;;;iEAI6D;IAC7D,MAAM,IAAI,cAAc,GAAG,IAAI;IAe/B,4EAA4E;IAC5E,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAAiC;CACnE"}