@yhong91/cpac 0.2.10 → 0.2.11

package/README.md

@@ -299,7 +299,7 @@ cpac install pi
 cpac pi
 ```
 
-它在 `~/.pi/agent/models.json` 的 `providers.cpac` 写入 loopback `baseUrl`、占位 `apiKey`、`api: openai-responses`，以及 CPA catalog 的模型列表。每个模型的 `cost` 是 USD / 百万 token（input / output / cacheRead / cacheWrite）。注入时若 `~/.cpac/model-prices.json` 超过 24 小时会从 [models.dev](https://models.dev) 刷新（官方价优先，否则 OpenRouter；失败则用打包快照）；未知模型为 0。不改当前默认模型；切换用 `/model`。密钥由 loopback 注入。旧的 `npm:@yhong91/cpac` package 和 `extensions/pi-cpac.ts` 会在 install / restore 时删掉。
+它在 `~/.pi/agent/models.json` 的 `providers.cpac` 写入 loopback `baseUrl`、占位 `apiKey`、`api: openai-responses`，以及 CPA catalog 的模型列表。每个模型的 `cost` 是 USD / 百万 token（input / output / cacheRead / cacheWrite）。注入时若 `~/.cpac/model-prices.json` 超过 24 小时会从 [models.dev](https://models.dev) 刷新：拉到的价格与缓存对比，有差异才更新，这次没拉到的条目保留（官方价优先，否则 OpenRouter；拉取失败则用已有缓存或打包快照）；未知模型为 0。不改当前默认模型；切换用 `/model`。密钥由 loopback 注入。旧的 `npm:@yhong91/cpac` package 和 `extensions/pi-cpac.ts` 会在 install / restore 时删掉。
 
 卸载：`cpac restore pi` 或 `cpac pi clear`。尊重 `PI_CODING_AGENT_DIR`。
 

package/dist/cpac.js

@@ -26,7 +26,7 @@ export { detectClientVersion, detectTargets, runInstall, runRestore, runSync, ru
 export { installGrokConfig, isGrokConfigInstalled, uninstallGrokConfig, } from "./targets/grok.js";
 export { installKimiConfig, isKimiConfigInstalled, uninstallKimiConfig, } from "./targets/kimi.js";
 export { installPiConfig, isPiConfigInstalled, uninstallPiConfig, PI_PROVIDER_ID, } from "./targets/pi.js";
-export { compactModelPrices, ensureModelPrices, lookupModelCost, resetModelPrices, } from "./pricing.js";
+export { compactModelPrices, ensureModelPrices, lookupModelCost, mergeModelPrices, resetModelPrices, } from "./pricing.js";
 export { installZedConfig, isZedConfigInstalled, uninstallZedConfig, ZED_PROVIDER_ID, } from "./targets/zed.js";
 export { installHermesConfig, isHermesConfigInstalled, uninstallHermesConfig, HERMES_PROVIDER_ID, } from "./targets/hermes.js";
 export { CODEBUDDY_API_KEY_PLACEHOLDER, codebuddyModelsPath, installCodebuddyConfig, isCodebuddyConfigInstalled, uninstallCodebuddyConfig, } from "./targets/codebuddy.js";

package/dist/pricing.js

@@ -29,6 +29,9 @@ function cachePath() {
         return override;
     return join(homedir(), ".cpac", "model-prices.json");
 }
+function overlayPath() {
+    return `${cachePath()}.overlay`;
+}
 function parseTable(raw) {
     const next = new Map();
     if (!objectValue(raw))
@@ -192,13 +195,53 @@ function cacheIsFresh(path) {
         return false;
     }
 }
+function applyOverlay(base) {
+    const extra = readTableFile(overlayPath());
+    if (!extra)
+        return base;
+    for (const [key, cost] of extra)
+        base.set(key, cost);
+    return base;
+}
 function applyTable(next) {
-    table = next;
+    table = applyOverlay(next);
 }
 function writeCache(path, prices) {
     mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
     atomicWrite(path, Buffer.from(`${JSON.stringify(prices)}\n`), 0o600);
 }
+function readPriceJson(path) {
+    if (!existsSync(path))
+        return undefined;
+    try {
+        return JSON.parse(readFileSync(path, "utf8"));
+    }
+    catch {
+        return undefined;
+    }
+}
+function costTuple(cost) {
+    return [cost.input, cost.output, cost.cacheRead, cost.cacheWrite];
+}
+/** Keep prices the fetch did not return. Update a key only when the fetched tuple differs. */
+export function mergeModelPrices(existing, fetched) {
+    const table = {};
+    for (const [key, cost] of parseTable(existing))
+        table[key] = costTuple(cost);
+    for (const [key, cost] of parseTable(fetched)) {
+        const next = costTuple(cost);
+        const prev = table[key];
+        if (prev &&
+            prev[0] === next[0] &&
+            prev[1] === next[1] &&
+            prev[2] === next[2] &&
+            prev[3] === next[3]) {
+            continue;
+        }
+        table[key] = next;
+    }
+    return Object.fromEntries(Object.entries(table).sort(([a], [b]) => a.localeCompare(b)));
+}
 /** Refresh from models.dev when the local cache is older than 24h; fall back to bundled snapshot. */
 export async function ensureModelPrices() {
     const cache = cachePath();
@@ -207,8 +250,9 @@ export async function ensureModelPrices() {
         return;
     }
     try {
-        const prices = await fetchModelPriceTable();
-        if (Object.keys(prices).length > 0) {
+        const fetched = await fetchModelPriceTable();
+        if (Object.keys(fetched).length > 0) {
+            const prices = mergeModelPrices(readPriceJson(cache), fetched);
             writeCache(cache, prices);
             applyTable(parseTable(prices));
             return;
@@ -222,7 +266,7 @@ export async function ensureModelPrices() {
 function loadTable() {
     if (table)
         return table;
-    table = loadBundled();
+    table = applyOverlay(readTableFile(cachePath()) ?? loadBundled());
     return table;
 }
 function lookupKeys(slug) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {