sprag-cli 3.56.0 → 3.58.0

package/src/korean-lint.cjs

@@ -73,8 +73,21 @@ const METAPHOR_LEXICON = [
   // `자리` is the single most common substitution for a plain noun. Physical
   // seating is the rare literal use, so those modifiers are excluded and
   // everything else is raised for confirmation.
-  { re: /(?<!빈 |좌석 |앞 |뒤 |옆 )(?:^|(?<=\s))자리(?:에서|에서는|에|로|가|는|다|입니다|였습니다)?(?=\s|$|[.,·)])/, fix: "'지점'·'상황'·'부분'처럼 뜻을 그대로 담은 명사로 바꿉니다" },
-  { re: /[가-힣]+의\s*흐름/, fix: "'방향'·'순서'·'경과'로 바꿉니다" },
+  //
+  // `except` (2026-10-02): counting digits is the other literal use. `한 자리
+  // 밀리초`, `세 자리 수`, `소수점 둘째 자리`, `일의 자리` name a digit
+  // position, and no plainer noun exists for it. A count followed by a particle
+  // (`한 자리에서 돈다`) is still raised: that one means a place. Corpus check:
+  // 149 lines before, 147 after, and the two dropped were both `한 자리 밀리초`.
+  {
+    re: /(?<!빈 |좌석 |앞 |뒤 |옆 )(?:^|(?<=\s))자리(?:에서|에서는|에|로|가|는|다|입니다|였습니다)?(?=\s|$|[.,·)])/,
+    except: /(?:^|\s)(?:\d+|한|두|세|네|다섯|여섯|일곱|여덟|아홉|열|몇) 자리(?=\s|$)|(?:첫째|둘째|셋째|넷째|다섯째|[일십백천만]의) 자리|자리 ?(?:수|숫자)(?![가-힣]{2})/,
+    fix: "'지점'·'상황'·'부분'처럼 뜻을 그대로 담은 명사로 바꿉니다",
+  },
+  // The lookbehind pins the match to the start of a Hangul run. Without it the
+  // engine retried `[가-힣]+` from every character of a long run that has no
+  // `의 흐름` in it, which is quadratic: a 200k-character run took 20 seconds.
+  { re: /(?<![가-힣])[가-힣]+의\s*흐름/, fix: "'방향'·'순서'·'경과'로 바꿉니다" },
   { re: /닿(?:는다|습니다|아|는 지점)/, fix: "'겨냥하다'·'해당하다'처럼 동작을 그대로 서술합니다" },
   { re: /박(?:아 두|혀 있|아 넣)/, fix: "'명시하다'·'기록하다'로 바꿉니다" },
   { re: /걷어내/, fix: "'없애다'·'제거하다'로 바꿉니다" },
@@ -106,17 +119,24 @@ const METAPHOR_LEXICON = [
 const TRANSLATIONESE = [
   { re: /에 대한/, fix: '서술어로 풀어 씁니다' },
   { re: /[을를] 위한/, fix: '서술어로 풀어 씁니다' },
-  { re: /되어지/, fix: '이중 피동을 없애고 능동이나 단일 피동으로 씁니다' },
+  // Every conjugation, not the stem alone: `되어졌다`, `되어진`, `되어질`.
+  { re: /되어[지진질져졌집]/, fix: '이중 피동을 없애고 능동이나 단일 피동으로 씁니다' },
   { re: /하는 것을 통해/, fix: "'~해서'·'~함으로써'로 줄입니다" },
   { re: /라고 할 수 있다/, fix: '단정하거나 근거를 붙여 서술합니다' },
   // Conservative additions (2026-09-13), sourced from 국립국어원 공공언어
   // 지침·한글문화연대 교정 사례·쿠버네티스 한글화 가이드. Bar for inclusion:
   // the form is nearly always an improvement to change, so a confirm-request
   // on it is rarely noise. See presets/korean-style/supplement.md.
-  { re: /(?:보여|쓰여|불려|잊혀)[지집진질져]/, fix: "이중 피동입니다. '보인다'·'쓰인'·'불린'·'잊힌'처럼 단일 피동으로 씁니다" },
+  // `졌` is the past tense (`보여졌다`, `쓰여졌습니다`), which the first list missed.
+  { re: /(?:보여|쓰여|불려|잊혀)[지집진질져졌]/, fix: "이중 피동입니다. '보인다'·'쓰인'·'불린'·'잊힌'처럼 단일 피동으로 씁니다" },
   { re: /에 다름 아니/, fix: "일본어 번역투입니다. '~일 뿐이다'·'바로 ~이다'로 바꿉니다" },
   { re: /지 않으면 안 [되된됩돼]/, fix: "이중 부정 번역투입니다. '~해야 합니다'로 바꿉니다" },
-  { re: /(?<!여기|거기|저기|어디)에 있어서/, fix: "'~에서'·'~에는'으로 바꿉니다" },
+  // `X에 있어서` also means "because it is at X", which is plain Korean. Two
+  // signs separate that reading without touching the calque: a noun that names
+  // a location or a container before it, or the clause ending right after it
+  // (the calque is never clause-final). Corpus check: 4 hits before, 3 after,
+  // the dropped one a quotation ending in `베드락에 있어서`.
+  { re: /(?<!여기|거기|저기|어디|(?:^|\s)(?:안|밖|위|아래|옆|앞|뒤|속)|서버|폴더|디렉터리|디렉토리|경로|파일|목록|메모리|디스크|저장소|캐시|변수|로컬|원격)에 있어서(?!요|["'”’)\]]|[.!?]|$)/, fix: "'~에서'·'~에는'으로 바꿉니다" },
   { re: /(?:의미|특징|장점|단점|성격|가능성|중요성|효과)[을를] 가지고 있/, fix: "'~이다'·'~가 있다'로 바꿉니다 (have 직역)" },
 ];
 
@@ -201,6 +221,19 @@ function stripCode(text) {
   return out;
 }
 
+/**
+ * First match of `re` whose surroundings are not one of the literal uses in
+ * `except`. Every match is tried, so a literal use early in the line does not
+ * hide a figurative one after it.
+ */
+function firstUnexcepted(line, re, except) {
+  for (const m of line.matchAll(new RegExp(re.source, 'g'))) {
+    const around = line.slice(Math.max(0, m.index - 8), m.index + m[0].length + 4);
+    if (!except.test(around)) return m;
+  }
+  return null;
+}
+
 function hasKorean(s) {
   return /[가-힣]/.test(s);
 }
@@ -243,8 +276,8 @@ function lintKoreanText(text, { maxFindings = 20, code = false } = {}) {
       if (m) push('번역체', m[0], fix);
     }
 
-    for (const { re, fix } of METAPHOR_LEXICON) {
-      const m = line.match(re);
+    for (const { re, except, fix } of METAPHOR_LEXICON) {
+      const m = except ? firstUnexcepted(line, re, except) : line.match(re);
       if (m) push('비유 어휘', m[0], fix);
     }
 

package/src/litellm-budget.js

@@ -159,6 +159,12 @@ export function formatBudgetReport(state, now = new Date(), mode = 'icon') {
   return lines;
 }
 
+/** 갱신을 시도했다는 기록입니다. 같은 게이트웨이의 금액만 이어받습니다. */
+export function stampAttempt(state, base, now) {
+  const kept = state && state.base === base ? state : {};
+  return { ...kept, base, checkedAt: now };
+}
+
 /** 캐시가 오래됐으면 detached 자식으로 갱신을 예약합니다. 즉시 반환. */
 export function maybeSpawnBudgetCheck(env = process.env) {
   // 키 확보는 자식이 담당합니다. 렌더 경로에서 헬퍼를 돌리면 통계선이 느려집니다.
@@ -168,8 +174,11 @@ export function maybeSpawnBudgetCheck(env = process.env) {
   const age = Date.now() - (Number(s.checkedAt) || 0);
   if (s.base === base && age < CHECK_INTERVAL_MS) return false;
   // 오프라인/오류 시 렌더마다 자식을 다시 띄우지 않도록 시도 시각을 먼저 기록합니다.
+  // 게이트웨이가 바뀌었으면 이전 게이트웨이의 금액은 버립니다. 금액을 남긴 채
+  // base 만 새 주소로 바꾸면, budgetWindow 의 base 격리를 통과해 갱신이 끝날
+  // 때까지(오프라인이면 계속) 다른 프록시의 지출이 새 프록시의 게이지로 나옵니다.
   try {
-    writeBudgetState({ ...s, base, checkedAt: Date.now() });
+    writeBudgetState(stampAttempt(s, base, Date.now()));
   } catch (e) {
     debug('litellm-budget:stamp', e);
     return false;

package/src/model-rules.js

@@ -34,6 +34,7 @@ import { homedir } from 'node:os';
 import { userDataDir } from './paths.js';
 import { userLanguage } from './config.js';
 import { agentPhrase, agentPhraseEn } from './agents.js';
+import { writeStateFile } from './state-file.js';
 import { signedUsd } from './money.js';
 
 // Post-promotion delegated-category error rate above this flags the rule
@@ -72,9 +73,14 @@ export function wilsonLowerBound(errs, n) {
 // close the cycle.
 const DEFAULT_BUDGET = { T2: { calls: 8, out: 1500 }, T1: { calls: null, out: 8000 } };
 
+/** The budget a rule is held to: its calibrated one, or the default of its tier. */
+export function ruleBudget(rule) {
+  return rule.budget || DEFAULT_BUDGET[rule.tier] || DEFAULT_BUDGET.T2;
+}
+
 /** The cap half of a budget clause, e.g. "도구 호출 8회·출력 1500 토큰". */
 export function budgetCapPhrase(rule, lang = userLanguage()) {
-  const b = rule.budget || DEFAULT_BUDGET[rule.tier] || DEFAULT_BUDGET.T2;
+  const b = ruleBudget(rule);
   if (lang === 'ko') {
     return b.calls ? `도구 호출 ${b.calls}회·출력 ${b.out} 토큰` : `출력 ${b.out} 토큰`;
   }
@@ -125,15 +131,15 @@ function shortExample(text) {
   return one.length <= EXAMPLE_MAX ? one : `${one.slice(0, EXAMPLE_MAX - 1)}…`;
 }
 
-export function modelRuleBaseText(g, lang = userLanguage()) {
+export function modelRuleBaseText(g, lang = userLanguage(), { root } = {}) {
   if (lang === 'ko') {
     return g.tier === 'T2'
-      ? `"${g.label}" 단순 요청(예: "${shortExample(g.example)}")은 ${agentPhrase(g.agent)}에 위임`
+      ? `"${g.label}" 단순 요청(예: "${shortExample(g.example)}")은 ${agentPhrase(g.agent, { root })}에 위임`
       : `"${g.label}" 중간 난도 요청(예: "${shortExample(g.example)}")은 model: sonnet에 위임`;
   }
   const example = g.exampleEn || g.example;
   return g.tier === 'T2'
-    ? `Simple "${g.labelEn}" requests (e.g. "${shortExample(example)}") go to ${agentPhraseEn(g.agent)}`
+    ? `Simple "${g.labelEn}" requests (e.g. "${shortExample(example)}") go to ${agentPhraseEn(g.agent, { root })}`
     : `Moderate "${g.labelEn}" requests (e.g. "${shortExample(example)}") go to a model: sonnet subagent`;
 }
 
@@ -155,30 +161,30 @@ export function loadModelRules() {
 }
 
 /**
- * USD that measured delegations have saved, summed across registered rules.
- * Reads the file route-scan already wrote — the statusline refreshes every few
- * seconds and must never start a scan of its own (a scan parses tens of MB of
- * transcripts).
- *
- * Rules with no measured delegation contribute nothing, and an unreadable
- * registry returns 0 rather than throwing: the statusline reads 0 as "draw no
- * chip", which is the right outcome for anyone who never delegates.
+ * The one rule a delegated run in `projectDir` is credited to. A project rule
+ * for that project comes first, then a global rule promoted from it, then the
+ * first other global rule. Rule health (refreshModelRules) and the savings
+ * ledger (route-scan) both ask here, so a run is never credited to two rules
+ * and the two never disagree about whose it was.
  */
-export function delegationSavedUsd() {
-  try {
-    return loadModelRules().rules.reduce(
-      (sum, r) => sum + (r.delegatedRuns ? (Number(r.savedUsd) || 0) : 0),
-      0,
-    );
-  } catch {
-    return 0;
+export function ruleForProject(rules, tier, category, projectDir) {
+  let promotedHere = null;
+  let firstGlobal = null;
+  for (const r of rules || []) {
+    if (!r || r.status === 'off' || r.tier !== tier || r.category !== category) continue;
+    if (r.scope !== 'global') {
+      if (r.project === projectDir) return r;
+    } else if (r.project === projectDir) {
+      promotedHere = promotedHere || r;
+    } else {
+      firstGlobal = firstGlobal || r;
+    }
   }
+  return promotedHere || firstGlobal;
 }
 
 export function saveModelRules(data) {
-  const dir = stateDir();
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync(modelRulesPath(), JSON.stringify(data, null, 2) + '\n');
+  writeStateFile(modelRulesPath(), JSON.stringify(data, null, 2) + '\n');
 }
 
 /** Add (or re-activate) a promoted rule; returns the stored entry. */
@@ -210,8 +216,12 @@ export function removeModelRule(index1) {
  * The LLM reads this file as instructions, so it is written in the user's
  * configured language — a Korean-only file would pull an English session's
  * responses into Korean.
+ *
+ * `root` is where a named subagent is looked up: the project the file belongs
+ * to, or null for the global file, which may only name agents the user
+ * directory holds (see agentExists). Left out, it is the current directory.
  */
-export function renderModelRatchet(rules, lang = userLanguage()) {
+export function renderModelRatchet(rules, lang = userLanguage(), { root } = {}) {
   const ko = lang === 'ko';
   const lines = ko ? [
     '# Model-Fitting Ratchet (sprag 자동 관리)',
@@ -377,9 +387,23 @@ export function renderModelRatchet(rules, lang = userLanguage()) {
     if (!byCategory.has(r.category)) byCategory.set(r.category, []);
     byCategory.get(r.category).push(r);
   }
+  // The sentence comes from this version's template in the file's language. The
+  // text stored on the rule is whatever wording and language were current when
+  // it was promoted, which is how an English line sat in a Korean file. A rule
+  // missing what the template needs still falls back to its stored text.
+  const baseTextOf = (r) => ((r.tier === 'T2' || r.tier === 'T1') && r.label && (ko || r.labelEn)
+    ? modelRuleBaseText(r, lang, { root }) : r.rule);
   for (const group of byCategory.values()) {
     const t2 = group.find((r) => r.tier === 'T2');
     const t1 = group.find((r) => r.tier === 'T1');
+    // A second rule of a tier the line already covers (two global rules of one
+    // category, promoted from different projects) says nothing the line does
+    // not, so it adds no line of its own. Its review flag and its numbers stay
+    // visible on the line that speaks for it.
+    const extras = t2 || t1 ? group.filter((r) => r !== t2 && r !== t1 && (r.tier === 'T2' || r.tier === 'T1')) : [];
+    const unknown = group.filter((r) => r !== t2 && r !== t1 && !extras.includes(r));
+    const extraHealth = extras.map(healthOf).join('');
+    const extraStats = extras.map((r) => ` / +${r.tier} ${statsOf(r)}`).join('');
     if (t2 && t1) {
       // Seeded rules carry a localized example; scan-produced ones only have the
       // user's own prompt, so exampleEn is a preference, not a requirement.
@@ -390,19 +414,18 @@ export function renderModelRatchet(rules, lang = userLanguage()) {
       // clauses, so a rule the model re-reads on every request is short enough to
       // match at a glance.
       const rule = ko
-        ? `"${t2.label}": 기본 ${agentPhrase(t2.agent)}(예: "${ex(t2)}"), ` +
+        ? `"${t2.label}": 기본 ${agentPhrase(t2.agent, { root })}(예: "${ex(t2)}"), ` +
           `여러 단계·여러 파일이 얽히면 model: sonnet(예: "${ex(t1)}"). ` +
           mergedBudget(t2, t1)
-        : `"${t2.labelEn || t2.label}": ${agentPhraseEn(t2.agent)} by default (e.g. "${ex(t2)}"), ` +
+        : `"${t2.labelEn || t2.label}": ${agentPhraseEn(t2.agent, { root })} by default (e.g. "${ex(t2)}"), ` +
           `model: sonnet when it spans multiple steps or file edits (e.g. "${ex(t1)}"). ` +
           mergedBudget(t2, t1);
-      lines.push(`- ${rule}${healthOf(t2)}${healthOf(t1)} <!-- T2 ${statsOf(t2)} / T1 ${statsOf(t1)} -->`);
-      for (const r of group) {
-        if (r !== t2 && r !== t1) lines.push(`- ${composeRuleText(r.rule, r, lang)}${healthOf(r)} <!-- ${statsOf(r)} -->`);
-      }
-    } else {
-      for (const r of group) lines.push(`- ${composeRuleText(r.rule, r, lang)}${healthOf(r)} <!-- ${statsOf(r)} -->`);
+      lines.push(`- ${rule}${healthOf(t2)}${healthOf(t1)}${extraHealth} <!-- T2 ${statsOf(t2)} / T1 ${statsOf(t1)}${extraStats} -->`);
+    } else if (t2 || t1) {
+      const r = t2 || t1;
+      lines.push(`- ${composeRuleText(baseTextOf(r), r, lang)}${healthOf(r)}${extraHealth} <!-- ${statsOf(r)}${extraStats} -->`);
     }
+    for (const r of unknown) lines.push(`- ${composeRuleText(r.rule, r, lang)}${healthOf(r)} <!-- ${statsOf(r)} -->`);
   }
   return lines.join('\n') + '\n';
 }
@@ -467,7 +490,10 @@ export function syncAllFiles({ previousPaths = [] } = {}) {
   };
   const written = [];
   for (const [p, rules] of byPath) {
-    if (writeIfChanged(p, renderModelRatchet(rules))) written.push(p);
+    // Agents are looked up where the file's readers are: the project for a
+    // project file, the user directory alone for the global one.
+    const root = rules[0].scope === 'global' ? null : rules[0].targetRoot;
+    if (writeIfChanged(p, renderModelRatchet(rules, undefined, { root }))) written.push(p);
   }
   // A target that lost its last rule is emptied, NOT deleted: CLAUDE.md
   // imports this path, and a dangling `@` import is worse than an empty file.
@@ -497,19 +523,40 @@ export function refreshModelRules(episodeStats, delegatedStats = new Map(), { no
   let changed = false;
   const pick = (stats, r) => stats.get(`${r.tier}|${r.category}|${r.project}`)
     || (r.scope === 'global' ? stats.get(`${r.tier}|${r.category}|*`) : null);
+  // Delegated outcomes are money, so each project's runs go to exactly one
+  // rule. Handing every global rule the `*` aggregate counted the same runs
+  // once per global rule of that tier and category.
+  const owned = new Map();
+  for (const [key, d] of delegatedStats) {
+    const [tier, category, ...rest] = key.split('|');
+    const project = rest.join('|');
+    if (project === '*') continue;
+    const rule = ruleForProject(data.rules, tier, category, project);
+    if (!rule) continue;
+    const o = owned.get(rule) || { runs: 0, errRuns: 0, outTokens: 0, savedUsd: 0 };
+    o.runs += d.runs || 0;
+    o.errRuns += d.errRuns || 0;
+    o.outTokens += d.outTokens || 0;
+    o.savedUsd += d.savedUsd || 0;
+    owned.set(rule, o);
+  }
 
   for (const r of data.rules) {
     const s = pick(episodeStats, r);
-    const d = pick(delegatedStats, r);
+    const d = owned.get(r);
     if (!s && !d) {
       // A rule whose category didn't appear at all this window keeps its last
-      // known recurrence, but its measured-delegation fields must still read
-      // as "nothing measured" rather than stay undefined — the CLI and the
-      // rendered md both branch on them.
-      r.delegatedRuns = r.delegatedRuns ?? 0;
-      r.delegatedErrRate = r.delegatedErrRate ?? 0;
-      r.savedUsd = r.savedUsd ?? 0;
-      r.healthSource = r.healthSource ?? 'proxy';
+      // known recurrence. Everything else here describes the window, and this
+      // window holds nothing: the delegation figures go to zero and a review
+      // flag is lifted, as they are below when only one of the two is missing.
+      // Leaving them untouched froze the last window that had data, so a rule
+      // flagged once stayed flagged, with its old saving, after it stopped
+      // firing altogether.
+      const cleared = { delegatedRuns: 0, delegatedErrRate: 0, savedUsd: 0, healthSource: 'proxy' };
+      for (const [k, v] of Object.entries(cleared)) {
+        if (r[k] !== v) { r[k] = v; changed = true; }
+      }
+      if (r.status === 'review') { r.status = 'active'; changed = true; }
       continue;
     }
 

package/src/month-spend.js

@@ -9,7 +9,7 @@
  * 합계에서 빼고 unpriced 로 셉니다. 정가표로 대신 채우지 않습니다.
  */
 
-import { sessionCost } from './claude-price.js';
+import { sessionCost, pricedParts } from './claude-price.js';
 
 /** 이번 달 1일 00:00(로컬)의 epoch ms. */
 export function monthStartMs(now = new Date()) {
@@ -23,9 +23,9 @@ export function monthLabel(now = new Date()) {
 
 /**
  * 월초 이후 세션들의 지출 추정치 합계(USD).
- * endTime 이 월초 이후인 세션만 집계합니다. 세션이 월 경계에 걸치는
- * 경우는 세션 전체를 포함하는데, 경계 세션은 드물고 통계선 지표는
- * 추정치이므로 이 정도 오차는 허용합니다.
+ * endTime 이 월초 이후인 세션만 집계합니다. 월 경계에 걸친 세션은
+ * 호출하는 쪽이 parser.js 의 sessionsSince 로 월초 이후 요청만 남겨서
+ * 넘겨야 합니다. 그대로 넘기면 세션 전체가 이번 달 지출로 계산됩니다.
  *
  * @param {Array} sessions parseAllSessions 결과
  * @param {Date} [now]
@@ -39,14 +39,20 @@ export function monthSpend(sessions, now = new Date()) {
   for (const s of sessions || []) {
     if (!s || !s.endTime || s.endTime.getTime() < since) continue;
     if (!s.totals) continue;
-    try {
-      const c = sessionCost(s.totals, s.model);
-      if (!c) { unpriced += 1; continue; }
-      usd += c.actual;
-      count += 1;
-    } catch {
-      // 단가를 모르는 모델은 합계에서 빠집니다. 통계선에서는 침묵이 낫습니다.
+    // 세션이 띄운 서브에이전트 실행도 같은 청구서에 들어가므로, 실행마다 그 모델의
+    // 단가로 계산해 더합니다. 세션 수에는 넣지 않습니다.
+    let priced = false;
+    for (const part of pricedParts(s)) {
+      try {
+        const c = sessionCost(part.totals, part.model);
+        if (!c) { unpriced += 1; continue; }
+        usd += c.actual;
+        if (part.own) priced = true;
+      } catch {
+        // 단가를 모르는 모델은 합계에서 빠집니다. 통계선에서는 침묵이 낫습니다.
+      }
     }
+    if (priced) count += 1;
   }
   return { usd, sessions: count, unpriced, sinceMs: since, label: monthLabel(now) };
 }