@qduc/term2 0.19.0 → 0.21.0

package/dist/utils/streaming/streaming-speed-tracker.js

@@ -12,7 +12,7 @@
  * independently, starting from zero.
  */
 /** Average characters per token heuristic for English/code text when provider does not stream token counts. */
-const DEFAULT_CHARS_PER_TOKEN = 3.8;
+export const DEFAULT_CHARS_PER_TOKEN = 3.8;
 /** Live speed is computed over a trailing window so it tracks current throughput, not the whole-request average. */
 const LIVE_WINDOW_MS = 3000;
 /** Bounds for a request's observed chars-per-token ratio, so one noisy request can't skew future estimates wildly. */
@@ -20,12 +20,32 @@ const MIN_CALIBRATED_CHARS_PER_TOKEN = 1;
 const MAX_CALIBRATED_CHARS_PER_TOKEN = 10;
 /** Minimum accumulated characters required before trusting a request's ratio for calibration. */
 const MIN_CHARS_FOR_CALIBRATION = 20;
+/** Completion tokens this far above the visible char estimate imply hidden tokens in the numerator. */
+const HIDDEN_TOKEN_RATIO = 2;
+/**
+ * Single-sequence decode rates above this are not plausible production
+ * throughput — the numerator/denominator pair describes a burst or a tail
+ * window, not sustained decode. Calibrated against a day of OpenRouter
+ * muse-spark traffic (n=1410, honest full-request p99 ≈ 670 tok/s): a 500
+ * cutoff marks 81% of settled figures as burst-inflated while clearing
+ * genuine sustained rates (median honest ≈ 60 tok/s) by a wide margin.
+ */
+export const MAX_PLAUSIBLE_DECODE_TPS = 500;
+export function formatTokensPerSecond(tps, approximate = false) {
+    const value = tps.toFixed(1);
+    return approximate ? `~${value} tok/s` : `${value} tok/s`;
+}
 export class StreamingSpeedTracker {
     startTime;
     firstTokenTime = null;
     lastUpdateTime = null;
+    streamedTextChars = 0;
+    toolArgChars = 0;
+    committedToolArgChars = 0;
     accumulatedChars = 0;
     exactTokens = null;
+    /** Character count at the last `recordUsageTokens` sample, so later deltas can be added on top. */
+    charsAtExactTokens = 0;
     /**
      * Chars-per-token used for live estimates before exact usage arrives. Starts at
      * `DEFAULT_CHARS_PER_TOKEN` and is recalibrated from each request's real usage in
@@ -52,10 +72,20 @@ export class StreamingSpeedTracker {
         this.startTime = now;
         this.firstTokenTime = null;
         this.lastUpdateTime = null;
+        this.streamedTextChars = 0;
+        this.toolArgChars = 0;
+        this.committedToolArgChars = 0;
         this.accumulatedChars = 0;
         this.exactTokens = null;
+        this.charsAtExactTokens = 0;
         this.samples = [];
     }
+    getCharsPerToken() {
+        return this.charsPerToken;
+    }
+    refreshAccumulatedChars() {
+        this.accumulatedChars = this.streamedTextChars + this.committedToolArgChars + this.toolArgChars;
+    }
     recordSample(now) {
         this.samples.push({ time: now, tokens: this.getEstimatedTokens() });
         // Drop samples older than the window plus one extra so we always have a boundary sample to interpolate from.
@@ -74,12 +104,16 @@ export class StreamingSpeedTracker {
         if (this.firstTokenTime === null) {
             this.firstTokenTime = now;
         }
-        this.accumulatedChars += length;
+        this.streamedTextChars += length;
+        this.refreshAccumulatedChars();
         this.lastUpdateTime = now;
         this.recordSample(now);
     }
     /**
      * Record cumulative characters streamed (e.g. from tool call argument streaming).
+     * Argument counts are cumulative per tool call, so a drop commits the previous
+     * tool's chars and starts a new one. Text and tool-arg chars are summed: both
+     * count toward completion tokens.
      */
     recordCumulativeChars(cumulativeChars, now = Date.now()) {
         if (cumulativeChars <= 0)
@@ -87,26 +121,30 @@ export class StreamingSpeedTracker {
         if (this.firstTokenTime === null) {
             this.firstTokenTime = now;
         }
-        this.accumulatedChars = Math.max(this.accumulatedChars, cumulativeChars);
+        if (cumulativeChars < this.toolArgChars) {
+            this.committedToolArgChars += this.toolArgChars;
+        }
+        this.toolArgChars = cumulativeChars;
+        this.refreshAccumulatedChars();
         this.lastUpdateTime = now;
         this.recordSample(now);
     }
     /**
      * Record exact token counts if the provider streams usage updates.
+     * Calibrates the live chars-per-token ratio for this request's remaining
+     * deltas, not only the next request.
      */
     recordUsageTokens(completionTokens, now = Date.now()) {
-        if (this.firstTokenTime === null && completionTokens > 0) {
-            this.firstTokenTime = now;
-        }
         this.exactTokens = completionTokens;
         this.lastUpdateTime = now;
         this.calibrateCharsPerToken(completionTokens);
+        this.charsAtExactTokens = this.accumulatedChars;
         this.recordSample(now);
     }
     /**
      * Recalibrate the chars-per-token ratio from this request's real accumulated chars vs. its
-     * exact token count, so the NEXT request's live estimate (before its own usage arrives) starts
-     * from an observed ratio instead of the generic default. Ignored if there isn't enough
+     * exact token count, so later deltas of this request and the next request after `reset()`
+     * start from an observed ratio instead of the generic default. Ignored if there isn't enough
      * accumulated text to trust the sample (e.g. a tool-only request with no generated text).
      */
     calibrateCharsPerToken(exactTokens) {
@@ -130,7 +168,8 @@ export class StreamingSpeedTracker {
      */
     getEstimatedTokens() {
         if (this.exactTokens !== null) {
-            return this.exactTokens;
+            const extraChars = Math.max(0, this.accumulatedChars - this.charsAtExactTokens);
+            return this.exactTokens + Math.round(extraChars / this.charsPerToken);
         }
         return Math.round(this.accumulatedChars / this.charsPerToken);
     }
@@ -177,24 +216,53 @@ export class StreamingSpeedTracker {
         return Number.isFinite(tps) && tps > 0 ? Math.round(tps * 10) / 10 : null;
     }
     /**
-     * Calculate exact settled tokens per second when generation finishes.
+     * Calculate settled tokens per second when generation finishes.
      *
-     * @param finalCompletionTokens Exact completion tokens from provider's final usage.
-     * @param endTime Generation end timestamp.
+     * Prefers the provider's `completion_ms` when present. Otherwise measures
+     * wall-clock from the first visible token. Returns null rather than silently
+     * falling back to request start (which would mix TTFT into decode speed).
      */
-    getSettledTps(finalCompletionTokens, endTime = Date.now()) {
-        const tokens = finalCompletionTokens ?? this.getEstimatedTokens();
-        if (tokens <= 0)
+    getSettledTps(options) {
+        const rawTokens = options?.completionTokens ?? this.getEstimatedTokens();
+        if (rawTokens <= 0)
             return null;
-        // If firstTokenTime was never captured (e.g. non-streaming or instantaneous response),
-        // measure from request startTime.
-        const start = this.firstTokenTime ?? this.startTime;
-        const durationMs = endTime - start;
-        if (durationMs <= 0)
+        const completionMs = options?.completionMs;
+        const hasProviderDuration = completionMs != null && completionMs > 0;
+        const endTime = options?.endTime ?? Date.now();
+        const durationMs = hasProviderDuration
+            ? completionMs
+            : this.firstTokenTime !== null
+                ? endTime - this.firstTokenTime
+                : null;
+        if (durationMs == null || durationMs <= 0)
             return null;
-        const durationSec = durationMs / 1000;
-        const tps = tokens / durationSec;
-        return Number.isFinite(tps) && tps > 0 ? Math.round(tps * 10) / 10 : null;
+        // Provider duration already covers hidden reasoning. Only strip those tokens
+        // from the wall-clock path, where the clock started at the first visible delta.
+        const reasoningTokens = options?.reasoningTokens ?? 0;
+        const visibleTokens = rawTokens - reasoningTokens;
+        const subtractedReasoning = !hasProviderDuration && reasoningTokens > 0 && visibleTokens > 0;
+        const tokens = subtractedReasoning ? visibleTokens : rawTokens;
+        const tps = tokens / (durationMs / 1000);
+        if (!Number.isFinite(tps) || tps <= 0)
+            return null;
+        const approximate = !hasProviderDuration && !subtractedReasoning && this.isHiddenReasoningInflated(rawTokens);
+        const settled = { tps: Math.round(tps * 10) / 10, approximate };
+        // A settled rate no single sequence plausibly sustains describes a burst
+        // or tail window, not sustained decode. Attach the window so the footer
+        // can show what fraction of the turn it covers. Only the wall-clock path
+        // needs this: a provider duration already scopes the rate honestly.
+        if (!hasProviderDuration && settled.tps > MAX_PLAUSIBLE_DECODE_TPS) {
+            settled.decodeWindowMs = durationMs;
+        }
+        return settled;
+    }
+    isHiddenReasoningInflated(completionTokens) {
+        if (this.accumulatedChars < MIN_CHARS_FOR_CALIBRATION)
+            return false;
+        const visibleEstimate = this.accumulatedChars / this.charsPerToken;
+        if (!Number.isFinite(visibleEstimate) || visibleEstimate <= 0)
+            return false;
+        return completionTokens >= visibleEstimate * HIDDEN_TOKEN_RATIO;
     }
     /**
      * Returns a complete snapshot of current speed metrics.

package/dist/utils/streaming/streaming-speed-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"streaming-speed-tracker.js","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-speed-tracker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AASH,+GAA+G;AAC/G,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAEpC,oHAAoH;AACpH,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B,sHAAsH;AACtH,MAAM,8BAA8B,GAAG,CAAC,CAAC;AACzC,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAC1C,iGAAiG;AACjG,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAOrC,MAAM,OAAO,qBAAqB;IACxB,SAAS,CAAS;IAClB,cAAc,GAAkB,IAAI,CAAC;IACrC,cAAc,GAAkB,IAAI,CAAC;IACrC,gBAAgB,GAAG,CAAC,CAAC;IACrB,WAAW,GAAkB,IAAI,CAAC;IAC1C;;;;;OAKG;IACK,aAAa,CAAS;IAC9B,2GAA2G;IACnG,OAAO,GAAkB,EAAE,CAAC;IAEpC,YAAY,OAAwD;QAClE,IAAI,CAAC,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,OAAO,EAAE,aAAa,IAAI,uBAAuB,CAAC;IACzE,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QACnC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAEO,YAAY,CAAC,GAAW;QAC9B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;QACpE,6GAA6G;QAC7G,MAAM,MAAM,GAAG,GAAG,GAAG,cAAc,GAAG,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC;YAChE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAED;;OAEG;IACI,WAAW,CAAC,IAAoB,EAAE,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QAC/D,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC;QACjC,IAAI,MAAM,IAAI,CAAC;YAAE,OAAO;QACxB,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,gBAAgB,IAAI,MAAM,CAAC;QAChC,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,qBAAqB,CAAC,eAAuB,EAAE,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QAC5E,IAAI,eAAe,IAAI,CAAC;YAAE,OAAO;QACjC,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,iBAAiB,CAAC,gBAAwB,EAAE,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QACzE,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,gBAAgB,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;QAC1B,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED;;;;;OAKG;IACK,sBAAsB,CAAC,WAAmB;QAChD,IAAI,WAAW,IAAI,CAAC,IAAI,IAAI,CAAC,gBAAgB,GAAG,yBAAyB;YAAE,OAAO;QAClF,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,GAAG,WAAW,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO;QAClD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,8BAA8B,EAAE,IAAI,CAAC,GAAG,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC,CAAC;IACjH,CAAC;IAED;;OAEG;IACI,SAAS;QACd,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACI,kBAAkB;QACvB,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;;;OAQG;IACI,UAAU,CAAC,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QACxC,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAE9C,MAAM,oBAAoB,GAAG,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC;QACvD,+EAA+E;QAC/E,IAAI,oBAAoB,GAAG,GAAG,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5C,IAAI,SAAS,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAEhC,MAAM,WAAW,GAAG,GAAG,GAAG,cAAc,CAAC;QACzC,uFAAuF;QACvF,wEAAwE;QACxE,IAAI,MAAM,GAAuB,IAAI,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,IAAI,MAAM,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC/B,MAAM,GAAG,MAAM,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,MAAM;YACR,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QAC9D,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAEhD,MAAM,UAAU,GAAG,GAAG,GAAG,UAAU,CAAC;QACpC,MAAM,MAAM,GAAG,SAAS,GAAG,YAAY,CAAC;QACxC,IAAI,UAAU,GAAG,GAAG,IAAI,MAAM,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAEjD,MAAM,WAAW,GAAG,UAAU,GAAG,IAAI,CAAC;QACtC,MAAM,GAAG,GAAG,MAAM,GAAG,WAAW,CAAC;QACjC,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5E,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,qBAA8B,EAAE,OAAO,GAAW,IAAI,CAAC,GAAG,EAAE;QAC/E,MAAM,MAAM,GAAG,qBAAqB,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClE,IAAI,MAAM,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAE7B,uFAAuF;QACvF,kCAAkC;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,SAAS,CAAC;QACpD,MAAM,UAAU,GAAG,OAAO,GAAG,KAAK,CAAC;QACnC,IAAI,UAAU,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAEjC,MAAM,WAAW,GAAG,UAAU,GAAG,IAAI,CAAC;QACtC,MAAM,GAAG,GAAG,MAAM,GAAG,WAAW,CAAC;QACjC,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5E,CAAC;IAED;;OAEG;IACI,WAAW,CAAC,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAE9B,OAAO;YACL,GAAG;YACH,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,SAAS;YACrC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC;YAC5C,eAAe,EAAE,IAAI,CAAC,kBAAkB,EAAE;SAC3C,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"streaming-speed-tracker.js","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-speed-tracker.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qduc/term2",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "A terminal-based AI assistant that can help you get things done on your computer",
   "license": "MIT",
   "author": "qduc",
@@ -115,8 +115,8 @@
     "typecheck": "tsc --noEmit",
     "test": "cross-env NODE_ENV=test vitest run --reporter=minimal",
     "test:changed": "cross-env NODE_ENV=test vitest run --reporter=minimal --changed --passWithNoTests=false",
-    "test:e2e": "cross-env NODE_ENV=test vitest run --reporter=minimal .e2e.test.ts",
-    "test:codex-network": "cross-env NODE_ENV=test vitest run --reporter=minimal scripts/fake-codex-server.e2e.test.ts",
+    "test:e2e": "cross-env NODE_ENV=test vitest run --reporter=minimal --config vitest.e2e.config.ts",
+    "test:codex-network": "cross-env NODE_ENV=test vitest run --reporter=minimal --config vitest.e2e.config.ts scripts/fake-codex-server.e2e.test.ts",
     "test:provider-black-box": "cross-env NODE_ENV=test node scripts/run-provider-black-box.mjs",
     "provider:record": "tsx scripts/provider-record.ts",
     "provider:fixture:prepare": "tsx scripts/provider-fixture-prepare.ts",