sprag-cli 3.74.0 → 3.75.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sprag-cli",
-  "version": "3.74.0",
+  "version": "3.75.0",
   "description": "Model-delegation router for Claude Code and Codex: lookups, checks and test runs go to cheaper models, documents go in as compact Markdown, and a live statusline shows spend and savings.",
   "type": "module",
   "bin": {

package/src/agents.js

@@ -16,7 +16,7 @@
  * directory and a copied rule would otherwise name an agent that is not there.
  */
 
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { claudeUserDir } from './paths.js';
 import { agentDefinitions } from './presets-source.js';
@@ -134,7 +134,8 @@ export function agentPhrase(name, { model, root } = {}) {
   const resolved = resolveAgentName(name, root);
   if (!resolved) return `model: ${model || modelOf(name) || 'haiku'}`;
   const tier = modelOf(resolved) || model || 'haiku';
-  return `${resolved}(model 인자 생략. 이 에이전트가 없거나 MCP 도구가 필요하면 general-purpose에 model: ${tier})`;
+  const spec = agentSpecLabel(resolved, root);
+  return `${resolved}(${spec ? `${spec}. ` : ''}model 인자 생략. 이 에이전트가 없거나 MCP 도구가 필요하면 general-purpose에 model: ${tier})`;
 }
 
 /**
@@ -146,5 +147,52 @@ export function agentPhraseEn(name, { model, root } = {}) {
   const resolved = resolveAgentName(name, root);
   if (!resolved) return `a model: ${model || modelOf(name) || 'haiku'} subagent`;
   const tier = modelOf(resolved) || model || 'haiku';
-  return `the ${resolved} subagent (omit the model argument; if it is unavailable or MCP tools are needed, use general-purpose with model: ${tier})`;
+  const spec = agentSpecLabel(resolved, root, ', ');
+  return `the ${resolved} subagent (${spec ? `${spec}; ` : ''}omit the model argument; if it is unavailable or MCP tools are needed, use general-purpose with model: ${tier})`;
+}
+
+/**
+ * The model and effort an installed agent file really pins, read from its
+ * frontmatter, or null when the file has none.
+ *
+ * The agent name says only the tier (`t1-worker`), and Claude Code draws a
+ * delegated run as `t1-worker(…)` with no model beside it. The phrase carries
+ * what the file says so the session can show it. The file is read rather
+ * than the preset because a user's own copy is never overwritten, and it may
+ * pin something else. A file without `model:` inherits the session model,
+ * which Claude Code writes as `inherit`.
+ */
+export function agentSpec(name, root = process.cwd()) {
+  const paths = [];
+  if (root !== null) paths.push(join(root, '.claude', 'agents', `${name}.md`));
+  paths.push(join(claudeUserDir(), 'agents', `${name}.md`));
+  for (const p of paths) {
+    let text;
+    try { text = readFileSync(p, 'utf8'); } catch { continue; }
+    const m = /^---\r?\n([\s\S]*?)\r?\n---/.exec(text);
+    if (!m) return null;
+    const field = (key) => {
+      const hit = new RegExp(`^${key}:[ \\t]*(.*?)[ \\t]*$`, 'm').exec(m[1]);
+      return hit && hit[1] ? hit[1] : null;
+    };
+    return { model: field('model') || 'inherit', effort: field('effort') };
+  }
+  return null;
+}
+
+/**
+ * Display name for a model value: `claude-sonnet-5-5` → `Sonnet 5.5`, a dated
+ * id loses its date. An alias or a gateway id stays as written, since an alias
+ * can resolve to an older model and that is worth seeing.
+ */
+export function modelLabel(model) {
+  const m = /^claude-([a-z]+)-(\d+)-(\d+)(?:-\d{8})?$/.exec(String(model || ''));
+  return m ? `${m[1][0].toUpperCase()}${m[1].slice(1)} ${m[2]}.${m[3]}` : String(model || '');
+}
+
+/** `Sonnet 5.5 · effort medium` for an installed agent, or '' when unknown. */
+function agentSpecLabel(name, root, sep = ' · ') {
+  const spec = agentSpec(name, root);
+  if (!spec) return '';
+  return spec.effort ? `${modelLabel(spec.model)}${sep}effort ${spec.effort}` : modelLabel(spec.model);
 }

package/src/model-rules.js

@@ -263,7 +263,11 @@ export function renderModelRatchet(rules, lang = userLanguage(), { root } = {})
     '',
     '위임을 실행할 때는 사용자에게 다음 한 줄을 먼저 표시할 것',
     '(어떤 도구가 토큰을 아끼고 있는지 가시화):',
-    '`🔀 [sprag] 모델 피팅: "<유형>" → <agent> 위임`',
+    '`🔀 [sprag] 모델 피팅: "<유형>" → <agent> (<모델> · effort <effort>) 위임`',
+    '',
+    '<모델>과 <effort>에는 룰의 에이전트 표기 괄호 안에 적힌 값(예: Sonnet 5.5 · effort medium)을',
+    '그대로 옮기고, 값이 적혀 있지 않으면 그 부분을 뺍니다. Claude Code 호출 행에는 에이전트',
+    '이름만 보이므로, Agent 도구의 description 맨 앞에도 `[<모델> · <effort>]` 를 붙이십시오.',
     '',
     '## 공통 조항 (룰마다 반복하지 않으므로 여기서 한 번만 읽으십시오)',
     '',
@@ -326,7 +330,12 @@ export function renderModelRatchet(rules, lang = userLanguage(), { root } = {})
     '',
     'When delegating under a rule below, show the user this line first so it is',
     'visible which tool is saving tokens:',
-    '`🔀 [sprag] model fitting: "<category>" → delegated to <agent>`',
+    '`🔀 [sprag] model fitting: "<category>" → delegated to <agent> (<model> · effort <effort>)`',
+    '',
+    'Fill <model> and <effort> from the parentheses after the agent in the rule',
+    '(e.g. Sonnet 5.5, effort medium), and leave out whichever the rule does not',
+    'give. Claude Code shows only the agent name on the call row, so also start',
+    'the Agent tool\'s description with `[<model> · <effort>]`.',
     '',
     '## Shared clauses (stated once here, not repeated per rule)',
     '',

package/src/route-inject.js

@@ -296,9 +296,11 @@ export function routeHint(text, { rules, lang = userLanguage(), root, sessionRan
   // string whichever path decided to delegate.
   return ko
     ? `[sprag] 이 요청은 사용자가 이미 승인한 위임 룰 "${label}" 에 해당합니다: ${target} 로 위임하십시오 (${capText}). `
-      + `되묻지 말고 위임하고, 위임할 때 \`🔀 [sprag] 모델 피팅: "${label}" → <agent> 위임\` 을 먼저 표시하십시오. `
+      + `되묻지 말고 위임하고, 위임할 때 \`🔀 [sprag] 모델 피팅: "${label}" → <agent> (<모델> · effort <effort>) 위임\` 을 먼저 표시하십시오. `
+      + `모델과 effort 값은 위 에이전트 표기에 적힌 그대로 쓰고, Agent 도구의 description 맨 앞에도 \`[<모델> · <effort>]\` 를 붙이십시오. `
       + `상한을 넘길 것 같거나 에러가 나면 그 자리에서 멈추고 메인 모델이 이어받습니다.`
     : `[sprag] This request matches a delegation rule the user already approved — "${label}": delegate to ${target} (${capText}). `
-      + `Do not ask again; print \`🔀 [sprag] model fit: "${label}" → <agent>\` first. `
+      + `Do not ask again; print \`🔀 [sprag] model fit: "${label}" → <agent> (<model> · effort <effort>)\` first, `
+      + `with the model and effort the agent's phrase above gives, and start the Agent tool's description with \`[<model> · <effort>]\`. `
       + `If the run is likely to exceed its cap or hits an error, stop there and the main model takes over.`;
 }