pi-commandcode-provider 0.4.0 → 0.4.2

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## Unreleased
 
+## 0.4.2 - 2026-07-05
+
+- Fix Oh My Pi extension validation by avoiding the missing `calculateCost` export from OMP's legacy `pi-ai` shim.
+- Add a regression test that locks the local Command Code cost calculation to pi-ai's upstream `calculateCost` behavior.
+
+### Contributors
+
+- @CoderTCY — reported the Oh My Pi installation failure.
+
+## 0.4.1 - 2026-06-16
+
+- Use the explicit `$COMMANDCODE_API_KEY` provider registration syntax expected by newer pi versions, removing the startup deprecation warning while keeping legacy placeholder compatibility.
+- Refresh development dependency lockfile entries to resolve npm audit findings for `tsx`/`esbuild` and `protobufjs`.
+
+### Contributors
+
+- @plumj-am — fixed the pi provider `apiKey` deprecation warning.
+- @cad0p — reported retry/deprecation-related issues that helped validate the current behavior.
+- @bl4zee1g — reported provider availability concerns that prompted additional local/live validation.
+
 ## 0.4.0 - 2026-06-02
 
 - Add retry mechanism for transient HTTP errors (429, 5xx) and stream-level errors, configurable via pi `settings.json` `retry.provider` fields (`timeoutMs`, `maxRetries`, `maxRetryDelayMs`). Supports exponential backoff with jitter and `Retry-After` header.

package/index.ts

@@ -12,10 +12,11 @@
  * Models are fetched from Command Code's Provider API at startup.
  */
 
-import { AssistantMessageEventStream, calculateCost } from "@earendil-works/pi-ai"
+import { AssistantMessageEventStream } from "@earendil-works/pi-ai"
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent"
 
 import { COMMAND_CODE_CLI_VERSION, createStreamCommandCode, DEFAULT_API_BASE } from "./src/core.ts"
+import { calculateCommandCodeCost } from "./src/cost.ts"
 import { DEFAULT_MODELS_URL, fetchCommandCodeModels } from "./src/models.ts"
 import { getApiKey, login, refreshToken } from "./src/oauth.ts"
 
@@ -69,7 +70,7 @@ const MODEL_COSTS: Record<string, CommandCodeModelCost> = {
 
 const streamCommandCode = createStreamCommandCode({
   createStream: () => new AssistantMessageEventStream(),
-  calculateCost,
+  calculateCost: calculateCommandCodeCost,
   apiBase: API_BASE,
 })
 
@@ -83,7 +84,7 @@ export default async function (pi: ExtensionAPI) {
   pi.registerProvider("commandcode", {
     name: "Command Code",
     baseUrl: API_BASE,
-    apiKey: "COMMANDCODE_API_KEY",
+    apiKey: "$COMMANDCODE_API_KEY",
     authHeader: true,
     api: "commandcode-custom",
     streamSimple: streamCommandCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-commandcode-provider",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "pi custom provider for Command Code API (commandcode.ai)",
   "type": "module",
   "keywords": [
@@ -28,7 +28,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "npm run typecheck && tsx tests/test-pure-functions.ts && tsx tests/test-models.ts && tsx tests/test-pricing.ts && tsx tests/test-oauth.ts && tsx tests/test-abort.ts && tsx tests/test-stream.ts && tsx tests/test-retry.ts && node tests/test-pi-local.mjs && node tests/test-omp-compat.mjs",
+    "test": "npm run typecheck && tsx tests/test-pure-functions.ts && tsx tests/test-models.ts && tsx tests/test-pricing.ts && tsx tests/test-cost.ts && tsx tests/test-oauth.ts && tsx tests/test-abort.ts && tsx tests/test-stream.ts && tsx tests/test-retry.ts && node tests/test-pi-local.mjs && node tests/test-omp-compat.mjs",
     "typecheck": "tsc --noEmit",
     "format:check": "prettier --check '**/*.{ts,mjs,json,md}'",
     "format": "prettier --write '**/*.{ts,mjs,json,md}'",
@@ -40,7 +40,8 @@
     "test:stream": "tsx tests/test-stream.ts",
     "test:retry": "tsx tests/test-retry.ts",
     "test:pi-local": "node tests/test-pi-local.mjs",
-    "test:smoke": "node tests/test-smoke.mjs"
+    "test:smoke": "node tests/test-smoke.mjs",
+    "test:cost": "tsx tests/test-cost.ts"
   },
   "pi": {
     "extensions": [
@@ -50,7 +51,7 @@
   "devDependencies": {
     "@types/node": "25.6.0",
     "prettier": "^3.5.0",
-    "tsx": "4.21.0",
+    "tsx": "4.22.4",
     "typescript": "6.0.3"
   },
   "dependencies": {

package/src/core.ts

@@ -193,10 +193,17 @@ export function createStreamCommandCode(deps: CoreDependencies) {
     const stream = deps.createStream()
 
     async function run() {
-      // OMP may pass the env-var name "COMMANDCODE_API_KEY" as the apiKey
-      // value instead of resolving it. Filter out this specific string.
+      // OMP may pass the legacy env-var name "COMMANDCODE_API_KEY" (old pi)
+      // or "$COMMANDCODE_API_KEY" (new pi) as the apiKey value instead of
+      // resolving it. Filter out these specific strings.
+      const LEGACY_API_KEY_REF = "$COMMANDCODE_API_KEY"
+      const OLD_API_KEY_REF = "COMMANDCODE_API_KEY"
       const hostKey =
-        options?.apiKey && options.apiKey !== "COMMANDCODE_API_KEY" ? options.apiKey : undefined
+        options?.apiKey &&
+        options.apiKey !== LEGACY_API_KEY_REF &&
+        options.apiKey !== OLD_API_KEY_REF
+          ? options.apiKey
+          : undefined
 
       const apiKey =
         hostKey ??

package/src/cost.ts

@@ -0,0 +1,19 @@
+/**
+ * Local cost calculation for Command Code usage.
+ *
+ * Mirrors pi-ai's `calculateCost` arithmetic exactly. The provider ships its
+ * own copy because Oh My Pi's legacy pi-ai shim does not export
+ * `calculateCost`, which broke extension installation there (issue #24).
+ * `tests/test-cost.ts` locks this implementation to the pi-ai original.
+ */
+
+import type { ModelLike, Usage } from "./types.ts"
+
+export function calculateCommandCodeCost(model: ModelLike, usage: Usage): void {
+  usage.cost.input = (model.cost.input / 1_000_000) * usage.input
+  usage.cost.output = (model.cost.output / 1_000_000) * usage.output
+  usage.cost.cacheRead = (model.cost.cacheRead / 1_000_000) * usage.cacheRead
+  usage.cost.cacheWrite = (model.cost.cacheWrite / 1_000_000) * usage.cacheWrite
+  usage.cost.total =
+    usage.cost.input + usage.cost.output + usage.cost.cacheRead + usage.cost.cacheWrite
+}

package/src/types.ts

@@ -50,11 +50,19 @@ export interface AssistantMessageLike {
   timestamp: number
 }
 
+export interface ModelCost {
+  input: number
+  output: number
+  cacheRead: number
+  cacheWrite: number
+}
+
 export interface ModelLike {
   id: string
   api: unknown
   provider: string
   maxTokens: number
+  cost: ModelCost
 }
 
 export interface MessageLike {