dsh-ntr 0.2.0 → 0.2.1

package/lib/types/bridge.d.ts

@@ -805,6 +805,8 @@ interface SegmentState {
     index: number;
     activeType: 'reasoning' | 'text' | 'tool-call' | null;
     activeText: string;
+    /** UTF-16 units of this segment's text and reasoning chunks (the usage estimate). */
+    outputChars: number;
     /** The open tool-call block's snapshot, while `activeType === 'tool-call'`. */
     activeToolCall: AcpToolCallSnapshot | undefined;
     /** Whether this segment opened at least one tool-call block. */
@@ -845,7 +847,7 @@ type TurnSettle = {
  * `transcript.since(cursor)` — events that arrive while no segment is open are
  * recorded, never lost), the seen-call registry (a call id gets exactly one
  * card per turn, wherever its restatements land), and the turn-level facts
- * (`sawVisibleBlock`, usage) that outlive any single segment.
+ * (`sawVisibleBlock`) that outlive any single segment.
  */
 declare class TurnStreamController {
     private readonly manager;
@@ -860,7 +862,6 @@ declare class TurnStreamController {
     private disposed;
     private readonly seenCalls;
     private readonly announcedKinds;
-    private latestUsage;
     /** Narrative lines (permission asks) that arrived while no segment was open. */
     private readonly pendingProse;
     sawVisibleBlock: boolean;
@@ -908,7 +909,6 @@ declare class TurnStreamController {
     private pushProse;
     /** Events that arrive between segments: recorded, replayed into the next one. */
     private recordWithoutSegment;
-    private noteUsage;
     /** Record a tool call's output (idempotent) and wake any waiter. */
     private noteToolRecord;
     /**

package/lib/types/client/panel.d.ts

@@ -86,7 +86,6 @@ export declare function approvalDeadlineFacts(deadlines: AcpApprovalDeadlines):
     /** A reset is only honest when something is actually being outranked. */
     overridden: boolean;
 };
-/** Settings configuration section for ACP agents. */
 export declare function AcpSettingsSection(props: WithStore): import("react").JSX.Element;
 /** Everything the connection form edits, in one object (kept in the row). */
 interface AgentForm {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ntr",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Interactive Agent Client Protocol (ACP) client for the DSH web UI: attach any ACP-capable agent and stream its session.",
   "repository": "https://github.com/GDWhisper/dsh-ntr.git",
   "type": "module",
@@ -48,9 +48,13 @@
     "@deepseek-ai/dsh-client-ui-sidebar": "0.1.5-rc.1",
     "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.1",
     "@deepseek-ai/dsh-host-webserver": "0.1.5-rc.1",
+    "@testing-library/react": "^16.3.3",
     "@types/node": "^22.19.0",
     "@types/react": "^19.2.0",
+    "@types/react-dom": "^19.3.0",
+    "jsdom": "^27.4.0",
     "react": "^19.2.0",
+    "react-dom": "^19.3.1",
     "tsdown": "^0.23.0",
     "typescript": "^5.9.0",
     "vitest": "^3.2.0"

package/src/bridge.ts

@@ -2400,6 +2400,8 @@ interface SegmentState {
   index: number
   activeType: 'reasoning' | 'text' | 'tool-call' | null
   activeText: string
+  /** UTF-16 units of this segment's text and reasoning chunks (the usage estimate). */
+  outputChars: number
   /** The open tool-call block's snapshot, while `activeType === 'tool-call'`. */
   activeToolCall: AcpToolCallSnapshot | undefined
   /** Whether this segment opened at least one tool-call block. */
@@ -2407,6 +2409,9 @@ interface SegmentState {
   finished: boolean
 }
 
+/** ACP `usage_update` is context occupancy, not request tokens; host usage is a 4-chars/token OUTPUT estimate (tool args excluded). */
+const OUTPUT_CHARS_PER_TOKEN = 4
+
 /** How one segment's stream ends, in `StreamChunk.finish` terms. */
 type SegmentFinishReason =
   | { kind: 'stop' }
@@ -2427,7 +2432,7 @@ type TurnSettle =
  * `transcript.since(cursor)` — events that arrive while no segment is open are
  * recorded, never lost), the seen-call registry (a call id gets exactly one
  * card per turn, wherever its restatements land), and the turn-level facts
- * (`sawVisibleBlock`, usage) that outlive any single segment.
+ * (`sawVisibleBlock`) that outlive any single segment.
  */
 class TurnStreamController {
   private segment: SegmentState | undefined
@@ -2435,7 +2440,6 @@ class TurnStreamController {
   private disposed = false
   private readonly seenCalls = new Set<string>()
   private readonly announcedKinds = new Map<string, string>()
-  private latestUsage: { inputTokens: number; outputTokens: number } | null = null
   /** Narrative lines (permission asks) that arrived while no segment was open. */
   private readonly pendingProse: string[] = []
   sawVisibleBlock = false
@@ -2487,6 +2491,7 @@ class TurnStreamController {
       index: -1,
       activeType: null,
       activeText: '',
+      outputChars: 0,
       activeToolCall: undefined,
       hasCard: false,
       finished: false,
@@ -2605,7 +2610,9 @@ class TurnStreamController {
       seg.activeType = null
       seg.activeToolCall = undefined
     }
-    if (this.latestUsage !== null) seg.queue.push({ type: 'usage', usage: this.latestUsage })
+    const outputTokens = Math.round(seg.outputChars / OUTPUT_CHARS_PER_TOKEN)
+    // Zero input keeps the host's cache-hit pill hidden instead of faking 0%.
+    if (outputTokens > 0) seg.queue.push({ type: 'usage', usage: { inputTokens: 0, outputTokens } })
     seg.queue.push({ type: 'finish', reason })
     seg.queue.close()
     if (this.segment === seg) this.segment = undefined
@@ -2643,11 +2650,10 @@ class TurnStreamController {
       const seg = this.segment
       if (seg === undefined || seg.finished) {
         // Between segments: tool outputs still reach the shared registry (the
-        // guard's virtual tool may be parked on this very record) and usage
-        // keeps the turn's tally fresh, but the cursor does NOT advance — the
-        // next segment replays everything since it, which re-records those
-        // idempotently and folds the prose the agent streamed while its cards
-        // executed on the host.
+        // guard's virtual tool may be parked on this very record), but the
+        // cursor does NOT advance — the next segment replays everything since
+        // it, which re-records those idempotently and folds the prose the agent
+        // streamed while its cards executed on the host.
         this.recordWithoutSegment(update)
         return
       }
@@ -2689,17 +2695,7 @@ class TurnStreamController {
   /** Events that arrive between segments: recorded, replayed into the next one. */
   private recordWithoutSegment(update: Record<string, unknown>): void {
     const kind = String(update.sessionUpdate ?? '')
-    if (kind === 'usage_update') {
-      this.noteUsage(update)
-    } else if (kind === 'tool_call' || kind === 'tool_call_update') {
-      this.noteToolRecord(update)
-    }
-  }
-
-  private noteUsage(update: Record<string, unknown>): void {
-    const used = typeof update.used === 'number' ? update.used : 0
-    const size = typeof update.size === 'number' ? update.size : 0
-    this.latestUsage = { inputTokens: size, outputTokens: used }
+    if (kind === 'tool_call' || kind === 'tool_call_update') this.noteToolRecord(update)
   }
 
   /** Record a tool call's output (idempotent) and wake any waiter. */
@@ -2725,6 +2721,7 @@ class TurnStreamController {
         this.finishSegment(seg, { kind: 'stop' })
         return false
       }
+      seg.outputChars += text.length
       this.emitProse(seg, kind === 'agent_thought_chunk' ? 'reasoning' : 'text', text)
       return true
     } else if (kind === 'tool_call' || kind === 'tool_call_update') {
@@ -2743,9 +2740,6 @@ class TurnStreamController {
       this.seenCalls.add(snapshot.callId)
       this.openToolCallBlock(seg, snapshot)
       return true
-    } else if (kind === 'usage_update') {
-      this.noteUsage(update)
-      return true
     } else if (!BOOKKEEPING_UPDATES.has(kind)) {
       const text = describeUnhandledUpdate(kind, update)
       if (this.announcedKinds.get(kind) === text) return true