@@ -14,7 +14,12 @@ import {
1414 DEFAULT_SHOW_REASONING,
1515 DEFAULT_VERBOSE,
1616 } from "./index.ts";
17-import { createSession, loadMessages, openDatabase } from "./session.ts";
17+import {
18+ createSession,
19+ createUiMessage,
20+ loadMessages,
21+ openDatabase,
22+} from "./session.ts";
1823 import { loadSettings } from "./settings.ts";
1924 import { DEFAULT_THEME, type Theme } from "./theme.ts";
2025 import {
@@ -516,7 +521,7 @@ describe("ui rendering", () => {
516521 }
517522 });
518523
519- test("renderStatusBar uses the latest assistant usage for context percentage", () => {
524+ test("renderStatusBar estimates context usage from the latest valid assistant usage plus trailing model-visible messages", () => {
520525 const faux = registerFauxProvider();
521526 const state = createTestState();
522527 state.model = {
@@ -525,17 +530,21 @@ describe("ui rendering", () => {
525530 };
526531 state.messages = [
527532 { role: "user", content: "first", timestamp: 1 },
528- makeAssistantWithUsage("First.", {
529- input: 120,
530- output: 30,
531- totalTokens: 150,
532- }),
533- { role: "user", content: "second", timestamp: 2 },
534533 makeAssistantWithUsage("Second.", {
535534 input: 200,
536535 output: 50,
537536 totalTokens: 250,
538537 }),
538+ createUiMessage("x".repeat(500)),
539+ { role: "user", content: "12345678", timestamp: 2 },
540+ {
541+ role: "toolResult",
542+ toolCallId: "tool-1",
543+ toolName: "shell",
544+ content: [{ type: "text", text: "done" }],
545+ isError: false,
546+ timestamp: 3,
547+ },
539548 ];
540549 state.stats = {
541550 totalInput: 4_000,
@@ -547,8 +556,100 @@ describe("ui rendering", () => {
547556 const node = renderStatusBar(state);
548557 const text = collectText(node);
549558
550- expect(text).toContain("in:4.0k out:2.0k · 25.0%/1k · $1.23");
551- expect(text).not.toContain("in:4.0k out:2.0k · 600.0%/1k · $1.23");
559+ expect(text).toContain("in:4.0k out:2.0k · 25.3%/1k · $1.23");
560+ expect(text).not.toContain("in:4.0k out:2.0k · 75.3%/1k · $1.23");
561+ expect(text).not.toContain("in:4.0k out:2.0k · 25.0%/1k · $1.23");
562+ } finally {
563+ faux.unregister();
564+ state.db.close();
565+ }
566+ });
567+
568+ test("renderStatusBar estimates context usage before the first assistant response", () => {
569+ const faux = registerFauxProvider();
570+ const state = createTestState();
571+ state.model = {
572+ ...faux.getModel(),
573+ contextWindow: 100,
574+ };
575+ state.messages = [
576+ createUiMessage("x".repeat(500)),
577+ { role: "user", content: "12345678", timestamp: 1 },
578+ ];
579+
580+ try {
581+ const node = renderStatusBar(state);
582+ const text = collectText(node);
583+
584+ expect(text).toContain("in:0 out:0 · 2.0%/100 · $0.00");
585+ expect(text).not.toContain("in:0 out:0 · 127.0%/100 · $0.00");
586+ expect(text).not.toContain("in:0 out:0 · 0.0%/100 · $0.00");
587+ } finally {
588+ faux.unregister();
589+ state.db.close();
590+ }
591+ });
592+
593+ test("renderStatusBar skips aborted assistant usage as a context anchor", () => {
594+ const faux = registerFauxProvider();
595+ const state = createTestState();
596+ const aborted = makeAssistantWithUsage("abcdefghi", {
597+ input: 700,
598+ output: 200,
599+ totalTokens: 900,
600+ });
601+ aborted.stopReason = "aborted";
602+
603+ state.model = {
604+ ...faux.getModel(),
605+ contextWindow: 1_000,
606+ };
607+ state.messages = [
608+ { role: "user", content: "first", timestamp: 1 },
609+ makeAssistantWithUsage("valid", {
610+ input: 150,
611+ output: 50,
612+ totalTokens: 200,
613+ }),
614+ aborted,
615+ { role: "user", content: "1234", timestamp: 2 },
616+ ];
617+
618+ try {
619+ const node = renderStatusBar(state);
620+ const text = collectText(node);
621+
622+ expect(text).toContain("in:0 out:0 · 20.4%/1k · $0.00");
623+ expect(text).not.toContain("in:0 out:0 · 90.0%/1k · $0.00");
624+ } finally {
625+ faux.unregister();
626+ state.db.close();
627+ }
628+ });
629+
630+ test("renderStatusBar falls back to usage components when totalTokens is zero", () => {
631+ const faux = registerFauxProvider();
632+ const state = createTestState();
633+ state.model = {
634+ ...faux.getModel(),
635+ contextWindow: 1_000,
636+ };
637+ state.messages = [
638+ makeAssistantWithUsage("fallback", {
639+ input: 120,
640+ output: 30,
641+ cacheRead: 25,
642+ cacheWrite: 25,
643+ totalTokens: 0,
644+ }),
645+ ];
646+
647+ try {
648+ const node = renderStatusBar(state);
649+ const text = collectText(node);
650+
651+ expect(text).toContain("in:0 out:0 · 20.0%/1k · $0.00");
652+ expect(text).not.toContain("in:0 out:0 · 0.0%/1k · $0.00");
552653 } finally {
553654 faux.unregister();
554655 state.db.close();