@yhong91/cpac 0.1.48 → 0.1.49

package/README.md

@@ -281,7 +281,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），来自打包的 [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

@@ -23,7 +23,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 { lookupModelCost } from "./pricing.js";
+export { compactModelPrices, ensureModelPrices, lookupModelCost, 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 async function status(config) {

package/dist/pricing.js

@@ -1,7 +1,8 @@
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
+import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { objectValue } from "./util.js";
+import { atomicWrite, objectValue } from "./util.js";
 const ZERO_COST = {
     input: 0,
     output: 0,
@@ -9,29 +10,29 @@ const ZERO_COST = {
     cacheWrite: 0,
 };
 const VARIANT_SUFFIX = /[-_\s]+(?:minimal|low|medium|high|xhigh|max|ultra|thinking|preview|build|fast|free)$/i;
+const REFRESH_MS = 24 * 60 * 60 * 1000;
+const FETCH_MS = 10_000;
+const MODELS_DEV_API = "https://models.dev/api.json";
+const MODELS_DEV_MODELS = "https://models.dev/models.json";
+const MODELS_DEV_PROXY_API = "https://models-proxy.vibetime.cc/api.json";
+const MODELS_DEV_PROXY_MODELS = "https://models-proxy.vibetime.cc/models.json";
 let table;
 function foldToken(value) {
     return value.toLowerCase().replace(/[^a-z0-9]/g, "");
 }
-function pricesPath() {
+function bundledPath() {
     return join(dirname(fileURLToPath(import.meta.url)), "data", "model-prices.json");
 }
-function loadTable() {
-    if (table)
-        return table;
-    table = new Map();
-    const path = pricesPath();
-    if (!existsSync(path))
-        return table;
-    let raw;
-    try {
-        raw = JSON.parse(readFileSync(path, "utf8"));
-    }
-    catch {
-        return table;
-    }
+function cachePath() {
+    const override = process.env.CPAC_PRICES_CACHE?.trim();
+    if (override)
+        return override;
+    return join(homedir(), ".cpac", "model-prices.json");
+}
+function parseTable(raw) {
+    const next = new Map();
     if (!objectValue(raw))
-        return table;
+        return next;
     for (const [key, value] of Object.entries(raw)) {
         if (!Array.isArray(value) || value.length < 4)
             continue;
@@ -42,8 +43,186 @@ function loadTable() {
         if (![input, output, cacheRead, cacheWrite].every((n) => Number.isFinite(n) && n >= 0)) {
             continue;
         }
-        table.set(key, { input, output, cacheRead, cacheWrite });
+        next.set(key, { input, output, cacheRead, cacheWrite });
+    }
+    return next;
+}
+function readTableFile(path) {
+    if (!existsSync(path))
+        return undefined;
+    try {
+        return parseTable(JSON.parse(readFileSync(path, "utf8")));
+    }
+    catch {
+        return undefined;
+    }
+}
+function loadBundled() {
+    return readTableFile(bundledPath()) ?? new Map();
+}
+function tokens(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return [];
+    const lower = trimmed.toLowerCase();
+    const slash = lower.lastIndexOf("/");
+    const tail = slash === -1 ? lower : lower.slice(slash + 1);
+    const hyphenated = tail.replace(/\s+/g, "-");
+    const dotted = hyphenated.replace(/(\d+)-(\d+)/g, "$1.$2");
+    const dashed = hyphenated.replace(/(\d+)\.(\d+)/g, "$1-$2");
+    const out = [];
+    for (const t of [lower, tail, hyphenated, dotted, dashed, foldToken(tail)]) {
+        if (t && !out.includes(t))
+            out.push(t);
+    }
+    return out;
+}
+function toCost(cost) {
+    if (!objectValue(cost))
+        return undefined;
+    const input = Number(cost.input);
+    const output = Number(cost.output);
+    if (!Number.isFinite(input) || !Number.isFinite(output))
+        return undefined;
+    if (input < 0 || output < 0 || (input === 0 && output === 0))
+        return undefined;
+    const cacheRead = Number.isFinite(Number(cost.cache_read))
+        ? Number(cost.cache_read)
+        : input;
+    const cacheWrite = Number.isFinite(Number(cost.cache_write))
+        ? Number(cost.cache_write)
+        : cacheRead;
+    return [input, output, cacheRead, cacheWrite];
+}
+function officialFor(lab, modelId) {
+    return foldToken(modelId.split("/").pop() ?? "").startsWith("glm") ? "zai" : lab;
+}
+function pick(index, modelId, lab) {
+    const official = lab ? officialFor(lab, modelId) : undefined;
+    const cands = tokens(modelId);
+    if (official) {
+        for (const cand of cands) {
+            for (const [p, c] of index.get(cand) ?? []) {
+                if (p === official)
+                    return c;
+            }
+        }
+    }
+    for (const cand of cands) {
+        for (const [p, c] of index.get(cand) ?? []) {
+            if (p === "openrouter")
+                return c;
+        }
+    }
+    return undefined;
+}
+export function compactModelPrices(api, models) {
+    const index = new Map();
+    if (objectValue(api)) {
+        for (const [pid, prov] of Object.entries(api)) {
+            if (!objectValue(prov) || !objectValue(prov.models))
+                continue;
+            const p = pid.toLowerCase();
+            for (const [mid, model] of Object.entries(prov.models)) {
+                const c = objectValue(model) ? toCost(model.cost) : undefined;
+                if (!c)
+                    continue;
+                for (const tok of tokens(mid)) {
+                    const bucket = index.get(tok);
+                    if (bucket)
+                        bucket.push([p, c]);
+                    else
+                        index.set(tok, [[p, c]]);
+                }
+            }
+        }
+    }
+    const tableJson = {};
+    if (objectValue(models)) {
+        for (const key of Object.keys(models)) {
+            if (!key.includes("/"))
+                continue;
+            const lab = key.slice(0, key.indexOf("/")).toLowerCase();
+            const tail = key.slice(key.indexOf("/") + 1);
+            const cost = pick(index, key, lab);
+            const f = foldToken(tail);
+            if (cost && f && tableJson[f] === undefined)
+                tableJson[f] = cost;
+        }
+    }
+    for (const [tok, bucket] of index) {
+        const f = foldToken(tok.includes("/") ? tok.slice(tok.lastIndexOf("/") + 1) : tok);
+        if (!f || tableJson[f] !== undefined)
+            continue;
+        tableJson[f] = bucket.find(([p]) => p === "openrouter")?.[1] ?? bucket[0][1];
+    }
+    return Object.fromEntries(Object.entries(tableJson).sort(([a], [b]) => a.localeCompare(b)));
+}
+async function fetchJson(url) {
+    const response = await fetch(url, {
+        headers: { accept: "application/json" },
+        signal: AbortSignal.timeout(FETCH_MS),
+    });
+    if (!response.ok)
+        throw new Error(`HTTP ${response.status}`);
+    return response.json();
+}
+export async function fetchModelPriceTable() {
+    let api;
+    let models;
+    try {
+        [api, models] = await Promise.all([
+            fetchJson(MODELS_DEV_API),
+            fetchJson(MODELS_DEV_MODELS),
+        ]);
+    }
+    catch {
+        [api, models] = await Promise.all([
+            fetchJson(MODELS_DEV_PROXY_API),
+            fetchJson(MODELS_DEV_PROXY_MODELS),
+        ]);
+    }
+    return compactModelPrices(api, models);
+}
+function cacheIsFresh(path) {
+    try {
+        return Date.now() - statSync(path).mtimeMs < REFRESH_MS;
+    }
+    catch {
+        return false;
+    }
+}
+function applyTable(next) {
+    table = next;
+}
+function writeCache(path, prices) {
+    mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
+    atomicWrite(path, Buffer.from(`${JSON.stringify(prices)}\n`), 0o600);
+}
+/** Refresh from models.dev when the local cache is older than 24h; fall back to bundled snapshot. */
+export async function ensureModelPrices() {
+    const cache = cachePath();
+    if (cacheIsFresh(cache)) {
+        applyTable(readTableFile(cache) ?? loadBundled());
+        return;
+    }
+    try {
+        const prices = await fetchModelPriceTable();
+        if (Object.keys(prices).length > 0) {
+            writeCache(cache, prices);
+            applyTable(parseTable(prices));
+            return;
+        }
     }
+    catch {
+        // Keep cache or bundled snapshot.
+    }
+    applyTable(readTableFile(cache) ?? loadBundled());
+}
+function loadTable() {
+    if (table)
+        return table;
+    table = loadBundled();
     return table;
 }
 function lookupKeys(slug) {
@@ -55,7 +234,7 @@ function lookupKeys(slug) {
         keys.push(stripped);
     return keys;
 }
-/** USD per million tokens from the bundled models.dev snapshot; zeros if unknown. */
+/** USD per million tokens; zeros if unknown. */
 export function lookupModelCost(slug) {
     const prices = loadTable();
     for (const key of lookupKeys(slug)) {
@@ -65,3 +244,6 @@ export function lookupModelCost(slug) {
     }
     return ZERO_COST;
 }
+export function resetModelPrices() {
+    table = undefined;
+}

package/dist/targets/pi.js

@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, readFileSync, statSync, unlinkSync } from "node:
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { catalogModelId, catalogModelRows, dropAgent, fetchCatalog, recordWrittenConfig, restoreOwnedConfig, } from "../config.js";
-import { lookupModelCost } from "../pricing.js";
+import { ensureModelPrices, lookupModelCost } from "../pricing.js";
 import { ensureLoopbackProxy, stopProxyProcess } from "../proxy.js";
 import { CPACError, atomicWrite, ensureCpacBackup, expandUserPath, objectValue, resolveApiKey, } from "../util.js";
 export const PI_PROVIDER_ID = "cpac";
@@ -234,6 +234,7 @@ export async function installPiConfig(config) {
     const rows = catalogModelRows(document) ?? [];
     if (rows.length === 0)
         throw new CPACError("CPA catalog contains no models");
+    await ensureModelPrices();
     const { proxy, fingerprint, started } = await ensureLoopbackProxy(config, apiKey);
     const provider = buildCpacProvider(proxy.port, rows);
     const target = piModelsPath();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.1.48",
+  "version": "0.1.49",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {
@@ -33,7 +33,7 @@
     "test": "npm run clean && tsc -p tsconfig.test.json && npm run copy-data && node --test --test-reporter=spec dist-test/cpac.test.js",
     "pack:check": "npm pack --dry-run",
     "copy-data": "node -e \"const fs=require('fs');const path=require('path');for (const d of ['dist/data','dist-test/src/data']) {fs.mkdirSync(d,{recursive:true});fs.copyFileSync('src/data/model-prices.json', path.join(d,'model-prices.json'))}\"",
-    "refresh-prices": "node scripts/refresh-model-prices.mjs"
+    "refresh-prices": "npm run build && node scripts/refresh-model-prices.mjs"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",