@d3ara1n/pi-editor-shell 0.5.0 → 0.7.0

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%/NNNk · ⚡ 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)
 - **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.
 
@@ -15,19 +15,13 @@ All segments are re-read from live session state on every paint, so switching th
 
 In `~/.pi/agent/settings.json` under the `editorShell` key:
 
-```jsonc
+```json
 {
   "editorShell": {
-    // Status keys to pin to the top-right corner of the shell.
-    // Only keys set via ctx.ui.setStatus() are eligible.
     "pinnedStatus": ["subagent", "access-denied"],
-
-    // Per-slot border-icon overrides. Any subset; missing keys fall back
-    // to the built-in Nerd Font set (see table below). Values are raw
-    // characters — "\uf0e7" for a Nerd Font glyph, "🤖" for an emoji.
     "icons": {
-      "model": "🤖",
-      "cache": "\uf0e7"
+      "model": "robot",
+      "cache": "\\uf0e7"
     }
   }
 }
@@ -44,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 |
@@ -64,7 +77,7 @@ pi install npm:@d3ara1n/pi-editor-shell
 
 Or add to `~/.pi/agent/settings.json`:
 
-```jsonc
+```json
 {
   "extensions": [
     "/absolute/path/to/pi-extensions/packages/pi-editor-shell"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-editor-shell",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "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/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
@@ -47,6 +47,16 @@ function contextToken(pct: number | null | undefined): ThemeColor {
   return "success";
 }
 
+function trimFixed1(n: number): string {
+  const text = n.toFixed(1);
+  return text.endsWith(".0") ? text.slice(0, -2) : text;
+}
+
+function formatContextWindow(tokens: number): string {
+  if (tokens >= 1_000_000) return `${trimFixed1(tokens / 1_000_000)}M`;
+  return `${(tokens / 1_000).toFixed(0)}k`;
+}
+
 // ── Built-in icon set (Nerd Font). Users can override any subset via the
 //    `editorShell.icons` config — see config.ts. `cache` uses U+26A1, which
 //    Nerd Fonts maps `oct-zap` to directly (no dedicated glyph), so it is
@@ -195,7 +205,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 };
@@ -271,7 +281,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";
 
@@ -280,8 +294,8 @@ export default function (pi: ExtensionAPI) {
       const ctxWindow = usage?.contextWindow ?? ctx.model?.contextWindow;
       const ctxText =
         pct != null && ctxWindow
-          ? `${pct.toFixed(1)}%/${(ctxWindow / 1000).toFixed(0)}k`
-          : "?/??k";
+          ? `${pct.toFixed(1)}%/${formatContextWindow(ctxWindow)}`
+          : "?/??";
 
       // Cache-read tokens — per-turn figure first, session total in parens,
       // then hit rate (pi's "CHxx%" formula). All refreshed at agent_end and
@@ -368,6 +382,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]");