@firstpick/pi-extension-git-footer-status 0.1.8 → 0.2.0

package/index.ts

@@ -3,6 +3,13 @@ import { homedir } from "node:os";
 import { isAbsolute, resolve, sep } from "node:path";
 import type { AssistantMessage } from "@earendil-works/pi-ai";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import {
+  collectInitialPromptCalibration,
+  estimateInitialPromptInput,
+  estimateTokensFromCharCount,
+  formatTokens,
+  type InitialPromptToolInfo,
+} from "@firstpick/pi-utils";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 
 type GitSnapshot = {
@@ -62,14 +69,6 @@ function formatCwd(cwd: string): string {
   return cwd;
 }
 
-function formatTokens(count: number): string {
-  if (count < 1000) return count.toString();
-  if (count < 10000) return `${(count / 1000).toFixed(1)}k`;
-  if (count < 1000000) return `${Math.round(count / 1000)}k`;
-  if (count < 10000000) return `${(count / 1000000).toFixed(1)}M`;
-  return `${Math.round(count / 1000000)}M`;
-}
-
 function normalizeTimestampMs(timestamp: number): number {
   // Handle mixed timestamp units from different session formats.
   // seconds   -> ms  (e.g. 1715000000)
@@ -97,16 +96,6 @@ type LiveTokenSample = {
   tokens: number;
 };
 
-function estimateTokensFromCharCount(charCount: number): number {
-  // Provider tokenizers differ and streaming usage is normally only available at message end.
-  // chars/4 is the common rough estimate for live display; final usage uses provider counts.
-  return Math.max(0, Math.round(charCount / 4));
-}
-
-function estimatePromptInjectionTokens(systemPrompt: string): number {
-  return estimateTokensFromCharCount(systemPrompt.length);
-}
-
 function formatTokenSpeed(tokensPerSecond: number): string {
   if (tokensPerSecond < 100) {
     if (tokensPerSecond >= 10) return tokensPerSecond.toFixed(1);
@@ -500,7 +489,28 @@ export default function gitFooterStatus(pi: ExtensionAPI) {
             latestTokenSpeed = historicalTokenSpeed;
           }
 
-          const promptInjectionTokens = estimatePromptInjectionTokens(ctx.getSystemPrompt());
+          let activeTools: string[] = [];
+          let allTools: InitialPromptToolInfo[] = [];
+          try {
+            activeTools = pi.getActiveTools();
+          } catch {
+            activeTools = [];
+          }
+          try {
+            allTools = pi.getAllTools().map((tool) => ({
+              name: tool.name,
+              description: tool.description,
+              parameters: tool.parameters,
+            }));
+          } catch {
+            allTools = [];
+          }
+          const promptInjectionTokens = estimateInitialPromptInput({
+            systemPrompt: ctx.getSystemPrompt(),
+            activeTools,
+            allTools,
+            calibration: collectInitialPromptCalibration(ctx.sessionManager.getSessionDir()),
+          }).total;
 
           const contextUsage = ctx.getContextUsage();
           const contextWindow = contextUsage?.contextWindow ?? ctx.model?.contextWindow ?? 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firstpick/pi-extension-git-footer-status",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "Enhanced Pi footer with git status, token usage, context usage, and model telemetry.",
   "license": "MIT",
   "keywords": [
@@ -14,6 +14,9 @@
       "./index.ts"
     ]
   },
+  "dependencies": {
+    "@firstpick/pi-utils": "^0.1.3"
+  },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-ai": "*",