pi-ark-usage 0.1.1 → 0.1.3

package/README.md

@@ -10,7 +10,8 @@ Volc Usage: sess 30%(reset after 4h18m) / wk 37%(reset after 4d) / mo 19%(reset
 
 - **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`（编辑器边框色）
+- **阈值着色**：低用量绿色（<50%）、接近上限黄色（50–79%）、超过红线红色（≥80%，默认值，可用 `/arkset` 调整）
 - **单轮消耗**：以每轮对话开始前的快照为基线，结算时标注各周期增量（如 `(+2)`）
 - **产品切换感知**：在个人版/团队版、Coding Plan/Agent Plan 之间切换时标注 `(变更)`；套餐周期重置时标注 `(已重置)`
 - **持久化缓存**：重启 pi 后立即显示上次快照（`~/.pi/agent/pi-ark-usage/cache.json`，0600 权限，临时文件原子写入）
@@ -67,7 +68,7 @@ pi install npm:pi-ark-usage
 |---|---|
 | `/arkset yellow <n>` | 黄色阈值（百分比，默认 40），须低于红线 |
 | `/arkset red <n>` | 红色阈值（百分比，默认 80），须高于黄线 |
-| `/arkset auto <分钟>` | 空闲自动刷新间隔，0–30 的整数，`0` 关闭（默认关闭） |
+| `/arkset auto <分钟>` | 空闲自动刷新间隔，0–30 的整数，`0` 关闭（默认 5 分钟） |
 | `/arkset product <id>` | 展示映射的产品：`auto`（默认）/ `coding-plan` / `agent-plan` / `coding-plan-team` / `agent-plan-team` |
 | `/arkset seat <id>` | 团队版指定 SeatID；`/arkset seat none` 清除 |
 | `/arkset lang <zh\|en>` | UI language, default English |
@@ -89,7 +90,9 @@ pi install npm:pi-ark-usage
 | `agent_start` | 建立本轮基线（缓存 1 小时内有效；否则限时 3 秒补抓，超时沿用缓存） |
 | `agent_settled` | 本轮结算抓取，并与基线对比标注消耗 |
 | `/arkcheck` | 手动强制刷新 |
-| 可选自动刷新 | 仅当 `/arkset auto` 开启时按间隔执行 |
+| 可选自动刷新 | 默认每 5 分钟（`/arkset auto` 可调 0–30，`0` 关闭） |
+
+> 注意：`auto` 设置会持久化到磁盘 cache；旧版本用户若曾显式设过 `0`，升级后仍是关闭，需手动 `/arkset auto 5` 开启。
 
 ## 工作原理
 

package/extensions/index.ts

@@ -26,6 +26,7 @@ import {
   ArkUsageComponent,
   AUTO_REFRESH_MAX_MINUTES,
   LOCALES,
+  buildCompactStatus,
   buildItems,
   formatRemaining,
   getSettings,
@@ -36,6 +37,7 @@ import {
   flushWrites,
   loadCache,
   markShuttingDown,
+  resetShutdownState,
   saveCache,
 } from "./lib/cache.js";
 import type {
@@ -47,6 +49,8 @@ import type {
 } 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;
 const AGENT_START_TIMEOUT_MS = 3_000;
 const BASELINE_FRESH_MS = 60 * 60_000;
@@ -127,14 +131,24 @@ function activeSnapshot(): PlanSnapshot | null {
 function renderWidget(ctx: ExtensionContext): void {
   lastCtx = ctx;
   const snap = activeSnapshot();
+  const widgetStatus = status === "ok" && !snap ? "none" : status;
   const items: RenderItem[] = buildItems(
     snap,
     language,
-    status === "ok" && !snap ? "none" : status,
+    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
+  // reset countdown fresh without refetching.
+  const compact = buildCompactStatus(snap, widgetStatus, ctx.ui.theme);
+  if (compact) {
+    ctx.ui.setStatus(STATUS_KEY, compact);
+  } else {
+    ctx.ui.setStatus(STATUS_KEY, undefined);
+  }
   if (activeWidget) {
     activeWidget.update(items);
     return;
@@ -504,15 +518,26 @@ export default function (pi: ExtensionAPI): void {
     }
   }
 
-  pi.on("session_shutdown", async () => {
-    shuttingDown = true;
-    markShuttingDown();
+  pi.on("session_shutdown", async (event) => {
     stopTicker();
     inFlight?.abort();
+    // Only a real quit is terminal. Session switches (/new, /resume, /fork,
+    // /reload) tear down and then re-enter session_start in the same process;
+    // marking terminal shutdown there would block every future refresh.
+    if (event.reason === "quit") {
+      shuttingDown = true;
+      markShuttingDown();
+    }
     await flushWrites();
   });
 
   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.
+    shuttingDown = false;
+    resetShutdownState();
+    activeWidget = null;
     activeProduct = resolveProduct(ctx);
     deltas = null;
     note = null;

package/extensions/lib/cache.ts

@@ -172,6 +172,11 @@ export function markShuttingDown(): void {
   shuttingDown = true;
 }
 
+/** Revive cache writes after an in-process session switch (see index.ts). */
+export function resetShutdownState(): void {
+  shuttingDown = false;
+}
+
 async function writeFile(data: string): Promise<void> {
   await mkdir(CACHE_DIR, { recursive: true, mode: DIR_MODE });
   const dir = await lstat(CACHE_DIR);

package/extensions/lib/widget.ts

@@ -122,9 +122,9 @@ export const LOCALES: Record<Language, Locale> = { zh: ZH, en: EN };
 export const AUTO_REFRESH_MAX_MINUTES = 30;
 
 export const DEFAULT_SETTINGS: ArkSettings = {
-  pctYellow: 40,
+  pctYellow: 50,
   pctRed: 80,
-  autoRefreshMinutes: 0,
+  autoRefreshMinutes: 5,
   product: "auto",
   seat: "",
 };
@@ -209,6 +209,57 @@ export function formatAge(fetchedAt: number, lang: Language): string {
   return LOCALES[lang].ageMinutesAgo(m);
 }
 
+/* ---------------------- compact status (powerline slot) -------------------- */
+
+/**
+ * Compact reset countdown for the powerline status: `38m`, `4h38m`, `5d4h`.
+ * Lower-precision units are dropped to keep the line short and stable.
+ */
+export function formatCompactRemaining(ms: number): string {
+  if (!Number.isFinite(ms) || ms <= 0) return "";
+  const totalMin = Math.floor(ms / 60_000);
+  const d = Math.floor(totalMin / 1440);
+  const h = Math.floor((totalMin % 1440) / 60);
+  const m = totalMin % 60;
+  if (d > 0) return `${d}d${h}h`;
+  if (h > 0) return `${h}h${m}m`;
+  return `${m}m`;
+}
+
+/**
+ * One-line colored summary for the powerline extension-status slot:
+ * `1% 4h38m | 15% 5d4h | 54% 23d4h`
+ *
+ * Periods are shown in API order (session / weekly / monthly) without
+ * labels — the order itself is the convention. Percent follows the
+ * yellow/red thresholds (green below yellow, yellow below red, red at/above
+ * red); the time part is always purple; the ` | ` separator uses the
+ * editor border color (`thinkingHigh`, pink in the dark theme).
+ *
+ * Returns null when nothing should be shown (the powerline item hides).
+ */
+export function buildCompactStatus(
+  snapshot: PlanSnapshot | null,
+  status: WidgetStatus,
+  theme: Theme,
+): string | null {
+  if (snapshot && snapshot.periods.length > 0) {
+    const sep = theme.fg("thinkingHigh", " | ");
+    return snapshot.periods
+      .map((p) => {
+        const pct = coloredPct(clampPct(p.percent));
+        const reset = p.reset_at
+          ? formatCompactRemaining(new Date(p.reset_at).getTime() - Date.now())
+          : "";
+        return reset ? `${pct} ${hexFg(HEX_COLORS.purple, reset)}` : pct;
+      })
+      .join(sep);
+  }
+  if (status === "fetching") return hexFg(HEX_COLORS.purple, "…");
+  if (status === "failed") return hexFg(HEX_COLORS.red, "failed");
+  return null;
+}
+
 /* ----------------------------- snapshot -> items --------------------------- */
 
 export type WidgetStatus = "ok" | "fetching" | "failed" | "no-binary" | "none";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ark-usage",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Show Volcengine Ark Coding Plan / Agent Plan usage in the pi TUI (AK/SK OpenAPI)",
   "keywords": [
     "pi",
@@ -33,7 +33,8 @@
   },
   "main": "extensions/index.ts",
   "scripts": {
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "test": "node --import ./test/ts-resolve-hook.mjs --test --experimental-strip-types test/*.test.ts"
   },
   "devDependencies": {
     "@types/node": "^22.19.19",