@vincemakes/kiso-code 0.32.2 → 0.34.0

package/dist/chat.d.ts

@@ -183,7 +183,7 @@ export declare function parseSaferOptions(text: string): SaferOption[] | null;
  *  task file has none. 50 is named here; a finding moves it, never a stray
  *  edit. */
 export declare const CHECKPOINT_TURNS = 50;
-export declare function consumeRun(session: AgentSession, run: Run, input: LineInput, turnNo: number, faux: boolean, statusCb: ((usage: RunUsage, ctxRatio: number, costUsd?: number | null) => void) | null, 
+export declare function consumeRun(session: AgentSession, run: Run, input: LineInput, turnNo: number, faux: boolean, statusCb: ((usage: RunUsage, ctxRatio: number, costUsd?: number | null, tokPerSec?: number | null) => void) | null, 
 /** W21: the amend words ("Yes + feedback") ride the NEXT user turn —
  *  threaded from chat's submitTurn; absent in the recovery flow
  *  (resume) where a dropped amend is noticed instead. */

package/dist/chat.js

@@ -5,7 +5,7 @@
  * estimates. All bodies moved verbatim from index.ts.
  */
 import { readFileSync, statSync } from "node:fs";
-import { escapeTerminal, cacheHitPct, idleStatus, palette, renderEvent, renderRecap, runningStatus, toolTarget, verifyOfferView, STATUS_GLYPHS, } from "@vincemakes/kiso-tui";
+import { escapeTerminal, cacheHitPct, decodeRate, idleStatus, palette, renderEvent, renderRecap, runningStatus, toolTarget, verifyOfferView, STATUS_GLYPHS, } from "@vincemakes/kiso-tui";
 import { askView, deletionRiskHint, editFileDiff, writeFileDiff } from "@vincemakes/kiso-tui";
 import { canonicalTargetPath, shellProgressPath } from "@vincemakes/kiso-tools-node";
 import { echoText } from "@vincemakes/kiso-tui-cells/render";
@@ -148,8 +148,18 @@ endpoint) {
     // backend's own words and keeps its 0 — the display's rule, not the
     // record's.
     const unobservable = model !== undefined && lookupModelMetadata(model, endpoint)?.capabilities.promptCaching === "unobservable";
+    // DF-0322-F2: the DISPLAY is handed the provider's own word, not the
+    // canonical one. `canonicalizeUsage` sets `cacheRead ?? 0` because
+    // accounting has to sum numbers — correct there, and pinned that way by
+    // the gate — but it erases the difference between "the backend answered
+    // zero" and "the backend said nothing about caching". Handing the row the
+    // canonical zero made it claim a measurement that never happened, which
+    // is the family OR-10 and DF-0311-F1 belong to. OR-10's own comment drew
+    // this line first: the ledger keeps the backend's 0, the display's rule
+    // is not the record's.
+    const reportedCache = ev.cacheRead === null ? null : c.cacheRead;
     return {
-        usage: { in: c.input, out: c.output, cache: unobservable ? null : c.cacheRead, known: ev.known },
+        usage: { in: c.input, out: c.output, cache: unobservable ? null : reportedCache, known: ev.known },
         total,
         missed: unobservable ? null : missed,
         costUsd: c.costUsd,
@@ -581,6 +591,10 @@ export async function consumeRun(session, run, input, turnNo, faux, statusCb,
 submitTurn) {
     let last;
     let usage = { in: null, out: null, cache: null, known: false };
+    // TPS-1: the decode clock, armed by the FIRST streamed event of a call
+    // and read at that call's usage event. Per CALL, not per turn — a turn
+    // with three model calls reports the third, and each one times itself.
+    let callFirstEventAt = null;
     let prevTotal = null;
     let missed = null;
     // v3 §02: the recap line derives ENTIRELY from the local event stream
@@ -644,6 +658,7 @@ submitTurn) {
                     body.userLine(echoText(ev.content));
                     break;
                 case "thinking":
+                    callFirstEventAt ??= Date.now(); // TPS-1: reasoning IS decoding
                     body.thinkingAppend(ev.text);
                     break;
                 case "tool_call_end":
@@ -694,6 +709,7 @@ submitTurn) {
                     break;
                 }
                 case "text_delta":
+                    callFirstEventAt ??= Date.now(); // TPS-1
                     body.textAppend(ev.text);
                     break;
                 case "text_end":
@@ -715,7 +731,12 @@ submitTurn) {
                     missed = delta.missed;
                     // TUI2-R1 (E): the request's canonical cost rides the same
                     // callback the usage does — one settled request, one addition.
-                    statusCb?.(usage, displayCtxRatio(session), delta.costUsd);
+                    // TPS-1: the rate of the call that just settled. The clock is
+                    // cleared here rather than at the turn boundary, so a turn's
+                    // second call is timed from ITS own first event.
+                    const tokPerSec = callFirstEventAt === null ? null : decodeRate(ev.outputTokens, Date.now() - callFirstEventAt);
+                    callFirstEventAt = null;
+                    statusCb?.(usage, displayCtxRatio(session), delta.costUsd, tokPerSec);
                     break;
                 }
                 case "uncertain_pending":
@@ -965,6 +986,7 @@ export async function chat(session, faux, input, autoCompact, nav) {
         // rotates every 200ms; the idle state returns after the run.
         runStart = Date.now();
         runUsage = { in: null, out: null, cache: null, known: false };
+        lastTokPerSec = null; // TPS-1: nothing has settled in THIS turn yet
         const stopSpinner = startStatusSpinner((g) => {
             runGlyph = g;
             paintRunning();
@@ -1156,11 +1178,25 @@ export async function chat(session, faux, input, autoCompact, nav) {
     let spentUsd = null;
     let runGlyph = "▖";
     let runStart = Date.now();
+    // TPS-1: the decode rate of the last SETTLED call. One variable serves
+    // both rows because they want the same number at different moments;
+    // only the reset points differ, and they are all on the ENTRY side —
+    // cleared when a turn starts (so the running row never shows the
+    // previous turn's figure while a new one is in flight) and when the
+    // binding changes (DF-0311-F1: a model that has not run has no
+    // measurement), never at a turn's END, so the idle row can carry the
+    // last call of the last turn.
+    let lastTokPerSec = null;
+    // DF-0330-F1: the terminal's own width, read at paint time so a resize
+    // is honoured. winsize reports 0 columns in some hosts and 0 is not
+    // nullish, so the guard is `> 0` rather than `??` (the same shape the
+    // compositor's own width call uses).
+    const rowWidth = () => (process.stdout.columns > 0 ? process.stdout.columns : 80);
     // KC2 §5: the STATE (the glyph, the run's start, the usage, the dock)
     // stays here; the ROW's text is the tui's status formatter.
     const paintRunning = () => {
         if (dock.active)
-            dock.setStatus(runningStatus(runGlyph, runStart, runUsage.out, displayCtxRatio(session)));
+            dock.setStatus(runningStatus(runGlyph, runStart, runUsage.out, displayCtxRatio(session), lastTokPerSec));
     };
     // W19: under plan the idle row makes the posture unmistakable — the W4
     // parentheses idiom names the read-only constraint. The tier is the
@@ -1174,7 +1210,12 @@ export async function chat(session, faux, input, autoCompact, nav) {
         dock.setStatus(idleStatus(getMode() === "plan" ? "plan (read-only)" : getMode(), statusModelLabel(session), displayCtxRatio(session), {
             cacheHitPct: cacheHitPct(runUsage),
             costUsd: spentUsd,
-        }));
+            tokPerSec: lastTokPerSec,
+        }, 
+        // DF-0330-F1: the row's budget. Without it the row is composed
+        // blind and invariant ① cuts whatever sits last — which is how
+        // a measured rate went missing at 100 columns.
+        rowWidth()));
     };
     // TUI2-R2 ⑥ — the BOOT status line. The row is the product's one
     // persistent claim about itself (the tier, how to change it, the model,
@@ -1198,11 +1239,16 @@ export async function chat(session, faux, input, autoCompact, nav) {
     // binding's, and the row does not render it anyway.
     const modelSwitched = () => {
         runUsage = { in: null, out: null, cache: null, known: false };
+        lastTokPerSec = null; // TPS-1: the rate belonged to the old binding
         paintIdle();
     };
-    const statusCb = (u, ctx, costUsd) => {
+    const statusCb = (u, ctx, costUsd, tokPerSec) => {
         runUsage = u;
         addCost(costUsd ?? null);
+        // TPS-1: a call that could not be measured leaves the row as it was
+        // rather than blanking a figure the previous call earned.
+        if (tokPerSec != null)
+            lastTokPerSec = tokPerSec;
         paintRunning();
     };
     // TUI2-R1 (E): the canonical cost of one settled request, added to the
@@ -1357,6 +1403,7 @@ export async function chat(session, faux, input, autoCompact, nav) {
         // spent, reported as seconds it did.
         runStart = Date.now();
         runUsage = { in: null, out: null, cache: null, known: false };
+        lastTokPerSec = null; // TPS-1: nothing has settled in THIS turn yet
         const last = await consumeRun(session, recoveryRun, input, turnNo, faux, statusCb, submitTurn);
         currentRun = null;
         failOnFauxExhaustion(last, faux, input);

package/dist/index.js

@@ -834,7 +834,9 @@ async function pickSession(agent, input) {
 function paintBootStatus(session) {
     if (!dock.active)
         return;
-    dock.setStatus(idleStatus(getMode() === "plan" ? "plan (read-only)" : getMode(), statusModelLabel(session), displayCtxRatio(session)));
+    // DF-0330-F1: the BOOT row gets the budget too — it is the same row, and
+    // the opening screen is where a long model id is first seen.
+    dock.setStatus(idleStatus(getMode() === "plan" ? "plan (read-only)" : getMode(), statusModelLabel(session), displayCtxRatio(session), undefined, process.stdout.columns > 0 ? process.stdout.columns : 80));
 }
 /** PH-1a (finding PH-F12): a usage error raised from inside the TUI —
  *  main's finally still runs (dock teardown, agent close, temp cleanup)

package/dist/resume.js

@@ -33,8 +33,11 @@ export async function resume(session, prompt, faux, input) {
     // the recovery flow prints the BARE mode (chat spells plan's posture) —
     // the extraction keeps that difference, it was not asked to settle it.
     const paintIdle = () => {
+        // DF-0330-F1: the recovery flow paints the same row, so it gets the
+        // same budget. It has no meter, so nothing here can be dropped that
+        // was not already at risk of being cut.
         if (dock.active)
-            dock.setStatus(idleStatus(getMode(), agentModel, estimateCtxRatio(session)));
+            dock.setStatus(idleStatus(getMode(), agentModel, estimateCtxRatio(session), undefined, process.stdout.columns > 0 ? process.stdout.columns : 80));
     };
     const withRun = async (run) => {
         currentRun = run;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vincemakes/kiso-code",
-	"version": "0.32.2",
+	"version": "0.34.0",
 	"description": "kiso-code — the coding agent on kiso, the durable runtime for AI agents: kiso chat / kiso resume / kiso sessions.",
 	"type": "module",
 	"license": "MIT",
@@ -18,20 +18,20 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"@vincemakes/kiso-ask-ext": "0.32.2",
-		"@vincemakes/kiso-core": "0.32.2",
-		"@vincemakes/kiso-evals": "0.32.2",
-		"@vincemakes/kiso-mcp-ext": "0.32.2",
-		"@vincemakes/kiso-provider-anthropic": "0.32.2",
-		"@vincemakes/kiso-provider-openai": "0.32.2",
-		"@vincemakes/kiso-provider-openai-responses": "0.32.2",
-		"@vincemakes/kiso-runtime": "0.32.2",
-		"@vincemakes/kiso-skills-ext": "0.32.2",
-		"@vincemakes/kiso-subagent-ext": "0.32.2",
-		"@vincemakes/kiso-task-ext": "0.32.2",
-		"@vincemakes/kiso-tools-node": "0.32.2",
-		"@vincemakes/kiso-tui": "0.32.2",
-		"@vincemakes/kiso-tui-cells": "0.32.2"
+		"@vincemakes/kiso-ask-ext": "0.34.0",
+		"@vincemakes/kiso-core": "0.34.0",
+		"@vincemakes/kiso-evals": "0.34.0",
+		"@vincemakes/kiso-mcp-ext": "0.34.0",
+		"@vincemakes/kiso-provider-anthropic": "0.34.0",
+		"@vincemakes/kiso-provider-openai": "0.34.0",
+		"@vincemakes/kiso-provider-openai-responses": "0.34.0",
+		"@vincemakes/kiso-runtime": "0.34.0",
+		"@vincemakes/kiso-skills-ext": "0.34.0",
+		"@vincemakes/kiso-subagent-ext": "0.34.0",
+		"@vincemakes/kiso-task-ext": "0.34.0",
+		"@vincemakes/kiso-tools-node": "0.34.0",
+		"@vincemakes/kiso-tui": "0.34.0",
+		"@vincemakes/kiso-tui-cells": "0.34.0"
 	},
 	"devDependencies": {
 		"@types/node": "^26.1.2",