pennyrouter 0.3.43 → 0.3.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pennyrouter",
-  "version": "0.3.43",
+  "version": "0.3.45",
   "description": "Install and manage PennyRouter local coding-agent integrations.",
   "homepage": "https://pennyrouter.com",
   "bugs": {

package/src/launch.js

@@ -8,6 +8,7 @@ import {
   readFile,
   rm,
   readdir,
+  rename,
   stat,
   symlink,
   unlink,
@@ -290,6 +291,8 @@ async function findInstalledPackage(name) {
   }
 }
 
+const REPLACED_PREFIX = ".replaced-node-modules-";
+
 /** Install the bundled, repository-independent Penny Compare tools. */
 export async function installPennyCompare() {
   if (!(process.platform === "darwin" || process.platform === "linux" || process.platform === "win32")) {
@@ -303,9 +306,26 @@ export async function installPennyCompare() {
     return { supported: true, installed: false, path: destination };
   }
   await mkdir(destination, { recursive: true, mode: 0o700 });
+  // A running Penny Compare keeps node-pty's native module loaded, and Windows will not delete
+  // a loaded module. Move the old dependencies aside first: a running copy then stops the
+  // install before anything is removed, instead of leaving a half-deleted install behind.
+  try {
+    await rename(join(destination, "web-demo", "node_modules"), join(destination, `${REPLACED_PREFIX}${Date.now()}`));
+  } catch (error) {
+    if (["EPERM", "EBUSY", "EACCES"].includes(error.code)) {
+      throw new Error("Penny Compare is still running, so its files cannot be replaced. " +
+        "Stop it (Ctrl+C in its terminal, or close that window), then run `npx pennyrouter compare` again.");
+    }
+    if (error.code !== "ENOENT") throw error;
+  }
   // Preserve user state while replacing the shipped code on every CLI upgrade.
   for (const entry of await readdir(destination)) {
     if (entry === ".env" || entry === "reports") continue;
+    if (entry.startsWith(REPLACED_PREFIX)) {
+      // Dependencies moved aside above, or by an earlier install whose copy was still running.
+      await rm(join(destination, entry), { recursive: true, force: true }).catch(() => {});
+      continue;
+    }
     await rm(join(destination, entry), { recursive: true, force: true });
   }
   for (const entry of await readdir(source)) {

package/src/launch.test.js

@@ -16,6 +16,7 @@ import {
   createCodexDesktopHome,
   configurePennyHarness,
   fileMode,
+  installPennyCompare,
   installPennyRuntime,
   isClaudeDesktopRunning,
   isCodexDesktopRunning,
@@ -106,7 +107,7 @@ async function main() {
     assert.equal(second.changed, false);
     assert.equal(await fileMode(pennyShimPath()), 0o755);
     assert.ok(fs.existsSync(path.join(pennyRuntimeDir(), "bin", "penny.js")));
-    for (const asset of ["terminal-unicode.js", "artifacts.mjs", "artifact-preview.html",
+    for (const asset of ["terminal-unicode.js", "artifacts.mjs", "artifact-preview.html", "telemetry.mjs", "gallery-submit.mjs", "pane-options.mjs", "compare.html",
       "node_modules/@xterm/addon-unicode11/lib/addon-unicode11.js"]) {
       assert.ok(fs.existsSync(path.join(pennyCompareDir(), "web-demo", asset)), `compare installs ${asset}`);
     }
@@ -115,6 +116,20 @@ async function main() {
       fs.realpathSync(path.join(pennyCompareDir(), "penny-compare")),
     );
     assert.ok(!fs.existsSync(staleSkill), "runtime upgrade removes stale plugin files");
+    // A running copy that holds its dependencies open (as Windows does for node-pty's native
+    // module) stops a reinstall before anything is removed. A read-only folder blocks the same move.
+    const compareDemo = path.join(pennyCompareDir(), "web-demo");
+    fs.chmodSync(compareDemo, 0o555);
+    try {
+      await assert.rejects(installPennyCompare(), /still running/);
+      assert.ok(fs.existsSync(path.join(compareDemo, "server.mjs")), "a blocked reinstall leaves the install intact");
+    } finally {
+      fs.chmodSync(compareDemo, 0o755);
+    }
+    await installPennyCompare();
+    assert.ok(fs.existsSync(path.join(compareDemo, "node_modules", "node-pty")), "reinstall restores dependencies");
+    assert.deepEqual(fs.readdirSync(pennyCompareDir()).filter((entry) => entry.startsWith(".replaced-")), [],
+      "moved-aside dependencies are removed once nothing holds them");
     const rc = fs.readFileSync(path.join(home, ".zshrc"), "utf8");
     assert.equal((rc.match(/>>> pennyrouter PATH >>>/g) || []).length, 1);
 

package/standalone/govcloud-rates.json

@@ -0,0 +1,106 @@
+{
+ "note": "GovCloud per-token rates, maintained by hand. Models listed here override rates.json under the govcloud pricing profile; other models keep their standard rate.",
+ "order": [
+  "input",
+  "cache_read",
+  "cache_write_5m",
+  "cache_write_1h",
+  "output"
+ ],
+ "unit": "usd_per_token",
+ "models": {
+  "claude-opus-5": {
+   "rates": [
+    5.5e-06,
+    5.5e-07,
+    6.875e-06,
+    1.1e-05,
+    2.75e-05
+   ]
+  },
+  "claude-opus-4-8": {
+   "rates": [
+    5.5e-06,
+    5.5e-07,
+    6.875e-06,
+    1.1e-05,
+    2.75e-05
+   ]
+  },
+  "claude-sonnet-5": {
+   "rates": [
+    2.2e-06,
+    2.2e-07,
+    2.75e-06,
+    4.4e-06,
+    1.1e-05
+   ]
+  },
+  "claude-haiku-4-5": {
+   "rates": [
+    1.1e-06,
+    1.1e-07,
+    1.375e-06,
+    2.2e-06,
+    5.5e-06
+   ]
+  },
+  "gpt-5.6-luna": {
+   "rates": [
+    2.2e-07,
+    2.2e-08,
+    2.75e-07,
+    2.75e-07,
+    1.32e-06
+   ],
+   "above": {
+    "threshold": 272000,
+    "rates": [
+     4.4e-07,
+     4.4e-08,
+     5.5e-07,
+     5.5e-07,
+     1.98e-06
+    ]
+   }
+  },
+  "gpt-5.6-terra": {
+   "rates": [
+    2.2e-06,
+    2.2e-07,
+    2.75e-06,
+    2.75e-06,
+    1.32e-05
+   ],
+   "above": {
+    "threshold": 272000,
+    "rates": [
+     4.4e-06,
+     4.4e-07,
+     5.5e-06,
+     5.5e-06,
+     1.98e-05
+    ]
+   }
+  },
+  "gpt-5.6-sol": {
+   "rates": [
+    4.4e-06,
+    4.4e-07,
+    5.5e-06,
+    5.5e-06,
+    2.2e-05
+   ],
+   "above": {
+    "threshold": 272000,
+    "rates": [
+     8.8e-06,
+     8.8e-07,
+     1.1e-05,
+     1.1e-05,
+     3.3e-05
+    ]
+   }
+  }
+ }
+}

package/standalone/pricing.py

@@ -11,11 +11,13 @@ import json
 from pathlib import Path
 
 
-def _load_standard_rates():
-    """Standard per-token rates from rates.json (scripts/generate_compare_rates.py), the same
-    file the web-demo meters read. Returns (flat rates, tiered rates) keyed by model id; a tier
-    entry is (inclusive threshold, <= threshold rates, > threshold rates)."""
-    document = json.loads((Path(__file__).with_name("rates.json")).read_text())
+def _load_rates(filename: str):
+    """Per-token rates from a JSON schedule beside this file. rates.json holds the standard
+    schedule (scripts/generate_compare_rates.py); govcloud-rates.json holds the hand-maintained
+    GovCloud overrides. The web-demo meters read the same files. Returns (flat rates, tiered
+    rates) keyed by model id; a tier entry is (inclusive threshold, <= threshold rates,
+    > threshold rates)."""
+    document = json.loads((Path(__file__).with_name(filename)).read_text())
     flat, tiered = {}, {}
     for name, model in document["models"].items():
         flat[name] = tuple(model["rates"])
@@ -27,35 +29,11 @@ def _load_standard_rates():
 
 # input, cache_read, write_5m, write_1h, output. OpenAI does not offer a 1-hour cache tier;
 # its write rate applies uniformly.
-RATES, STANDARD_TIERED_RATES = _load_standard_rates()
+RATES, STANDARD_TIERED_RATES = _load_rates("rates.json")
 
 # --native-proxy means the comparison is measuring the GovCloud route. Pricing remains the
 # same on both panes, but both use this schedule instead of the standard one.
-GOVCLOUD_RATES = {
-    "claude-opus-5":     (5.50e-06, 5.50e-07, 6.875e-06, 1.10e-05, 2.75e-05),
-    "claude-opus-4-8":   (5.50e-06, 5.50e-07, 6.875e-06, 1.10e-05, 2.75e-05),
-    "claude-sonnet-5":   (2.20e-06, 2.20e-07, 2.75e-06, 4.40e-06, 1.10e-05),
-    "claude-haiku-4-5":  (1.10e-06, 1.10e-07, 1.375e-06, 2.20e-06, 5.50e-06),
-}
-
-# The GovCloud schedule for the same tiered GPT models.
-GOVCLOUD_TIERED_RATES = {
-    "gpt-5.6-luna": (
-        272_000,
-        (0.22e-06, 0.022e-06, 0.275e-06, 0.275e-06, 1.32e-06),
-        (0.44e-06, 0.044e-06, 0.55e-06, 0.55e-06, 1.98e-06),
-    ),
-    "gpt-5.6-terra": (
-        272_000,
-        (2.20e-06, 0.22e-06, 2.75e-06, 2.75e-06, 13.20e-06),
-        (4.40e-06, 0.44e-06, 5.50e-06, 5.50e-06, 19.80e-06),
-    ),
-    "gpt-5.6-sol": (
-        272_000,
-        (4.40e-06, 0.44e-06, 5.50e-06, 5.50e-06, 22.00e-06),
-        (8.80e-06, 0.88e-06, 11.00e-06, 11.00e-06, 33.00e-06),
-    ),
-}
+GOVCLOUD_RATES, GOVCLOUD_TIERED_RATES = _load_rates("govcloud-rates.json")
 
 CONTEXT_WINDOWS = {
     "claude-opus-5": 200_000,

package/standalone/usage.py

@@ -214,6 +214,13 @@ class UsageReader:
                 return
             state.counted.add(mid)
 
+        # A reply the gateway answered itself carries an estimate of the whole context as fresh
+        # input, and nothing was billed for it. The gateway marks these replies with a
+        # `penny_local_` request id and a `msg_swallow_` message id.
+        if (str(obj.get("requestId") or "").startswith("penny_local_")
+                or str(mid or "").startswith("msg_swallow_")):
+            return
+
         read = int(usage.get("cache_read_input_tokens") or 0)
         write = int(usage.get("cache_creation_input_tokens") or 0)
         creation = usage.get("cache_creation") or {}

package/standalone/web-demo/README.md

@@ -15,16 +15,16 @@ To launch Claude Code in both panes immediately:
 npm start -- --claude
 ```
 
-To run the current Penny Compare measurement code in the panes:
+To run Penny Compare in the panes:
 
 ```sh
 npm start -- --compare
 ```
 
-This opens a setup screen with the same Claude/Codex pane choices, directories, labels, and shared model selection as the classic launcher. The default is native Claude on the left and Penny Claude on the right, using `<current directory>/native` and `<current directory>/penny`. On macOS/Linux, it uses the existing Python session reader, cost model, HUD, and delta calculation. On Windows, it reads Claude or Codex transcripts and prices calls in Node, with no Python or tmux requirement. Exit saves a JSON report under `apps/compare/reports` and shows the final summary. The selected harness commands must be on `PATH`.
+This opens a setup screen with the Claude/Codex pane choices, folders, labels, shared model, and environment (provider, proxy, pricing). The default is native Claude on the left and Penny Claude on the right, using `native` and `penny` folders under the directory `npm start` was run from; missing folders are created. Each pane's meter reads Claude or Codex transcripts and prices calls in Node on every platform, with no Python or tmux requirement. Claude panes also report background model calls (such as the auto-mode reviewer) to this server over local OpenTelemetry, which the meter adds as a "side" line. Exit saves a JSON report under `apps/compare/reports` and shows the final summary. The selected harness commands must be on `PATH`.
 
-Use `--harness=codex` to preselect Codex in the setup screen. The pane selectors can also mix Claude and Codex; the shared model control is available when both panes use the same harness family.
+A Penny Claude pane has an **Options** section under its picker, set separately for each side. **Cache TTL** chooses 5 minutes (the default) or 1 hour for the conversation cache by setting Claude Code's `FORCE_PROMPT_CACHING_5M` or `ENABLE_PROMPT_CACHING_1H` for that pane; the shared prefix is always 1 hour. The choice is shown in the pane header and saved in the report. Options are defined in `pane-options.mjs`.
 
-To exercise the Node measurement paths on macOS/Linux, use `npm start -- --compare-node --harness=claude` for Claude or `npm start -- --compare-node --harness=codex` for Codex. Claude is the default if you omit `--harness`.
+Use `--harness=codex` to preselect Codex in the setup screen. The pane selectors can also mix Claude and Codex; the shared model control is available when both panes use the same harness family. `--compare-node` is accepted as an older name for `--compare`.
 
 The demo requires Claude Code on `PATH` for that option. Closing or reloading the page ends both sessions. The local server listens only on `127.0.0.1`; it does not start a PennyRouter gateway.