pi-spark 0.10.0 → 0.10.2

package/extensions/footer/index.ts

@@ -62,20 +62,10 @@ class FooterComponent implements Component {
   }
 
   private getStyledCostText(): string {
-    const cost = this.ctx.sessionManager.getBranch().reduce((acc, entry) => {
-      const entryUsage = getEntryUsage(this.ctx, entry);
-      if (entryUsage) acc[entryUsage.type] += entryUsage.usage.cost.total;
-      return acc;
-    }, { subscription: 0, paid: 0 });
-
-    const isSubscription = this.ctx.model ? this.ctx.modelRegistry.isUsingOAuth(this.ctx.model) : false;
-    const subscriptionCostText = isSubscription || cost.subscription >= 0.005 ? formatCost(cost.subscription, true) : undefined;
-    const paidCostText = !isSubscription || cost.paid >= 0.005 ? formatCost(cost.paid, false) : undefined;
-    const costText = [subscriptionCostText, paidCostText].filter(Boolean).join(" + ");
-
-    const totalCost = cost.subscription + cost.paid;
-    if (totalCost > 20) return this.theme.fg("warning", costText);
+    const totalCost = this.ctx.sessionManager.getBranch().reduce((acc, entry) => acc + (getEntryUsage(entry)?.cost.total ?? 0), 0);
+    const costText = formatCost(totalCost);
 
+    if (totalCost > 20) return this.theme.fg("warning", costText);
     return this.theme.fg("dim", costText);
   }
 

package/extensions/models/index.ts

@@ -16,6 +16,9 @@ const DEFAULT_THINKING_LEVEL: ModelThinkingLevel = "medium";
 /** Maximum number of models returned per list call; byte size is unrestricted. */
 const LIST_MAX_LINES = 200;
 
+/** Maximum number of model rows shown when the result is collapsed. */
+const COLLAPSED_MAX_ROWS = 10;
+
 type ModelMetadata = Omit<Model<Api>, "headers" | "compat"> & {
   thinkingLevels: ModelThinkingLevel[];
   defaultThinkingLevel: ModelThinkingLevel;
@@ -59,6 +62,16 @@ function formatPrice(value: number): string {
   return String(parseFloat(value.toFixed(2)));
 }
 
+/** Notice line describing truncation or remaining pages, shared by the text result and the TUI. */
+function formatListNotice(truncated: boolean, startIndex: number, endDisplay: number, total: number): string | undefined {
+  const nextOffset = endDisplay + 1;
+
+  if (truncated) return `[Truncated: showing models ${startIndex + 1}-${endDisplay} of ${total}. Use offset=${nextOffset} to continue.]`;
+  if (endDisplay < total) return `[${total - endDisplay} more models in list. Use offset=${nextOffset} to continue.]`;
+
+  return undefined;
+}
+
 export default function (pi: ExtensionAPI) {
   pi.on("session_start", (_event, ctx) => {
     const config = loadConfig(ctx, "models");
@@ -162,15 +175,27 @@ export default function (pi: ExtensionAPI) {
         const models = details.models ?? [];
         const total = details.total ?? models.length;
 
-        if (models.length > 0 && expanded) {
-          addRows(models.map((model) => toModelRow(model)));
+        if (models.length > 0) {
+          const maxRows = expanded ? models.length : Math.min(models.length, COLLAPSED_MAX_ROWS);
+          addRows(models.slice(0, maxRows).map((model) => toModelRow(model)));
+
+          const hiddenRows = models.length - maxRows;
+          if (hiddenRows > 0) container.addChild(new Text(theme.fg("dim", `... (${hiddenRows} more, ${keyText("app.tools.expand")} to expand)`), 0, 0));
           container.addChild(new Spacer(1));
         }
 
-        const summary = total > 0 ? `${models.length !== total ? `${models.length} of ` : ""}${total} ${filtered ? "matched " : ""}model${total === 1 ? "" : "s"} listed.` : `No models ${filtered ? "matched" : "found"}.`;
-        const truncatedHint = details.truncation?.truncated ? theme.fg("warning", " (truncated)") : "";
-        const expandHint = models.length > 0 && !expanded ? theme.fg("dim", ` (${keyText("app.tools.expand")} to expand)`) : "";
-        container.addChild(new Text(theme.fg("muted", summary) + truncatedHint + expandHint, 0, 0));
+        if (details.truncation?.truncated) {
+          const startIndex = context.args.offset ? Math.max(0, context.args.offset - 1) : 0;
+          const endDisplay = startIndex + models.length;
+          const notice = formatListNotice(true, startIndex, endDisplay, total);
+          if (notice) {
+            container.addChild(new Text(theme.fg("warning", notice), 0, 0));
+            container.addChild(new Spacer(1));
+          }
+        }
+
+        const summary = `${models.length !== total ? `${models.length} of ` : ""}${total} ${filtered ? "matched " : ""}model${total === 1 ? "" : "s"} listed.`;
+        container.addChild(new Text(theme.fg("muted", total > 0 ? summary : `No models ${filtered ? "matched" : "found"}.`), 0, 0));
 
         return container;
       },
@@ -200,8 +225,7 @@ export default function (pi: ExtensionAPI) {
           }
         }
 
-        const models = ctx.modelRegistry.getAll()
-          .map((model) => toMetadata(model, ctx.modelRegistry.hasConfiguredAuth(model)));
+        const models = ctx.modelRegistry.getAll().map((model) => toMetadata(model, ctx.modelRegistry.hasConfiguredAuth(model)));
         const matched = listQuery ? filter(listQuery, models) : models;
         const total = matched.length;
 
@@ -229,14 +253,10 @@ export default function (pi: ExtensionAPI) {
 
         const delivered = truncation.truncated ? selected.slice(0, truncation.outputLines) : selected;
         const endDisplay = startIndex + delivered.length;
-        const nextOffset = endDisplay + 1;
 
         let text = truncation.content;
-        if (truncation.truncated) {
-          text += `\n\n[Truncated: showing models ${startIndex + 1}-${endDisplay} of ${total}. Use offset=${nextOffset} to continue.]`;
-        } else if (endDisplay < total) {
-          text += `\n\n[${total - endDisplay} more models in list. Use offset=${nextOffset} to continue.]`;
-        }
+        const notice = formatListNotice(truncation.truncated, startIndex, endDisplay, total);
+        if (notice) text += `\n\n${notice}`;
 
         return {
           content: [{ type: "text", text }],

package/extensions/shared/format/index.ts

@@ -24,8 +24,8 @@ export function formatContextUsage(contextUsage: ContextUsage | undefined): stri
   return `${tokens === null ? "?" : formatTokens(tokens)}/${contextWindow === null ? "?" : formatTokens(contextWindow)} (${percentText})`;
 }
 
-export function formatCost(cost: number, isSubscription: boolean): string {
-  return `$${cost.toFixed(2)}${isSubscription ? " (sub)" : ""}`;
+export function formatCost(cost: number): string {
+  return `$${cost.toFixed(2)}`;
 }
 
 export function formatCwd(cwd: string, home: string): string {

package/extensions/shared/usage/index.ts

@@ -1,5 +1,5 @@
 import type { Usage } from "@earendil-works/pi-ai";
-import type { ExtensionContext, SessionEntry } from "@earendil-works/pi-coding-agent";
+import type { SessionEntry } from "@earendil-works/pi-coding-agent";
 
 /** Structural type guard for the pi `Usage` shape. */
 export function isUsage(value: unknown): value is Usage {
@@ -44,20 +44,17 @@ export function addUsage(a: Usage, b: Usage): Usage {
 }
 
 /**
- * Extract usage from a session entry, classifying it as subscription or paid.
+ * Extract usage from a session entry.
  *
- * `usage`/`provider`/`model` live in different fields depending on the entry type:
+ * `usage` live in different fields depending on the entry type:
  *
- * - `message` carries them on `.message`
- * - `custom` on `.data`
- * - `custom_message` on `.details`.
+ * - `message` carries them on `message`.
+ * - `custom` on `data`.
+ * - `custom_message` on `details`.
  *
  * Other entry types carry no usage. Returns `undefined` when the resolved field has no `usage`.
- *
- * An entry counts as subscription only when its `provider`/`model` resolve to an OAuth model in the
- * registry; everything else (including entries without `provider`/`model`) is treated as paid.
  */
-export function getEntryUsage(ctx: ExtensionContext, entry: SessionEntry): { type: "subscription" | "paid"; usage: Usage } | undefined {
+export function getEntryUsage(entry: SessionEntry): Usage | undefined {
   let source: unknown;
   if (entry.type === "message") source = entry.message;
   else if (entry.type === "custom") source = entry.data;
@@ -65,15 +62,8 @@ export function getEntryUsage(ctx: ExtensionContext, entry: SessionEntry): { typ
   else return;
 
   if (typeof source !== "object" || source === null) return;
-  const data = source as { usage?: unknown; provider?: unknown; model?: unknown };
+  const data = source as { usage?: unknown };
   if (!isUsage(data.usage)) return;
 
-  const type = isSubscription(ctx, data.provider, data.model) ? "subscription" : "paid";
-  return { type, usage: data.usage };
-}
-
-function isSubscription(ctx: ExtensionContext, provider: unknown, model: unknown): boolean {
-  if (typeof provider !== "string" || typeof model !== "string") return false;
-  const resolved = ctx.modelRegistry.find(provider, model);
-  return resolved ? ctx.modelRegistry.isUsingOAuth(resolved) : false;
+  return data.usage;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-spark",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "A small, opinionated collection of pi extensions",
   "keywords": [
     "pi-coding-agent",