@d3ara1n/pi-editor-shell 0.6.0 → 0.7.1

package/README.md

@@ -4,8 +4,8 @@ Replaces pi's default editor and status bar with a unified rounded-corner shell
 
 ## What shows up where
 
-- **Top border** — `  provider/model ·  thinking-level ` (left) + pinned extension statuses (right, via `pinnedStatus` config)
-- **Bottom border** — `  ctx NN%/NNk|N.NM · ⚡ cacheRead (total)  hitRate% ` (left) + `  ~/Projects (main +2 ~1) ` (right, shows git branch + dirty state when in a repo)
+- **Top border** — `  model ·  thinking-level ` (left) + pinned extension statuses (right, via `pinnedStatus` config)
+- **Bottom border** — `  ctx NN%/NNk|N.NM · ⚡ cacheRead (total)  hitRate% ` (left) + `  ~/Projects (main +2 ~1) ` (right, shows git branch + dirty state when in a repo). Session hit rate via `/editor-shell:status`.
 - **Below shell** — Auto-wrapping extension status line (all `setStatus` entries not pinned to the top)
 - **Border color** follows pi's thinking-level / bash-mode indicator automatically.
 
@@ -38,6 +38,25 @@ In `~/.pi/agent/settings.json` under the `editorShell` key:
 | `hitRate` | `` | fa-bullseye |
 | `folder` | `` | fa-folder_open |
 
+### Model display
+
+How the model is labeled in the top-left border (`"name"` by default):
+
+```json
+{
+  "editorShell": {
+    "modelDisplay": "name"
+  }
+}
+```
+
+| Value | Example |
+|-------|---------|
+| `"name"` (default) | `Claude Opus 4.8 (Yanproxy)` |
+| `"provider-id"` | `yanproxy/anthropic/claude-opus-4-8` |
+
+`"name"` uses `model.name`; a model with no name falls back to its id, so the slot never goes blank.
+
 ## Commands
 
 | Command | Description |
@@ -74,5 +93,4 @@ Or add to `~/.pi/agent/settings.json`:
 
 ## Dependencies
 
-- [`@earendil-works/pi-coding-agent`](https://www.npmjs.com/package/@earendil-works/pi-coding-agent)
-- [`@earendil-works/pi-tui`](https://www.npmjs.com/package/@earendil-works/pi-tui)
+None.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-editor-shell",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "type": "module",
   "description": "Replaces pi's default editor and status bar with a unified rounded-corner shell embedding status info in the border",
   "keywords": [

package/src/card-editor.ts

@@ -34,12 +34,12 @@ export type SpinnerPhase = "thinking" | "outputting" | "toolcall" | "exec";
 /** Spinner frames keyed by agent phase, chosen for semantic fit:
  *  thinking  — ●/○ pulse, doubled frames to halve the tempo
  *  outputting — braille sand-pile (dots accumulate bottom-up, then clear)
- *  toolcall  — ▓▒░ breathing light (single char, fades in/out)
+ *  toolcall  — shade ramp breathing (░▒▓█▓▒, symmetric incl. full block)
  *  exec      — ◜◝◞◟ arc rotation (tool spinning, mechanical) */
 const SPINNERS: Record<SpinnerPhase, readonly string[]> = {
   thinking: ["●", "●", "○", "○"],
   outputting: ["⡀", "⣀", "⣄", "⣤", "⣦", "⣶", "⣷", "⣿"],
-  toolcall: ["▓", "▒", "░", "░", "▒"],
+  toolcall: ["░", "▒", "▓", "█", "▓", "▒"],
   exec: ["◜", "◝", "◞", "◟"],
 };
 

package/src/config.ts

@@ -22,6 +22,9 @@ export interface EditorShellIcons {
   folder: string;
 }
 
+/** How the model is shown in the top-left border slot. */
+export type ModelDisplay = "name" | "provider-id";
+
 export interface EditorShellConfig {
   /**
    * Status keys to pin to the shell's top-right corner.
@@ -34,6 +37,13 @@ export interface EditorShellConfig {
    * for a Nerd Font glyph, or `"🤖"` for an emoji, etc.
    */
   icons: Partial<EditorShellIcons>;
+  /**
+   * What to show as the model label in the top-left border.
+   * - `"name"` — `model.name` (friendlier; falls back to the id when a model
+   *   has no name, so it never goes blank).
+   * - `"provider-id"` — `provider/id`.
+   */
+  modelDisplay: ModelDisplay;
 }
 
 const ICON_KEYS: ReadonlyArray<keyof EditorShellIcons> = [
@@ -59,6 +69,7 @@ function filterIcons(obj: Record<string, unknown>): Partial<EditorShellIcons> {
 export const DEFAULT_CONFIG: EditorShellConfig = {
   pinnedStatus: [],
   icons: {},
+  modelDisplay: "name",
 };
 
 function getAgentDir(): string {
@@ -91,6 +102,11 @@ export function loadEditorShellConfig(cwd?: string): EditorShellConfig {
 
   const pinned = raw.pinnedStatus;
   const iconsRaw = raw.icons;
+  const modelDisplayRaw = raw.modelDisplay;
+  const modelDisplay =
+    modelDisplayRaw === "name" || modelDisplayRaw === "provider-id"
+      ? modelDisplayRaw
+      : DEFAULT_CONFIG.modelDisplay;
   return {
     pinnedStatus: Array.isArray(pinned)
       ? pinned.filter((k): k is string => typeof k === "string")
@@ -99,5 +115,6 @@ export function loadEditorShellConfig(cwd?: string): EditorShellConfig {
       iconsRaw && typeof iconsRaw === "object"
         ? filterIcons(iconsRaw as Record<string, unknown>)
         : {},
+    modelDisplay,
   };
 }

package/src/index.ts

@@ -4,7 +4,7 @@ import { spawn } from "node:child_process";
 import * as os from "node:os";
 import * as path from "node:path";
 import { CardEditor, type FrameProvider, type SpinnerPhase } from "./card-editor";
-import { loadEditorShellConfig, type EditorShellConfig, type EditorShellIcons } from "./config";
+import { DEFAULT_CONFIG, loadEditorShellConfig, type EditorShellConfig, type EditorShellIcons } from "./config";
 
 /**
  * pi-editor-shell — Replaces pi's default editor and status bar with a
@@ -86,8 +86,25 @@ interface EntrySnap {
   message?: MsgSnap;
 }
 
-/** Sum cache-read tokens across all assistant messages, matching pi's own
- *  footer filtering (type === "message") and accumulation ("R14M"). */
+/** Sum cache-related usage across all assistant messages on the session.
+ *  Returns the same shape as UsageSnap so we can reuse cacheHitRate(). */
+function sumSessionUsage(ctx: { sessionManager: { getEntries(): unknown[] } }): UsageSnap {
+  let input = 0;
+  let cacheRead = 0;
+  let cacheWrite = 0;
+  for (const entry of ctx.sessionManager.getEntries()) {
+    const e = entry as EntrySnap;
+    if (e.type !== "message" || e.message?.role !== "assistant" || !e.message.usage) continue;
+    input += e.message.usage.input ?? 0;
+    cacheRead += e.message.usage.cacheRead ?? 0;
+    cacheWrite += e.message.usage.cacheWrite ?? 0;
+  }
+  return { input, cacheRead, cacheWrite };
+}
+
+/** Sum cache-read tokens across all assistant messages — session total for
+ *  the "(14.0M)" display in the border. Kept separate from sumSessionUsage
+ *  to keep the hot path (agent_end) minimal. */
 function sumCacheRead(ctx: { sessionManager: { getEntries(): unknown[] } }): number {
   let total = 0;
   for (const entry of ctx.sessionManager.getEntries()) {
@@ -110,14 +127,31 @@ function latestAssistantUsage(ctx: { sessionManager: { getEntries(): unknown[] }
   return latest;
 }
 
-/** Cache hit rate for a single turn: cacheRead / (input + cacheRead +
- *  cacheWrite) × 100 — same formula pi's footer uses for "CHxx%".
- *  Returns undefined when there's no usage or no prompt tokens. */
+/** Cache hit rate for a single turn.
+ *
+ *  The `Usage.input` field has different semantics depending on the provider:
+ *  - OpenAI/DeepSeek: `input` = fresh non-cached tokens (promptTokens −
+ *    cacheRead − cacheWrite). Denominator = input + cacheRead + cacheWrite.
+ *  - Anthropic: `input` = total input_tokens (already includes cacheRead +
+ *    cacheWrite). Denominator = input alone (otherwise cache is counted twice).
+ *
+ *  We detect the convention: if `input` can account for both cacheRead and
+ *  cacheWrite (input >= cacheRead + cacheWrite), assume it is the total-input
+ *  convention (Anthropic). Otherwise assume the fresh-only convention
+ *  (OpenAI).  Heuristic, not perfect, but correct for both conventions in
+ *  practice; the real fix belongs in pi-ai where Usage is populated.
+ *
+ *  Returns undefined when there is no usage or no prompt tokens. */
 function cacheHitRate(u: UsageSnap | undefined): number | undefined {
   if (!u) return undefined;
-  const prompt = (u.input ?? 0) + (u.cacheRead ?? 0) + (u.cacheWrite ?? 0);
-  if (prompt <= 0) return undefined;
-  return ((u.cacheRead ?? 0) / prompt) * 100;
+  const nonCached = u.input ?? 0;
+  const cached = (u.cacheRead ?? 0) + (u.cacheWrite ?? 0);
+  // Anthropic convention: input already includes cacheRead + cacheWrite.
+  const totalPrompt = nonCached >= cached && cached > 0
+    ? nonCached
+    : nonCached + cached;
+  if (totalPrompt <= 0) return undefined;
+  return ((u.cacheRead ?? 0) / totalPrompt) * 100;
 }
 
 /** Format a token count for display: 14000000 → "14.0M", 132000 → "132.0k". */
@@ -205,7 +239,7 @@ export default function (pi: ExtensionAPI) {
   // The factory may run again when pi rebuilds the editor (model switch,
   // reload, …), so always drive whichever instance is current.
   let editor: CardEditor | undefined;
-  let config: EditorShellConfig = { pinnedStatus: [], icons: {} };
+  let config: EditorShellConfig = { ...DEFAULT_CONFIG };
   // Resolved icons for the current session: built-in defaults merged with
   // the user's overrides. Re-computed at session_start.
   let icons: EditorShellIcons = { ...DEFAULT_ICONS };
@@ -281,7 +315,11 @@ export default function (pi: ExtensionAPI) {
         return ` ${texts.map((s) => theme.fg("muted", s)).join(theme.fg("dim", " · "))} `;
       };
 
-      const model = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : "no model";
+      const model = ctx.model
+        ? config.modelDisplay === "name"
+          ? ctx.model.name
+          : `${ctx.model.provider}/${ctx.model.id}`
+        : "no model";
       const thinking = pi.getThinkingLevel();
       const thinkingColor = THINKING_TOKEN[thinking] ?? "muted";
 
@@ -296,6 +334,7 @@ export default function (pi: ExtensionAPI) {
       // Cache-read tokens — per-turn figure first, session total in parens,
       // then hit rate (pi's "CHxx%" formula). All refreshed at agent_end and
       // read from cache off the hot path.
+      // Session hit rate is available via /editor-shell:status.
       const cacheReadNow = _latestUsage?.cacheRead ?? 0;
       const hitRate = cacheHitRate(_latestUsage);
       const cachePart =
@@ -378,6 +417,7 @@ export default function (pi: ExtensionAPI) {
 
       lines.push("[editor-shell config]");
       lines.push(`  pinnedStatus: [${config.pinnedStatus.join(", ")}]`);
+      lines.push(`  modelDisplay: ${config.modelDisplay}`);
 
       lines.push("");
       lines.push("[extension statuses]");
@@ -402,13 +442,17 @@ export default function (pi: ExtensionAPI) {
 
       lines.push("");
       lines.push("[cache totals]");
-      const tokens = sumCacheRead(ctx);
-      lines.push(`  cacheRead (session): ${tokens > 0 ? formatTokens(tokens) : "0"}`);
+      const sess = sumSessionUsage(ctx);
+      lines.push(`  session input: ${formatTokens(sess.input ?? 0)}`);
+      lines.push(`  session cacheRead: ${formatTokens(sess.cacheRead ?? 0)}`);
+      lines.push(`  session cacheWrite: ${formatTokens(sess.cacheWrite ?? 0)}`);
+      const sRate = cacheHitRate(sess);
+      lines.push(`  session hit rate: ${sRate != null ? `${sRate.toFixed(1)}%` : "n/a"}`);
       const latest = latestAssistantUsage(ctx);
       const now = latest?.cacheRead ?? 0;
-      lines.push(`  cacheRead (this turn): ${formatTokens(now)}`);
+      lines.push(`  this turn cacheRead: ${formatTokens(now)}`);
       const hr = cacheHitRate(latest);
-      lines.push(`  hit rate: ${hr != null ? `${hr.toFixed(1)}%` : "n/a"}`);
+      lines.push(`  this turn hit rate: ${hr != null ? `${hr.toFixed(1)}%` : "n/a"}`);
 
       lines.push("");
       lines.push(`[context] cwd: ${ctx.cwd}`);