sprag-cli 3.43.0 → 3.45.0

package/bin/cli.js

@@ -209,7 +209,7 @@ async function main() {
   //   sprag route-scan --hook          # SessionStart hook mode (context injection)
   //   sprag route-scan dismiss <N>     # mute candidate R<N>
   // Promote a candidate to a ratchet rule (scope is always explicit):
-  //   sprag harness promote R<N> --project|--global
+  //   sprag harness promote R<N> --global|--project
   // brief --hook — UserPromptSubmit hook mode: per-session, change-triggered
   // briefing of state the statusline can only chip (ctx tier crossings,
   // mid-session route/rule-health changes). Silent when nothing changed.
@@ -397,9 +397,10 @@ async function main() {
       process.exit(1);
     }
     const { formatReport } = await import('../src/formatters/statusline.js');
-    const isIcon = hasFlag('--icon')
-      ? true
-      : (hasFlag('--no-icon') || hasFlag('--text') ? false : cfg.icon);
+    // Same resolver as the real statusline path: a demo that renders emoji
+    // where the real line would not is worse than no demo at all.
+    const { resolveLabelMode } = await import('../src/statusline-mode.js');
+    const { mode: labelMode } = resolveLabelMode({ hasFlag, cfg });
     const isVerbose = hasFlag('--verbose')
       ? true
       : (hasFlag('--no-verbose') || hasFlag('--compact') ? false : cfg.verbose);
@@ -413,7 +414,7 @@ async function main() {
       color: colorOk,
       verbose: isVerbose,
       timer: showTimer,
-      mode: isIcon ? 'icon' : 'text',
+      mode: labelMode,
       segments,
       singleLine: hasFlag('--single-line'),
     });
@@ -480,9 +481,11 @@ async function main() {
       const { statuslineDefaults } = await import('../src/config.js');
       const cfg = statuslineDefaults();
       const colorOk = !hasFlag('--no-color') && !process.env.NO_COLOR && cfg.color;
-      const isIcon = hasFlag('--icon')
-        ? true
-        : (hasFlag('--no-icon') || hasFlag('--text') ? false : cfg.icon);
+      // Third caller of the same decision — the no-session line has to agree
+      // with the populated one, or IntelliJ users watch icons appear and
+      // disappear as the analysis window empties and fills.
+      const { resolveLabelMode } = await import('../src/statusline-mode.js');
+      const { mode: labelMode } = resolveLabelMode({ hasFlag, cfg });
       const stdinJson = readStdinJson();
       const caps = extractCaps(stdinJson);
       const model = extractModel(stdinJson);
@@ -494,7 +497,7 @@ async function main() {
       }
       console.log(formatNoSession(
         { caps, model, windowLabel, version: PKG_VERSION, update: readUpdateChip() },
-        { color: colorOk, mode: isIcon ? 'icon' : 'text' },
+        { color: colorOk, mode: labelMode },
       ));
       return;
     }
@@ -749,21 +752,11 @@ async function main() {
     const { statuslineDefaults } = await import('../src/config.js');
     const cfg = statuslineDefaults();
 
-    // IntelliJ's Claude Code plugin renders the statusline through a custom
-    // widget that fuses prior frames with the new one when emoji are present,
-    // producing garbage like "59:548" that no ANSI escape can clean up
-    // (verified: emitting the same output directly into JediTerm renders
-    // cleanly, so the bug is in the plugin's render path, not the terminal).
-    // Force text mode unconditionally inside IntelliJ — even past an explicit
-    // `--icon` flag, since wrappers commonly hardcode `--icon` and the user
-    // can't easily edit them; icon mode is just broken there.
-    const isIntelliJ = process.env.TERMINAL_EMULATOR === 'JetBrains-JediTerm';
-    // CLI flags take precedence; otherwise fall back to persisted config.
-    const isIcon = isIntelliJ
-      ? false
-      : (hasFlag('--icon')
-          ? true
-          : (hasFlag('--no-icon') || hasFlag('--text') ? false : cfg.icon));
+    // Icon vs text is decided in one module shared with the `--demo` path, so
+    // the two cannot drift apart again. It also owns the IntelliJ downgrade and
+    // the escape hatch out of it (SPRAG_ICON=force / `sprag mode icon-force`).
+    const { resolveLabelMode } = await import('../src/statusline-mode.js');
+    const { mode: labelMode } = resolveLabelMode({ hasFlag, cfg });
     const isVerbose = hasFlag('--verbose')
       ? true
       : (hasFlag('--no-verbose') || hasFlag('--compact') ? false : cfg.verbose);
@@ -779,7 +772,7 @@ async function main() {
       color: colorOk,
       verbose: isVerbose,
       timer: showTimer,
-      mode: isIcon ? 'icon' : 'text',
+      mode: labelMode,
       segments,
       // macOS builds of Claude Code have rendered only the first line of a
       // multi-line statusline in some versions (anthropics/claude-code#35176)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sprag-cli",
-  "version": "3.43.0",
+  "version": "3.45.0",
   "description": "Sprag - a quality ratchet harness for AI coding agents: model-fitting delegation, ratchet rules, doc2md, Korean style gate. Same tool as claude-token-saver, under its new name.",
   "type": "module",
   "bin": {

package/presets/model-rules.json

@@ -21,7 +21,10 @@
       "agent": "haiku-runner",
       "example": "npm test 돌려봐",
       "exampleEn": "run npm test",
-      "budget": { "calls": 8, "out": 1500 }
+      "budget": {
+        "calls": 8,
+        "out": 1500
+      }
     },
     {
       "id": "run-t1",
@@ -32,7 +35,10 @@
       "agent": "sonnet",
       "example": "빌드하고 실패한 테스트만 보여줘",
       "exampleEn": "build it and show only the failing tests",
-      "budget": { "calls": null, "out": 6000 }
+      "budget": {
+        "calls": null,
+        "out": 6000
+      }
     },
     {
       "id": "explore-t2",
@@ -43,7 +49,10 @@
       "agent": "haiku-explore",
       "example": "이 설정값 어느 파일에 있어?",
       "exampleEn": "which file holds this config value?",
-      "budget": { "calls": 8, "out": 1500 }
+      "budget": {
+        "calls": 8,
+        "out": 1500
+      }
     },
     {
       "id": "explore-t1",
@@ -54,7 +63,10 @@
       "agent": "sonnet",
       "example": "이 함수를 호출하는 곳 전부 찾아줘",
       "exampleEn": "find every caller of this function",
-      "budget": { "calls": null, "out": 6000 }
+      "budget": {
+        "calls": null,
+        "out": 6000
+      }
     },
     {
       "id": "check-t2",
@@ -65,7 +77,10 @@
       "agent": "haiku-explore",
       "example": "지금 배포된 버전이 뭔지 확인해줘",
       "exampleEn": "check which version is deployed right now",
-      "budget": { "calls": 8, "out": 1500 }
+      "budget": {
+        "calls": 8,
+        "out": 1500
+      }
     },
     {
       "id": "check-t1",
@@ -76,7 +91,10 @@
       "agent": "sonnet",
       "example": "마이그레이션이 실제로 적용됐는지 확인해줘",
       "exampleEn": "verify the migration actually applied",
-      "budget": { "calls": null, "out": 6000 }
+      "budget": {
+        "calls": null,
+        "out": 6000
+      }
     },
     {
       "id": "paste-t2",
@@ -87,7 +105,10 @@
       "agent": "haiku-explore",
       "example": "이 에러 로그는 무슨 뜻이야?",
       "exampleEn": "what does this error log mean?",
-      "budget": { "calls": 8, "out": 1500 }
+      "budget": {
+        "calls": 8,
+        "out": 1500
+      }
     },
     {
       "id": "paste-t1",
@@ -98,7 +119,10 @@
       "agent": "sonnet",
       "example": "이 스택트레이스에서 어느 모듈이 죽은 건지 짚어줘",
       "exampleEn": "point out which module failed in this stack trace",
-      "budget": { "calls": null, "out": 8000 }
+      "budget": {
+        "calls": null,
+        "out": 8000
+      }
     },
     {
       "id": "read-t2",
@@ -109,7 +133,24 @@
       "agent": "haiku-explore",
       "example": "이 README 요약해줘",
       "exampleEn": "summarize this README",
-      "budget": { "calls": 8, "out": 1900 }
+      "budget": {
+        "calls": 8,
+        "out": 1900
+      }
+    },
+    {
+      "id": "read-t1",
+      "tier": "T1",
+      "category": "read",
+      "label": "읽기·요약·설명",
+      "labelEn": "reading / summarizing / explaining",
+      "agent": "sonnet",
+      "example": "이 함수가 하는 일을 단계별로 정리해줘",
+      "exampleEn": "walk through what this function does, step by step",
+      "budget": {
+        "calls": null,
+        "out": 8000
+      }
     }
   ]
 }

package/presets/ratchet-rules.json

@@ -15,8 +15,8 @@
       "en": "When a web fetch/search is blocked by robots or user-agent checks ('unable to fetch' and similar) → retry with curl carrying a browser UA header (Mozilla/5.0 ... Chrome/...). Sites like reddit also answer on their .json endpoints with that UA"
     },
     {
-      "ko": "ratchet 룰 promote 호출 직전 사용자에게 scope(project/global)를 먼저 묻는다 — Bash 환경은 non-TTY라 CLI readline 프롬프트가 안 뜨므로, 호출자(LLM)가 대신 묻고 --project/--global 플래그를 명시해 실행",
-      "en": "Ask the user for the scope (project or global) before calling ratchet promote — the Bash environment is non-TTY, so the CLI's readline prompt never appears; the caller (the model) has to ask and pass --project/--global explicitly"
+      "ko": "ratchet 룰 promote 호출 직전 사용자에게 scope(global/project)를 먼저 묻는다 — Bash 환경은 non-TTY라 CLI readline 프롬프트가 안 뜨므로, 호출자(LLM)가 대신 묻고 --global/--project 플래그를 명시해 실행",
+      "en": "Ask the user for the scope (global or project) before calling ratchet promote — the Bash environment is non-TTY, so the CLI's readline prompt never appears; the caller (the model) has to ask and pass --global/--project explicitly"
     },
     {
       "ko": "자동화 도구가 grep·정규식으로 찾는 마커 텍스트(헤더·앵커·키워드 라인)는 리팩터링·압축·수정 금지 — 정확 매칭 검출은 한 글자만 바뀌어도 깨짐",

package/src/brief.js

@@ -226,7 +226,7 @@ export async function runBrief({ sessionId, transcriptPath, now = Date.now() })
     }
     for (const [kind, x] of fresh) {
       items.push(kind === 'route'
-        ? `새 위임 후보가 감지되었습니다 — "${x.label}" 유형 ${x.count}회 반복(statusline의 route? R${x.id} 칩). 등록: sprag harness promote R${x.id} --project|--global (적용 범위는 사용자에게 확인) / 무시: route-scan dismiss ${x.id}`
+        ? `새 위임 후보가 감지되었습니다 — "${x.label}" 유형 ${x.count}회 반복(statusline의 route? R${x.id} 칩). 등록: sprag harness promote R${x.id} --global|--project (적용 범위는 사용자에게 확인) / 무시: route-scan dismiss ${x.id}`
         : `승인된 위임 룰의 최근 에러율이 기준(20%)을 넘었습니다 — "${x.label}" (${x.healthSource === 'delegated' ? `위임 실행 ${x.delegatedRuns}건 중 에러율 ${Math.round((x.delegatedErrRate || 0) * 100)}%` : `유사 에피소드 기준 에러율 ${Math.round((x.errRate || 0) * 100)}%`}, statusline의 rule-health 칩). 조건 좁히기/제거를 사용자와 상의하세요: sprag route-scan rules`);
     }
     s.briefed = [...briefed];

package/src/commands/brief.js

@@ -7,7 +7,7 @@
  *   sprag route-scan --hook          # SessionStart hook mode (context injection)
  *   sprag route-scan dismiss <N>     # mute candidate R<N>
  * Promote a candidate to a ratchet rule (scope is always explicit):
- *   sprag harness promote R<N> --project|--global
+ *   sprag harness promote R<N> --global|--project
  * brief --hook — UserPromptSubmit hook mode: per-session, change-triggered
  * briefing of state the statusline can only chip (ctx tier crossings,
  * mid-session route/rule-health changes). Silent when nothing changed.
@@ -22,10 +22,22 @@ export async function run({ hasFlag }) {
       process.exit(1);
     }
     const ctx = readStdinJson() || {};
+    const parts = [];
     try {
       const { runBrief } = await import('../brief.js');
       const out = await runBrief({ sessionId: ctx.session_id, transcriptPath: ctx.transcript_path });
-      if (out) console.log(out);
+      if (out) parts.push(out);
     } catch (e) { debug('brief:hook', e); /* briefing is best-effort — never block a prompt */ }
+    // State the matching delegation rule as a fact about this request. Registered
+    // rules were going unused because applying one meant scanning a list and
+    // resolving it against a general "don't spawn subagents" instruction; naming
+    // the match here removes both steps. Silent unless it is sure — see
+    // src/route-inject.js.
+    try {
+      const { routeHint } = await import('../route-inject.js');
+      const hint = routeHint(ctx.prompt);
+      if (hint) parts.push(hint);
+    } catch (e) { debug('brief:route-hint', e); }
+    if (parts.length) console.log(parts.join('\n'));
     return;
 }

package/src/commands/mode.js

@@ -10,12 +10,28 @@
 export async function run({ args }) {
     const { applyMode, loadConfig, configPath, statuslineDefaults, userLanguage, VALID_KEYWORDS } =
       await import('../config.js');
+    const { resolveLabelMode, isJetBrainsTerminal } = await import('../statusline-mode.js');
     const words = args.slice(1);
     if (words.length === 0) {
       const eff = statuslineDefaults();
       const raw = loadConfig();
       console.log('Statusline (effective):');
-      console.log(`  icon:    ${eff.icon}`);
+      console.log(`  labels:  ${eff.labels}`);
+      // What renders can differ from the stored preference: inside IntelliJ the
+      // emoji set steps down to narrow glyphs, because the IDE font lacks the
+      // emoji and the fallback breaks the cell grid. Saying so here is the
+      // difference between a two-second answer and a hunt through the source for
+      // why `--icon` appeared to do nothing.
+      const { mode: labelMode, reason } = resolveLabelMode({ cfg: eff });
+      if (labelMode !== eff.labels) {
+        const why = reason === 'intellij-narrow'
+          ? ' (IntelliJ: emoji garble in the IDE font. `sprag mode icon-force` keeps them anyway)'
+          : reason === 'intellij-forced'
+            ? ' (icon-force)'
+            : '';
+        console.log(`  renders: ${labelMode}${why}`);
+      }
+      console.log(`  icon-force: ${eff.iconForce}`);
       console.log(`  verbose: ${eff.verbose}`);
       console.log(`  timer:   ${eff.timer}`);
       console.log(`  color:   ${eff.color}`);
@@ -40,7 +56,11 @@ export async function run({ args }) {
     }
     const eff = statuslineDefaults();
     console.log(`Updated: ${applied.join(', ')}`);
-    console.log(`Now: icon=${eff.icon} verbose=${eff.verbose} timer=${eff.timer} color=${eff.color} window=${eff.windowLabel} language=${userLanguage()}`);
+    console.log(`Now: labels=${eff.labels} icon-force=${eff.iconForce} verbose=${eff.verbose} timer=${eff.timer} color=${eff.color} window=${eff.windowLabel} language=${userLanguage()}`);
+    const { mode: renders } = resolveLabelMode({ cfg: eff });
+    if (renders !== eff.labels) {
+      console.log(`Renders as: ${renders}${isJetBrainsTerminal() ? ' (IntelliJ detected)' : ''}`);
+    }
     console.log('Statusline picks up the change on the next refresh (~1s).');
     return;
 }

package/src/commands/route-scan.js

@@ -356,11 +356,11 @@ export async function run({ args, hasFlag, numArg }) {
         }
         if (lang === 'ko') {
           lines.push('등록하면 다음 세션부터 자동 위임됩니다. 사용자에게 등록 여부를 물을 때 위 룰 원문을 그대로 보여주고, 적용 범위까지 확인한 뒤 실행하세요:');
-          lines.push('  sprag harness promote R<N> --project|--global   # 적용 범위는 반드시 사용자에게 확인');
+          lines.push('  sprag harness promote R<N> --global|--project   # 적용 범위는 반드시 사용자에게 확인');
           lines.push('  sprag route-scan dismiss <N>                    # 사용자가 원치 않으면');
         } else {
           lines.push('Once registered, delegation happens automatically from the next session. Show the user the rule text verbatim, confirm the scope with them, then run:');
-          lines.push('  sprag harness promote R<N> --project|--global   # ALWAYS confirm the scope with the user first');
+          lines.push('  sprag harness promote R<N> --global|--project   # ALWAYS confirm the scope with the user first');
           lines.push('  sprag route-scan dismiss <N>                    # if they do not want it');
         }
       }
@@ -446,7 +446,7 @@ export async function run({ args, hasFlag, numArg }) {
     }
     console.log('');
     console.log(lang === 'ko' ? '등록 / 무시:' : 'Promote / dismiss:');
-    console.log('  sprag harness promote R<N> --project|--global');
+    console.log('  sprag harness promote R<N> --global|--project');
     console.log('  sprag route-scan dismiss <N>');
     // 최초 1회만 — 매번 찍으면 도구가 광고판이 된다 (CTS_NO_NOTE=1 로 끔)
     (await import('../first-run-note.js')).printOnce('route-scan', lang);

package/src/commands/upgrade.js

@@ -25,7 +25,8 @@ function runCommand(cmd) {
 }
 
 export async function run({ hasFlag, version }) {
-  const { updateStatus, refreshUpdateState, upgradeCommand } = await import('../update-check.js');
+  const { updateStatus, refreshUpdateState, upgradeCommand, INSTALLED_UNDER_LEGACY_NAME } =
+    await import('../update-check.js');
   const { userLanguage } = await import('../config.js');
   const lang = userLanguage();
   const cmd = upgradeCommand();
@@ -40,6 +41,25 @@ export async function run({ hasFlag, version }) {
   // network round trip is fine here.
   await refreshUpdateState(version);
   const s = updateStatus(version);
+  // A legacy-name copy has somewhere to go even on the newest version: the
+  // package was renamed, and only the new name keeps receiving releases.
+  if (!s.available && INSTALLED_UNDER_LEGACY_NAME) {
+    console.log(lang === 'ko'
+      ? `패키지 이름이 claude-token-saver 에서 sprag-cli 로 바뀌었습니다. 버전은 최신(v${version})이지만, 앞으로의 릴리스를 계속 받으려면 새 이름으로 옮겨야 합니다.`
+      : `The package was renamed from claude-token-saver to sprag-cli. You are on the latest version (v${version}), but future releases only ship under the new name.`);
+    console.log(`$ ${cmd}`);
+    const migrateCode = await runCommand(cmd);
+    if (migrateCode !== 0) {
+      console.error(lang === 'ko'
+        ? `이전 명령이 종료 코드 ${migrateCode}로 실패했습니다. 위 출력을 확인하십시오.`
+        : `Migration command failed with exit code ${migrateCode}. Check the output above.`);
+      process.exit(migrateCode);
+    }
+    console.log(lang === 'ko'
+      ? '이전이 끝났습니다. 새 셸에서 sprag --version 으로 확인하십시오.'
+      : 'Migration done. Confirm with sprag --version in a fresh shell.');
+    return;
+  }
   if (!s.available) {
     console.log(lang === 'ko'
       ? `이미 최신 버전입니다 (v${version}). 설치할 것이 없습니다.`
@@ -48,8 +68,12 @@ export async function run({ hasFlag, version }) {
   }
 
   console.log(lang === 'ko'
-    ? `v${version} → ${s.latest} 로 업그레이드합니다.`
-    : `Upgrading v${version} → ${s.latest}.`);
+    ? (INSTALLED_UNDER_LEGACY_NAME
+      ? `v${version} → ${s.latest} 로 업그레이드하면서 새 패키지 이름(sprag-cli)으로 함께 옮깁니다.`
+      : `v${version} → ${s.latest} 로 업그레이드합니다.`)
+    : (INSTALLED_UNDER_LEGACY_NAME
+      ? `Upgrading v${version} → ${s.latest} and moving to the new package name (sprag-cli).`
+      : `Upgrading v${version} → ${s.latest}.`));
   console.log(`$ ${cmd}`);
   const code = await runCommand(cmd);
   if (code !== 0) {

package/src/config.js

@@ -12,6 +12,7 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { userDataDir } from './paths.js';
+import { labelPreference } from './statusline-mode.js';
 
 const CONFIG_DIR = userDataDir();
 const CONFIG_PATH = join(CONFIG_DIR, 'config.json');
@@ -38,8 +39,17 @@ export function saveConfig(cfg) {
 // Orthogonal — `mode icon verbose` flips both without resetting the rest.
 // Statusline-only toggles. Stored under `cfg.statusline`.
 const KEYWORDS = {
-  icon:       { key: 'icon',    value: true  },
-  text:       { key: 'icon',    value: false },
+  // Label style is one setting with three values, so the keywords write one key
+  // rather than a pair of booleans that could contradict each other.
+  icon:       { key: 'labels',  value: 'icon'   },
+  narrow:     { key: 'labels',  value: 'narrow' },
+  text:       { key: 'labels',  value: 'text'   },
+  // Opt back into icons inside IntelliJ, where they are downgraded by default
+  // for the plugin's statusline widget. Scoped to that guard only: outside
+  // IntelliJ it changes nothing, because `icon` / `text` already decide there.
+  // See src/statusline-mode.js.
+  'icon-force':    { key: 'iconForce', value: true  },
+  'no-icon-force': { key: 'iconForce', value: false },
   verbose:    { key: 'verbose', value: true  },
   compact:    { key: 'verbose', value: false },
   timer:      { key: 'timer',   value: true  },
@@ -171,8 +181,17 @@ export function statuslineDefaults() {
   } else {
     windowHours = 24; // default: last 1 day
   }
+  // Three-valued label style, with the legacy boolean honored for configs
+  // written before it existed. labelPreference() owns that fallback so the
+  // resolver and this function cannot disagree about what an old config means.
+  const labels = labelPreference(s);
   return {
-    icon:        s.icon    !== false,
+    labels,
+    // Kept for callers that only ask "emoji or not".
+    icon:        labels === 'icon',
+    // Off unless asked for: narrow labels are the IntelliJ default now, and only
+    // the user knows whether they would rather have garbled emoji than glyphs.
+    iconForce:   s.iconForce === true,
     verbose:     s.verbose !== false,
     timer:       s.timer   !== false,
     color:       s.color   !== false,