pi-spark 0.10.1 → 0.10.3

package/README.md

@@ -24,10 +24,10 @@ Install from npm:
 pi install npm:pi-spark
 ```
 
-Install from git:
+For local development from this monorepo:
 
 ```bash
-pi install git:github.com/zlliang/pi-spark
+pi install /path/to/pi-packages/packages/pi-spark
 ```
 
 ## Configure
@@ -117,4 +117,4 @@ Project trust is an [input-loading guard](https://pi.dev/docs/latest/security#pr
 
 ## Other pi packages
 
-- [pi-credits](https://github.com/zlliang/pi-credits): shows the active provider's credit balance or rate-limit usage as a footer status.
+- [pi-credits](https://github.com/zlliang/pi-packages/tree/main/packages/pi-credits): shows the active provider's credit balance or rate-limit usage as a footer status.

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/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.1",
+  "version": "0.10.3",
   "description": "A small, opinionated collection of pi extensions",
   "keywords": [
     "pi-coding-agent",
@@ -8,24 +8,21 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/zlliang/pi-spark.git"
+    "url": "git+https://github.com/zlliang/pi-packages.git",
+    "directory": "packages/pi-spark"
   },
   "license": "MIT",
   "type": "module",
   "files": [
     "extensions",
     "assets",
-    "README.md",
-    "LICENSE"
+    "README.md"
   ],
   "pi": {
     "extensions": [
       "./extensions"
     ],
-    "image": "https://raw.githubusercontent.com/zlliang/pi-spark/main/assets/cover.png"
-  },
-  "scripts": {
-    "typecheck": "tsc --noEmit"
+    "image": "https://raw.githubusercontent.com/zlliang/pi-packages/main/packages/pi-spark/assets/cover.png"
   },
   "dependencies": {
     "liqe": "^3.8.7",
@@ -39,13 +36,7 @@
     "@earendil-works/pi-tui": "*",
     "typebox": "*"
   },
-  "devDependencies": {
-    "@earendil-works/pi-agent-core": "*",
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
-    "@types/node": "*",
-    "typebox": "*",
-    "typescript": "^6.0.3"
+  "scripts": {
+    "typecheck": "pnpm --dir ../.. typecheck"
   }
-}
+}