@tintinweb/pi-subagents 0.6.2 → 0.7.0

package/src/usage.ts

@@ -0,0 +1,60 @@
+/** usage.ts — Token usage: shapes, accumulator operators, session-stats readers. */
+
+/**
+ * Lifetime usage components, accumulated via `message_end` events. Survives
+ * compaction (which replaces session.state.messages and would reset any
+ * stats-derived sum). cacheRead is excluded because each turn's cacheRead is
+ * the cumulative cached prefix re-read on that one call — summing across
+ * turns counts the prefix N times. See issue #38.
+ */
+export type LifetimeUsage = { input: number; output: number; cacheWrite: number };
+
+/** Sum of lifetime usage components, or 0 if undefined. */
+export function getLifetimeTotal(u?: LifetimeUsage): number {
+  return u ? u.input + u.output + u.cacheWrite : 0;
+}
+
+/** Add a usage delta into a target accumulator (mutates target). */
+export function addUsage(into: LifetimeUsage, delta: LifetimeUsage): void {
+  into.input += delta.input;
+  into.output += delta.output;
+  into.cacheWrite += delta.cacheWrite;
+}
+
+/** Minimal shape we read from upstream `getSessionStats()`. */
+export type SessionStatsLike = {
+  tokens: { input: number; output: number; cacheWrite: number };
+  contextUsage?: { percent: number | null };
+};
+export type SessionLike = { getSessionStats(): SessionStatsLike };
+
+/**
+ * Session-scoped token count: input + output + cacheWrite as reported by
+ * upstream `getSessionStats().tokens` for the *current* session window.
+ *
+ * RESETS at compaction — upstream replaces `session.state.messages` and the
+ * stats are derived from that array. For a lifetime total that survives
+ * compaction, use `getLifetimeTotal(lifetimeUsage)` instead, which reads
+ * from an independent accumulator fed by `message_end` events.
+ *
+ * Avoids upstream's `tokens.total` field, which sums per-turn `cacheRead`
+ * and so counts the cumulative cached prefix N times across N turns
+ * (issue #38).
+ */
+export function getSessionTokens(session: SessionLike | undefined): number {
+  if (!session) return 0;
+  try {
+    const t = session.getSessionStats().tokens;
+    return t.input + t.output + t.cacheWrite;
+  } catch { return 0; }
+}
+
+/**
+ * Context-window utilization (0–100), or null when unavailable
+ * (no model contextWindow, or post-compaction before the next response).
+ */
+export function getSessionContextPercent(session: SessionLike | undefined): number | null {
+  if (!session) return null;
+  try { return session.getSessionStats().contextUsage?.percent ?? null; }
+  catch { return null; }
+}

package/.github/workflows/ci.yml

@@ -1,21 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: npm
-      - run: npm ci
-      - run: npm run lint
-      - run: npm run typecheck
-      - run: npm run test

package/biome.json

@@ -1,26 +0,0 @@
-{
-	"$schema": "https://biomejs.dev/schemas/2.4.8/schema.json",
-	"linter": {
-		"enabled": true,
-		"rules": {
-			"recommended": true,
-			"style": {
-				"recommended": false
-			},
-			"suspicious": {
-				"noExplicitAny": "off",
-				"noControlCharactersInRegex": "off",
-				"noEmptyInterface": "off"
-			}
-		}
-	},
-	"formatter": {
-		"enabled": false
-	},
-	"files": {
-		"includes": [
-			"src/**/*.ts",
-			"test/**/*.ts"
-		]
-	}
-}

package/dist/ui/conversation-viewer.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/ui/conversation-viewer.test.js

@@ -1,254 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-// ── Mock wrapTextWithAnsi ──────────────────────────────────────────────
-// We need to control what wrapTextWithAnsi returns to simulate the
-// upstream bug (returning lines wider than requested width).
-// vi.mock is hoisted and intercepts before conversation-viewer.ts binds
-// its import.
-let wrapOverride = null;
-vi.mock("@mariozechner/pi-tui", async (importOriginal) => {
-    const original = await importOriginal();
-    return {
-        ...original,
-        wrapTextWithAnsi: (...args) => {
-            if (wrapOverride)
-                return wrapOverride(...args);
-            return original.wrapTextWithAnsi(...args);
-        },
-    };
-});
-// Must import AFTER vi.mock declaration (vitest hoists vi.mock but the
-// dynamic import of the test subject must happen after)
-const { visibleWidth } = await import("@mariozechner/pi-tui");
-const { ConversationViewer } = await import("./conversation-viewer.js");
-// ── Helpers ────────────────────────────────────────────────────────────
-function mockTui(rows = 40, columns = 80) {
-    return {
-        terminal: { rows, columns },
-        requestRender: vi.fn(),
-    };
-}
-function mockSession(messages = []) {
-    return {
-        messages,
-        subscribe: vi.fn(() => vi.fn()),
-        dispose: vi.fn(),
-        getSessionStats: () => ({ tokens: { total: 0 } }),
-    };
-}
-function mockRecord(overrides = {}) {
-    return {
-        id: "test-1",
-        type: "general-purpose",
-        description: "test agent",
-        status: "running",
-        toolUses: 0,
-        startedAt: Date.now(),
-        ...overrides,
-    };
-}
-function ansiTheme() {
-    return {
-        fg: (_color, text) => `\x1b[38;5;240m${text}\x1b[0m`,
-        bold: (text) => `\x1b[1m${text}\x1b[22m`,
-    };
-}
-function assertAllLinesFit(lines, width) {
-    for (let i = 0; i < lines.length; i++) {
-        const vw = visibleWidth(lines[i]);
-        expect(vw, `line ${i} exceeds width (${vw} > ${width}): ${JSON.stringify(lines[i])}`).toBeLessThanOrEqual(width);
-    }
-}
-// ── Tests ──────────────────────────────────────────────────────────────
-beforeEach(() => {
-    wrapOverride = null;
-});
-describe("ConversationViewer", () => {
-    describe("render width safety", () => {
-        const widths = [40, 80, 120, 216];
-        it("no line exceeds width with empty messages", () => {
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession([]), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width with plain text messages", () => {
-            const messages = [
-                { role: "user", content: "Hello, how are you?" },
-                { role: "assistant", content: [{ type: "text", text: "I am fine, thank you for asking." }] },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width when text is longer than viewport", () => {
-            const longLine = "A".repeat(500);
-            const messages = [
-                { role: "user", content: longLine },
-                { role: "assistant", content: [{ type: "text", text: longLine }] },
-                { role: "toolResult", toolUseId: "t1", content: [{ type: "text", text: longLine }] },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width with embedded ANSI escape codes in content", () => {
-            const ansiText = `\x1b[1mBold heading\x1b[22m and \x1b[31mred text\x1b[0m ${"X".repeat(300)}`;
-            const messages = [
-                { role: "toolResult", toolUseId: "t1", content: [{ type: "text", text: ansiText }] },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width with long URLs", () => {
-            const url = "https://example.com/" + "a/b/c/d/e/".repeat(30) + "?q=" + "x".repeat(100);
-            const messages = [
-                { role: "assistant", content: [{ type: "text", text: `Check this link: ${url}` }] },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width with wide table-like content", () => {
-            const header = "| " + Array.from({ length: 20 }, (_, i) => `Column${i}`).join(" | ") + " |";
-            const dataRow = "| " + Array.from({ length: 20 }, () => "value123").join(" | ") + " |";
-            const table = [header, dataRow, dataRow, dataRow].join("\n");
-            const messages = [
-                { role: "toolResult", toolUseId: "t1", content: [{ type: "text", text: table }] },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width with bashExecution messages", () => {
-            const messages = [
-                {
-                    role: "bashExecution", command: "cat " + "/very/long/path/".repeat(20) + "file.txt",
-                    output: "O".repeat(600),
-                    exitCode: 0, cancelled: false, truncated: false, timestamp: Date.now(),
-                },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width with running activity indicator", () => {
-            const activity = {
-                activeTools: new Map([["read", "file.ts"], ["grep", "pattern"]]),
-                toolUses: 5, tokens: "10k", responseText: "R".repeat(400),
-                session: { getSessionStats: () => ({ tokens: { total: 50000 } }) },
-            };
-            const messages = [
-                { role: "user", content: "do the thing" },
-                { role: "assistant", content: [{ type: "text", text: "working on it" }] },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord({ status: "running" }), activity, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width with tool calls", () => {
-            const messages = [
-                {
-                    role: "assistant",
-                    content: [
-                        { type: "text", text: "Let me check that." },
-                        { type: "toolCall", toolUseId: "t1", name: "very_long_tool_name_" + "x".repeat(200), input: {} },
-                    ],
-                },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width at narrow terminal", () => {
-            const messages = [
-                { role: "user", content: "Hello world, this is a normal sentence." },
-                { role: "assistant", content: [{ type: "text", text: "Sure, here's the answer." }] },
-            ];
-            for (const w of [8, 10, 15, 20]) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-        it("no line exceeds width with mixed ANSI + unicode content", () => {
-            const text = `\x1b[32m✓\x1b[0m Test passed — 日本語テスト ${"あ".repeat(50)} \x1b[33m⚠\x1b[0m`;
-            const messages = [
-                { role: "toolResult", toolUseId: "t1", content: [{ type: "text", text }] },
-            ];
-            for (const w of widths) {
-                const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-                assertAllLinesFit(viewer.render(w), w);
-            }
-        });
-    });
-    describe("safety net against upstream wrapTextWithAnsi bugs", () => {
-        // These tests call buildContentLines() directly (via the private method)
-        // because render() has its own truncation via row(). The safety net in
-        // buildContentLines is what prevents the TUI crash — it must clamp
-        // independently of render().
-        /** Call the private buildContentLines method directly. */
-        function callBuildContentLines(viewer, width) {
-            return viewer.buildContentLines(width);
-        }
-        it("mock is intercepting wrapTextWithAnsi", async () => {
-            const { wrapTextWithAnsi } = await import("@mariozechner/pi-tui");
-            wrapOverride = () => ["MOCK_SENTINEL"];
-            expect(wrapTextWithAnsi("anything", 10)).toEqual(["MOCK_SENTINEL"]);
-            wrapOverride = null;
-        });
-        it("clamps overwidth lines from toolResult content", () => {
-            const w = 80;
-            wrapOverride = () => ["X".repeat(w + 50)];
-            const messages = [
-                { role: "toolResult", toolUseId: "t1", content: [{ type: "text", text: "output" }] },
-            ];
-            const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-            assertAllLinesFit(callBuildContentLines(viewer, w), w);
-        });
-        it("clamps overwidth lines from user message content", () => {
-            const w = 80;
-            wrapOverride = () => ["Y".repeat(w + 100)];
-            const messages = [{ role: "user", content: "hello" }];
-            const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-            assertAllLinesFit(callBuildContentLines(viewer, w), w);
-        });
-        it("clamps overwidth lines from assistant message content", () => {
-            const w = 80;
-            wrapOverride = () => ["Z".repeat(w + 100)];
-            const messages = [
-                { role: "assistant", content: [{ type: "text", text: "response" }] },
-            ];
-            const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-            assertAllLinesFit(callBuildContentLines(viewer, w), w);
-        });
-        it("clamps overwidth lines from bashExecution output", () => {
-            const w = 80;
-            wrapOverride = () => ["B".repeat(w + 100)];
-            const messages = [
-                {
-                    role: "bashExecution", command: "ls", output: "out",
-                    exitCode: 0, cancelled: false, truncated: false, timestamp: Date.now(),
-                },
-            ];
-            const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-            assertAllLinesFit(callBuildContentLines(viewer, w), w);
-        });
-        it("clamps overwidth lines that also contain ANSI codes", () => {
-            const w = 80;
-            wrapOverride = () => [`\x1b[1m\x1b[31m${"W".repeat(w + 30)}\x1b[0m`];
-            const messages = [
-                { role: "toolResult", toolUseId: "t1", content: [{ type: "text", text: "output" }] },
-            ];
-            const viewer = new ConversationViewer(mockTui(30, w), mockSession(messages), mockRecord(), undefined, ansiTheme(), vi.fn());
-            assertAllLinesFit(callBuildContentLines(viewer, w), w);
-        });
-    });
-});