pi-ark-usage 0.1.3 → 0.1.5

package/README.md

@@ -3,17 +3,16 @@
 在 pi TUI 中显示**火山引擎方舟 Coding Plan / Agent Plan** 的套餐用量，数据直接来自火山方舟 OpenAPI `GetCodingPlanUsage`（AK/SK 签名，官方 [`@volcengine/openapi`](https://github.com/volcengine/volc-sdk-nodejs) SDK 的 Signer）。
 
 ```
-Volc Usage: sess 30%(reset after 4h18m) / wk 37%(reset after 4d) / mo 19%(reset after 29d)        now
+1% 4h38m | 15% 5d4h | 54% 23d4h | 3m ago
 ```
 
 ## 特性
 
 - **AK/SK 直连 OpenAPI**：不走子进程、不依赖 SSO 登录态；凭据只从环境变量或配置文件读取，本扩展不保存、不上传任何 Key
 - **三个周期同屏**：session（会话）/ weekly（周）/ monthly（月），并显示各周期重置倒计时
-- **Powerline 状态段**：通过 `ctx.ui.setStatus("ark-usage", …)` 发布单行摘要（`1% 4h38m | 15% 5d4h | 54% 23d4h`，固定按 session/weekly/monthly 顺序），可直接显示在 [pi-powerline-footer](https://www.npmjs.com/package/pi-powerline-footer) 的 `extension_statuses` / customItems 上；百分比按阈值绿/黄/红着色，时间部分紫色，分隔符跟随主题 `thinkingHigh`（编辑器边框色）
+- **Powerline 状态段（唯一展示位）**：通过 `ctx.ui.setStatus("ark-usage", …)` 发布单行摘要（`1% 4h38m | 15% 5d4h | 54% 23d4h | 3m ago`，固定按 session/weekly/monthly 顺序），显示在 [pi-powerline-footer](https://www.npmjs.com/package/pi-powerline-footer) 上；百分比按阈值绿/黄/红着色，时间部分紫色，分隔符跟随主题 `thinkingHigh`（编辑器边框色），末尾的「上次刷新」用 `dim` 渲染以示区隔。不安装 powerline 时也可通过内置 footer 的 extension statuses 区域或 `/arkusage` 查看
+- **上次刷新时间**：状态段末尾显示距今多久前**成功**刷新过（分钟精度：`just now` / `3m ago` / `4h38m ago` / `5d4h ago`）。抓取失败时沿用上一次成功的时间，因此该值持续变大即表示刷新已经失败或长时间未刷新
 - **阈值着色**：低用量绿色（<50%）、接近上限黄色（50–79%）、超过红线红色（≥80%，默认值，可用 `/arkset` 调整）
-- **单轮消耗**：以每轮对话开始前的快照为基线，结算时标注各周期增量（如 `(+2)`）
-- **产品切换感知**：在个人版/团队版、Coding Plan/Agent Plan 之间切换时标注 `(变更)`；套餐周期重置时标注 `(已重置)`
 - **持久化缓存**：重启 pi 后立即显示上次快照（`~/.pi/agent/pi-ark-usage/cache.json`，0600 权限，临时文件原子写入）
 - 可选空闲自动刷新（默认关闭）
 
@@ -99,7 +98,7 @@ pi install npm:pi-ark-usage
 1. 用官方 `@volcengine/openapi` 的 `Signer` 对 `POST open.volcengineapi.com?Action=GetCodingPlanUsage&Version=2024-01-01`（service `ark`，region `cn-beijing`）做 V4 签名后 fetch。
 2. 解析 `Result.QuotaUsage[]`（`Level/Percent/ResetTimestamp`，秒级时间戳转 `+08:00` ISO 字符串），做结构与取值校验。
 3. 快照存入内存 Map，并以原子写（tmp 文件 + rename）持久化到 `~/.pi/agent/pi-ark-usage/`。
-4. Widget 通过 `ctx.ui.setWidget(..., { placement: "belowEditor" })` 渲染在编辑器下方；age（抓取于多久前）右对齐，终端过窄时自动折成两行。
+4. 摘要通过 `ctx.ui.setStatus("ark-usage", …)` 发布到 extension status，由 pi-powerline-footer 渲染到 powerline 行；每分钟 ticker 在空闲时重发，保持重置倒计时与「上次刷新」时长显示为最新。
 
 ## 开发
 

package/extensions/index.ts

@@ -6,14 +6,13 @@
  * the official `@volcengine/openapi` Signer. This extension never stores keys:
  * credentials come from VOLC_ACCESSKEY/VOLC_SECRETKEY or ~/.volc/config.
  *
- * Widget (below editor): 火山用量: 会话 4%(...) / 周 34%(...) / 月 17%(...)
+ * Powerline status (via `ctx.ui.setStatus`):
+ *   1% 4h38m | 15% 5d4h | 54% 23d4h | 3m ago
+ * The trailing segment is how long ago the data was last refreshed.
  * Commands:
  *   /arkcheck          force refresh
  *   /arkusage          show snapshot in a notification
  *   /arkset ...        view/change settings
- *
- * Design modeled after pi-check-agent-quota: baseline snapshot taken at
- * agent_start, compared at agent_settled to annotate per-round consumption.
  */
 
 import type {
@@ -23,11 +22,9 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import { fetchPlan } from "./lib/arkcli.js";
 import {
-  ArkUsageComponent,
   AUTO_REFRESH_MAX_MINUTES,
   LOCALES,
   buildCompactStatus,
-  buildItems,
   formatRemaining,
   getSettings,
   patchSettings,
@@ -45,10 +42,8 @@ import type {
   ArkSettings,
   Language,
   PlanSnapshot,
-  RenderItem,
 } from "./lib/types.js";
 
-const WIDGET_KEY = "pi-ark-usage";
 /** Extension-status key consumed by pi-powerline-footer (powerline slot). */
 const STATUS_KEY = "ark-usage";
 const TICK_MS = 60_000;
@@ -87,10 +82,6 @@ let language: Language = "en";
 const snapshots = new Map<string, PlanSnapshot>();
 let activeProduct: ProductId | null = null;
 let status: Status = "ok";
-let deltas: Record<string, number> | null = null;
-let note: "changed" | "reset" | null = null;
-let baseline: PlanSnapshot | null = null;
-let activeWidget: ArkUsageComponent | null = null;
 let tickTimer: ReturnType<typeof setInterval> | null = null;
 let lastCtx: ExtensionContext | null = null;
 let lastAutoAt = 0;
@@ -128,20 +119,12 @@ function activeSnapshot(): PlanSnapshot | null {
 
 /* -------------------------------- rendering -------------------------------- */
 
-function renderWidget(ctx: ExtensionContext): void {
+function renderStatus(ctx: ExtensionContext): void {
   lastCtx = ctx;
   const snap = activeSnapshot();
   const widgetStatus = status === "ok" && !snap ? "none" : status;
-  const items: RenderItem[] = buildItems(
-    snap,
-    language,
-    widgetStatus,
-    ctx.isIdle(),
-    deltas,
-    note,
-  );
   // Publish the one-line summary to the extension-status slot (powerline).
-  // The ticker calls renderWidget every minute while idle, keeping the
+  // The ticker calls renderStatus every minute while idle, keeping the
   // reset countdown fresh without refetching.
   const compact = buildCompactStatus(snap, widgetStatus, ctx.ui.theme);
   if (compact) {
@@ -149,23 +132,6 @@ function renderWidget(ctx: ExtensionContext): void {
   } else {
     ctx.ui.setStatus(STATUS_KEY, undefined);
   }
-  if (activeWidget) {
-    activeWidget.update(items);
-    return;
-  }
-  ctx.ui.setWidget(
-    WIDGET_KEY,
-    (tui, theme) => {
-      const component = new ArkUsageComponent(
-        items,
-        () => theme,
-        () => tui.requestRender?.(),
-      );
-      activeWidget = component;
-      return component;
-    },
-    { placement: "belowEditor" },
-  );
 }
 
 /* --------------------------------- fetching -------------------------------- */
@@ -193,7 +159,7 @@ async function refresh(
   activeProduct = product;
   if (!product) {
     status = "none";
-    renderWidget(ctx);
+    renderStatus(ctx);
     return false;
   }
 
@@ -203,8 +169,7 @@ async function refresh(
   }
 
   status = "fetching";
-  note = null;
-  renderWidget(ctx);
+  renderStatus(ctx);
 
   const controller = new AbortController();
   inFlight = controller;
@@ -242,7 +207,7 @@ async function refresh(
     return false;
   } finally {
     if (inFlight === controller) inFlight = null;
-    renderWidget(ctx);
+    renderStatus(ctx);
   }
 }
 
@@ -252,66 +217,21 @@ function persist(): void {
   saveCache(language, out);
 }
 
-/* ---------------------------- baseline / delta ----------------------------- */
-
-function computeDeltas(
-  before: PlanSnapshot,
-  after: PlanSnapshot,
-): Record<string, number> | null {
-  const out: Record<string, number> = {};
-  for (const p of after.periods) {
-    const old = before.periods.find((q) => q.label === p.label);
-    if (old) out[p.label] = Math.round(old.percent - p.percent);
-    // note: stored as consumed-positive; renderer negates for display
-  }
-  // flip sign convention for renderer: it wants negative=consumed
-  const render: Record<string, number> = {};
-  for (const [k, v] of Object.entries(out)) render[k] = -v;
-  return render;
-}
-
-function looksReset(a: PlanSnapshot, b: PlanSnapshot): boolean {
-  // all periods dropped sharply at once => plan period reset
-  return b.periods.every((p) => {
-    const old = a.periods.find((q) => q.label === p.label);
-    return old !== undefined && p.percent - old.percent < -30;
-  });
-}
+/* ----------------------- session-start / settled --------------------------- */
 
 async function handleStart(ctx: ExtensionContext): Promise<void> {
   const product = resolveProduct(ctx);
   if (!product) return;
   const cached = snapshots.get(product) ?? null;
-  if (cached && Date.now() - cached.fetchedAt <= BASELINE_FRESH_MS) {
-    baseline = cached;
-  } else {
-    const win = await timeoutResult(refresh(ctx, "stale"), AGENT_START_TIMEOUT_MS);
-    baseline = win ? snapshots.get(product) ?? null : cached;
+  // Only refetch at agent_start when the cached snapshot went stale.
+  if (!cached || Date.now() - cached.fetchedAt > BASELINE_FRESH_MS) {
+    await timeoutResult(refresh(ctx, "stale"), AGENT_START_TIMEOUT_MS);
   }
-  deltas = null;
-  renderWidget(ctx);
+  renderStatus(ctx);
 }
 
 async function handleSettled(ctx: ExtensionContext): Promise<void> {
-  const product = resolveProduct(ctx);
-  if (!product) return;
-  const ok = await refresh(ctx, "settled");
-  if (!ok) return;
-  const snap = snapshots.get(product);
-  if (!snap) return;
-
-  if (baseline && baseline.product !== product) {
-    note = "changed";
-    deltas = null;
-  } else if (baseline && looksReset(baseline, snap)) {
-    note = "reset";
-    deltas = null;
-  } else if (baseline) {
-    deltas = computeDeltas(baseline, snap);
-    note = null;
-  }
-  baseline = null;
-  renderWidget(ctx);
+  await refresh(ctx, "settled");
 }
 
 async function timeoutResult<T>(p: Promise<T>, ms: number): Promise<T | null> {
@@ -342,7 +262,7 @@ function ensureTicker(): void {
       return;
     }
     // age text ticks every minute even without refetch
-    if (activeWidget && lastCtx.isIdle()) renderWidget(lastCtx);
+    if (lastCtx && lastCtx.isIdle()) renderStatus(lastCtx);
   }, TICK_MS);
   tickTimer.unref?.();
 }
@@ -408,7 +328,7 @@ async function cmdSet(
   const notifySaved = (): void => {
     persist();
     ctx.ui.notify(locale.settingsApplied, "info");
-    if (lastCtx) renderWidget(lastCtx);
+    if (lastCtx) renderStatus(lastCtx);
   };
 
   if (parts.length === 0) {
@@ -422,7 +342,7 @@ async function cmdSet(
       resetSettings();
       persist();
       ctx.ui.notify(locale.settingsReset, "info");
-      if (lastCtx) renderWidget(lastCtx);
+      if (lastCtx) renderStatus(lastCtx);
       return;
     }
     case "yellow":
@@ -499,7 +419,7 @@ async function cmdSet(
       language = raw;
       persist();
       ctx.ui.notify(locale.languageChanged(language), "info");
-      if (lastCtx) renderWidget(lastCtx);
+      if (lastCtx) renderStatus(lastCtx);
       return;
     }
     default:
@@ -532,25 +452,21 @@ export default function (pi: ExtensionAPI): void {
   });
 
   pi.on("session_start", (_event, ctx) => {
-    // Session switches reuse this module instance in-process: pi has disposed
-    // the old TUI widget and torn down the previous runtime, so drop stale
-    // handles and revive the shutdown flags before doing anything else.
+    // Session switches reuse this module instance in-process: pi has torn
+    // down the previous runtime, so revive the shutdown flags before doing
+    // anything else.
     shuttingDown = false;
     resetShutdownState();
-    activeWidget = null;
     activeProduct = resolveProduct(ctx);
-    deltas = null;
-    note = null;
-    renderWidget(ctx);
+    renderStatus(ctx);
     ensureTicker();
     void refresh(ctx, "session_start");
   });
 
   pi.on("model_select", (_event, ctx) => {
     const next = resolveProduct(ctx);
-    if (baseline && next && baseline.product !== next) note = "changed";
     activeProduct = next;
-    renderWidget(ctx);
+    renderStatus(ctx);
     void refresh(ctx, "model_select");
   });
 

package/extensions/lib/types.ts

@@ -4,13 +4,6 @@
 
 export type Language = "zh" | "en";
 
-/** Render model, modeled after pi-check-agent-quota. */
-export type RenderItem =
-  | { kind: "text"; text: string }
-  | { kind: "pct"; pct: number; metric: string }
-  | { kind: "annotation"; text: string }
-  | { kind: "age"; text: string };
-
 /** User-tunable settings (persisted in the disk cache). */
 export type ArkSettings = {
   /** yellow threshold, percent */

package/extensions/lib/widget.ts

@@ -1,10 +1,11 @@
 /**
- * Rendering: locales, threshold settings, percent coloring, remaining-time
- * formatting, and the TUI Component for the below-editor widget.
+ * Rendering for the powerline extension-status slot: locales, threshold
+ * settings, percent coloring, remaining-time formatting, and the compact
+ * colored one-line summary published via `ctx.ui.setStatus`.
  */
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import type { ArkSettings, Language, PlanSnapshot, RenderItem } from "./types.js";
+import type { ArkSettings, Language, PlanSnapshot } from "./types.js";
 
 /* ---------------------------------- i18n ---------------------------------- */
 
@@ -20,10 +21,6 @@ type Locale = {
   changed: string;
   reset: string;
   resetsIn: (t: string) => string;
-  ageNow: string;
-  ageMinutesAgo: (m: number) => string;
-  ageHoursAgo: (h: number, m: number) => string;
-  ageDaysAgo: (d: number, h: number) => string;
   noActiveProduct: string;
   settingsShow: (s: ArkSettings) => string;
   settingsApplied: string;
@@ -56,10 +53,6 @@ const ZH: Locale = {
   changed: "变更",
   reset: "已重置",
   resetsIn: (t) => `${t}后重置`,
-  ageNow: "刚刚",
-  ageMinutesAgo: (m) => `${m}分钟前`,
-  ageHoursAgo: (h, m) => (m > 0 ? `${h}小时${m}分前` : `${h}小时前`),
-  ageDaysAgo: (d, h) => (h > 0 ? `${d}天${h}小时前` : `${d}天前`),
   noActiveProduct: "当前没有可查询的火山套餐",
   settingsShow: (s) =>
     `当前设置：产品=${s.product} 黄线=${s.pctYellow} 红线=${s.pctRed} 自动刷新=${s.autoRefreshMinutes}分钟 seat=${s.seat || "无"}`,
@@ -94,10 +87,6 @@ const EN: Locale = {
   changed: "changed",
   reset: "reset",
   resetsIn: (t) => `reset after ${t}`,
-  ageNow: "now",
-  ageMinutesAgo: (m) => `${m}m ago`,
-  ageHoursAgo: (h, m) => (m > 0 ? `${h}h${m}m ago` : `${h}h ago`),
-  ageDaysAgo: (d, h) => (h > 0 ? `${d}d${h}h ago` : `${d}d ago`),
   noActiveProduct: "No active Volcengine plan",
   settingsShow: (s) =>
     `Settings: product=${s.product} yellow=${s.pctYellow} red=${s.pctRed} autoRefresh=${s.autoRefreshMinutes}m seat=${s.seat || "none"}`,
@@ -196,19 +185,6 @@ export function formatRemaining(ms: number, lang: Language): string {
   return `${m}m`;
 }
 
-export function formatAge(fetchedAt: number, lang: Language): string {
-  const age = Date.now() - fetchedAt;
-  if (!Number.isFinite(age) || age < 0) return "";
-  if (age < 60_000) return LOCALES[lang].ageNow;
-  const totalMin = Math.floor(age / 60_000);
-  const h = Math.floor(totalMin / 60);
-  const m = totalMin % 60;
-  const d = Math.floor(h / 24);
-  if (d > 0) return LOCALES[lang].ageDaysAgo(d, h % 24);
-  if (h > 0) return LOCALES[lang].ageHoursAgo(h, m);
-  return LOCALES[lang].ageMinutesAgo(m);
-}
-
 /* ---------------------- compact status (powerline slot) -------------------- */
 
 /**
@@ -226,9 +202,25 @@ export function formatCompactRemaining(ms: number): string {
   return `${m}m`;
 }
 
+/**
+ * Age of the last successful refresh, for the trailing status segment:
+ * `just now`, `3m ago`, `4h38m ago`, `5d4h ago`. Minute is the finest unit —
+ * seconds would only make the line jitter — and a stale cached snapshot thus
+ * reads as old at a glance.
+ */
+export function formatRefreshAgo(ts: number, now: number = Date.now()): string {
+  if (!Number.isFinite(ts) || ts <= 0) return "";
+  const ms = now - ts;
+  // Clock skew can make a fresh fetch look negative; treat it as "now".
+  if (ms < 60_000) return "just now";
+  // Drop a zero lower unit (`1h0m` -> `1h`, `5d0h` -> `5d`).
+  const age = formatCompactRemaining(ms).replace(/([dh])0[mh]$/, "$1");
+  return `${age} ago`;
+}
+
 /**
  * One-line colored summary for the powerline extension-status slot:
- * `1% 4h38m | 15% 5d4h | 54% 23d4h`
+ * `1% 4h38m | 15% 5d4h | 54% 23d4h | 3m ago`
  *
  * Periods are shown in API order (session / weekly / monthly) without
  * labels — the order itself is the convention. Percent follows the
@@ -236,248 +228,37 @@ export function formatCompactRemaining(ms: number): string {
  * red); the time part is always purple; the ` | ` separator uses the
  * editor border color (`thinkingHigh`, pink in the dark theme).
  *
+ * The last segment is how long ago the data was fetched, in `dim` — it is
+ * meta information, not usage, so it stays visually secondary.
+ *
  * Returns null when nothing should be shown (the powerline item hides).
  */
 export function buildCompactStatus(
   snapshot: PlanSnapshot | null,
   status: WidgetStatus,
   theme: Theme,
+  now: number = Date.now(),
 ): string | null {
   if (snapshot && snapshot.periods.length > 0) {
     const sep = theme.fg("thinkingHigh", " | ");
-    return snapshot.periods
+    const periods = snapshot.periods
       .map((p) => {
         const pct = coloredPct(clampPct(p.percent));
         const reset = p.reset_at
-          ? formatCompactRemaining(new Date(p.reset_at).getTime() - Date.now())
+          ? formatCompactRemaining(new Date(p.reset_at).getTime() - now)
           : "";
         return reset ? `${pct} ${hexFg(HEX_COLORS.purple, reset)}` : pct;
       })
       .join(sep);
+    const refreshed = formatRefreshAgo(snapshot.fetchedAt, now);
+    return refreshed
+      ? `${periods}${sep}${theme.fg("dim", refreshed)}`
+      : periods;
   }
   if (status === "fetching") return hexFg(HEX_COLORS.purple, "…");
   if (status === "failed") return hexFg(HEX_COLORS.red, "failed");
   return null;
 }
 
-/* ----------------------------- snapshot -> items --------------------------- */
-
+/** Lifecycle states mirrored in the compact status. */
 export type WidgetStatus = "ok" | "fetching" | "failed" | "no-binary" | "none";
-
-export function buildItems(
-  snapshot: PlanSnapshot | null,
-  lang: Language,
-  status: WidgetStatus,
-  isIdle: boolean,
-  /** delta annotations keyed by period label; negative = consumed */
-  deltas: Record<string, number> | null,
-  note?: "changed" | "reset" | null,
-): RenderItem[] {
-  const locale = LOCALES[lang];
-  const items: RenderItem[] = [];
-
-  if (snapshot && snapshot.periods.length > 0) {
-    items.push({ kind: "text", text: `${locale.title}: ` });
-    snapshot.periods.forEach((p, i) => {
-      if (i > 0) items.push({ kind: "text", text: " / " });
-      const label = locale.labels[p.label] ?? p.label;
-      items.push({ kind: "text", text: `${label} ` });
-      items.push({ kind: "pct", pct: clampPct(p.percent), metric: p.label });
-      const delta = deltas?.[p.label];
-      if (typeof delta === "number" && delta !== 0) {
-        const sign = delta > 0 ? "+" : "-";
-        items.push({ kind: "annotation", text: `(${sign}${Math.abs(Math.round(delta))})` });
-      }
-      if (p.reset_at) {
-        const remaining = new Date(p.reset_at).getTime() - Date.now();
-        const t = formatRemaining(remaining, lang);
-        if (t) items.push({ kind: "annotation", text: `(${locale.resetsIn(t)})` });
-      }
-    });
-  } else if (status === "fetching") {
-    items.push({ kind: "text", text: `${locale.title}: ` });
-    items.push({ kind: "annotation", text: locale.fetching });
-  } else if (status === "failed") {
-    items.push({ kind: "text", text: `${locale.title}: ` });
-    items.push({ kind: "annotation", text: locale.failed });
-  } else if (status === "no-binary") {
-    items.push({ kind: "annotation", text: locale.noBinary });
-  } else {
-    items.push({ kind: "annotation", text: locale.noData });
-  }
-
-  if (!isIdle) {
-    items.push({ kind: "annotation", text: ` (${locale.using})` });
-  } else if (note) {
-    items.push({ kind: "annotation", text: ` (${note === "reset" ? locale.reset : locale.changed})` });
-  }
-
-  if (snapshot) {
-    items.push({ kind: "age", text: formatAge(snapshot.fetchedAt, lang) });
-  }
-  return items;
-}
-
-export function formatItems(items: RenderItem[], theme: Theme): string {
-  return items
-    .map((it) => {
-      switch (it.kind) {
-        case "text":
-          return theme.fg("dim", it.text);
-        case "pct":
-          return coloredPct(it.pct);
-        case "age":
-          return theme.fg("dim", it.text);
-        case "annotation":
-        default:
-          return hexFg(HEX_COLORS.purple, it.text);
-      }
-    })
-    .join("");
-}
-
-/* ------------------------------ ansi helpers ------------------------------ */
-
-export const ANSI_RE = /\x1b\[[0-9;]*m/g;
-
-export function visibleWidth(s: string): number {
-  let w = 0;
-  for (const ch of s.replace(ANSI_RE, "")) {
-    const cp = ch.codePointAt(0) ?? 0;
-    if (cp === 0x200d || (cp >= 0xfe00 && cp <= 0xfe0f)) continue;
-    if (cp >= 0x0300 && cp <= 0x036f) continue;
-    w +=
-      (cp >= 0x1100 && cp <= 0x115f) ||
-      (cp >= 0x2e80 && cp <= 0xa4cf) ||
-      (cp >= 0xac00 && cp <= 0xd7a3) ||
-      (cp >= 0xf900 && cp <= 0xfaff) ||
-      (cp >= 0xfe30 && cp <= 0xfe6f) ||
-      (cp >= 0xff00 && cp <= 0xff60) ||
-      (cp >= 0xffe0 && cp <= 0xffe6) ||
-      (cp >= 0x1f300 && cp <= 0x1f9ff)
-        ? 2
-        : 1;
-  }
-  return w;
-}
-
-export function truncateAnsi(s: string, maxWidth: number): string {
-  if (maxWidth <= 0) return "";
-  if (visibleWidth(s) <= maxWidth) return s;
-  const budget = maxWidth - 1;
-  let out = "";
-  let w = 0;
-  let i = 0;
-  while (i < s.length) {
-    ANSI_RE.lastIndex = i;
-    const m = ANSI_RE.exec(s);
-    if (m && m.index === i) {
-      out += m[0];
-      i = ANSI_RE.lastIndex;
-      continue;
-    }
-    const ch = String.fromCodePoint(s.codePointAt(i) ?? 0);
-    const cw = visibleWidth(ch);
-    if (w + cw > budget) break;
-    out += ch;
-    w += cw;
-    i += ch.length;
-  }
-  return `${out}…\x1b[0m`;
-}
-
-export function itemsEqual(a: RenderItem[], b: RenderItem[]): boolean {
-  if (a.length !== b.length) return false;
-  return a.every((it, i) => {
-    const o = b[i];
-    if (it.kind !== o.kind) return false;
-    switch (it.kind) {
-      case "pct":
-        return (
-          o.kind === "pct" && it.pct === o.pct && it.metric === o.metric
-        );
-      case "text":
-        return o.kind === "text" && it.text === o.text;
-      case "age":
-        return o.kind === "age" && it.text === o.text;
-      case "annotation":
-        return o.kind === "annotation" && it.text === o.text;
-    }
-  });
-}
-
-/* -------------------------------- component -------------------------------- */
-
-export interface Component {
-  render(width: number): string[];
-  invalidate(): void;
-  dispose?(): void;
-}
-
-/**
- * Widget rendered below the editor. The age segment is right-aligned and the
- * content wraps to two lines when the terminal is too narrow.
- */
-export class ArkUsageComponent implements Component {
-  private items: RenderItem[];
-  private readonly themeRef: () => Theme;
-  private readonly requestRender: () => void;
-  private cache: { width: number; lines: string[] } | null = null;
-  private disposed = false;
-
-  constructor(
-    items: RenderItem[],
-    themeRef: () => Theme,
-    requestRender: () => void,
-  ) {
-    this.items = items;
-    this.themeRef = themeRef;
-    this.requestRender = requestRender;
-  }
-
-  update(items: RenderItem[]): void {
-    if (this.disposed || itemsEqual(this.items, items)) return;
-    this.items = items;
-    this.invalidate();
-    this.requestRender();
-  }
-
-  invalidate(): void {
-    this.cache = null;
-  }
-
-  render(width: number): string[] {
-    if (this.cache && this.cache.width === width) return this.cache.lines;
-    const theme = this.themeRef();
-
-    const ageIdx = this.items.findIndex((it) => it.kind === "age");
-    if (ageIdx === -1) {
-      const text = formatItems(this.items, theme);
-      const lines = text ? [truncateAnsi(text, width)] : [];
-      this.cache = { width, lines };
-      return lines;
-    }
-
-    const leftText = formatItems(this.items.slice(0, ageIdx), theme);
-    const rightText = formatItems(this.items.slice(ageIdx), theme);
-    const lw = visibleWidth(leftText);
-    const rw = visibleWidth(rightText);
-
-    let lines: string[];
-    if (lw + rw + 1 <= width) {
-      lines = [leftText + " ".repeat(width - lw - rw) + rightText];
-    } else {
-      lines = [
-        leftText ? truncateAnsi(leftText, width) : "",
-        rw <= width ? " ".repeat(Math.max(0, width - rw)) + rightText : truncateAnsi(rightText, width),
-      ].filter((l) => l !== "");
-    }
-    this.cache = { width, lines };
-    return lines;
-  }
-
-  dispose(): void {
-    this.disposed = true;
-    this.cache = null;
-  }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ark-usage",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Show Volcengine Ark Coding Plan / Agent Plan usage in the pi TUI (AK/SK OpenAPI)",
   "keywords": [
     "pi",