sprag-cli 3.55.0 → 3.56.0

package/src/route-scan.js

@@ -25,7 +25,8 @@ import { collectSessionRecords } from './session-records.js';
 import {
   collectSubagentRuns, indexRuns, exactRunsForEpisode, fallbackRunsForEpisode,
 } from './subagent-records.js';
-import { estimateCost, modelRank, isRecognizedModelId, TIER_TARGET_RANK, tierForRank } from './cost.js';
+import { modelRank, isRecognizedModelId, TIER_TARGET_RANK, tierForRank } from './cost.js';
+import { sessionCost } from './claude-price.js';
 import { learnProfileMapping, resetModelAliasCache } from './model-alias.js';
 import { modelRuleBaseText } from './model-rules.js';
 
@@ -115,7 +116,8 @@ const CATEGORIES = [
     label: '탐색·조회 (파일/값 찾기)',
     labelEn: 'lookup (finding files/values)',
     agent: 'haiku-explore',
-    kw: [[/grep|검색|search|find/i, 2], [/찾아|어디|위치|목록|살펴/i, 1]],
+    kw: [[/grep|검색|search|find/i, 2], [/찾아|어디|위치|목록|살펴/i, 1],
+      [/정의(?:돼|되어)\s*있|어느\s*파일|어떤\s*파일에|\bwhich\s+file\b|\bwhere\s+(?:is|are)\b[^?\n]*\bdefined\b/i, 1]],
   },
   {
     id: 'read',
@@ -333,9 +335,13 @@ export function worthDelegating(tier, rank) {
  * Approximation, deliberately stated as one: it holds token counts constant,
  * which a cheaper model would not reproduce exactly. Directionally right and
  * enough to rank rules by value, so it is rendered as "~$X".
+ *
+ * Signed: a run that moved to a pricier model is a loss and comes back
+ * negative. null means a side has no price (a gateway session whose /model/info
+ * table lacks the model), which is unpriced, not zero.
  */
 export function runSaving(run, mainModel) {
-  if (!run.model || !mainModel) return 0;
+  if (!run.model || !mainModel) return null;
   const totals = {
     input: run.input,
     cacheCreation: run.cacheCreation,
@@ -344,9 +350,10 @@ export function runSaving(run, mainModel) {
     ephemeral1h: run.ephemeral1h,
     output: run.out,
   };
-  const actual = estimateCost(totals, run.model).actual;
-  const counterfactual = estimateCost(totals, mainModel).actual;
-  return Math.max(0, counterfactual - actual);
+  const actual = sessionCost(totals, run.model);
+  const counterfactual = sessionCost(totals, mainModel);
+  if (!actual || !counterfactual) return null;
+  return counterfactual.actual - actual.actual;
 }
 
 const clamp = (v, [lo, hi]) => Math.min(hi, Math.max(lo, v));
@@ -549,7 +556,7 @@ export async function runRouteScan({ days = 14 } = {}) {
     d.runs += 1;
     if (isFailedRun(run)) d.errRuns += 1;
     d.outTokens += run.out || 0;
-    d.savedUsd += saved;
+    if (Number.isFinite(saved)) d.savedUsd += saved; // unpriced runs add nothing
     delegatedStats.set(key, d);
   };
   // Ledger events feed the statusline's weekly/monthly "Routing saved"
@@ -759,7 +766,8 @@ export async function runRouteScan({ days = 14 } = {}) {
       // profile-map.json's `modelAliases` to bring these runs back in.
       if (!baseline || !isRecognizedModelId(baseline)) continue;
       const usd = runSaving(e.run, baseline);
-      if (usd <= 0) continue;
+      // A loss is recorded too; only an unpriced run (null) has nothing to record.
+      if (!Number.isFinite(usd)) continue;
       priced.push({
         key: e.run.path,
         ts: e.run.endedAt ?? e.run.startedAt ?? Date.now(),

package/src/savings-ledger.js

@@ -29,6 +29,9 @@ import { userDataDir } from './paths.js';
 const WEEK_MS = 7 * 24 * 3600 * 1000;
 const MONTH_MS = 30 * 24 * 3600 * 1000;
 
+/** Stored USD is kept to 4 decimals so re-scans compare equal and files stay small. */
+export const roundUsd = (usd) => Math.round(Number(usd) * 10000) / 10000;
+
 export function ledgerPath() {
   return join(userDataDir(), 'delegation-ledger.json');
 }
@@ -55,8 +58,9 @@ export function loadLedger() {
  * Upsert saving events. `events` is an array of
  * { key, ts, usd, rule, from, to } where `key` is the run's transcript path
  * (unique per subagent run) and `from`/`to` name the models the routing
- * decision moved between. Zero-saving runs are skipped — they carry no
- * information the totals care about.
+ * decision moved between. `usd` is signed: a run on a pricier model is a loss
+ * and is recorded as a negative amount so it reduces the totals. Only
+ * non-finite amounts (unpriced runs) are skipped.
  */
 export function recordDelegationEvents(events) {
   if (!Array.isArray(events) || events.length === 0) return;
@@ -64,9 +68,9 @@ export function recordDelegationEvents(events) {
   data.version = LEDGER_VERSION;
   let changed = false;
   for (const e of events) {
-    if (!e || !e.key || !(Number(e.usd) > 0) || !Number.isFinite(e.ts)) continue;
+    if (!e || !e.key || typeof e.usd !== 'number' || !Number.isFinite(e.usd) || !Number.isFinite(e.ts)) continue;
     const prev = data.events[e.key];
-    const usd = Math.round(Number(e.usd) * 10000) / 10000;
+    const usd = roundUsd(e.usd);
     if (prev && prev.ts === e.ts && prev.usd === usd) continue;
     data.events[e.key] = {
       ts: e.ts,
@@ -115,8 +119,8 @@ export function delegationSavedTotals(now = Date.now()) {
   const byPair = new Map();
   try {
     for (const e of Object.values(loadLedger().events)) {
-      const usd = Number(e.usd) || 0;
-      if (usd <= 0) continue;
+      const usd = Number(e.usd);
+      if (!Number.isFinite(usd)) continue;
       totals.total += usd;
       if (Number.isFinite(e.ts)) {
         if (now - e.ts <= WEEK_MS) totals.week += usd;