@rely-ai/caliber 1.37.0-dev.1774893636 → 1.37.1

package/dist/bin.js

@@ -2352,6 +2352,55 @@ function isRateLimitError(stderr) {
   return /rate limit|too many requests|429/i.test(stderr);
 }
 
+// src/llm/utils.ts
+function extractJson(text) {
+  const startIdx = text.search(/[[{]/);
+  if (startIdx === -1) return null;
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  for (let i = startIdx; i < text.length; i++) {
+    const ch = text[i];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (ch === "\\" && inString) {
+      escaped = true;
+      continue;
+    }
+    if (ch === '"') {
+      inString = !inString;
+      continue;
+    }
+    if (inString) continue;
+    if (ch === "{" || ch === "[") depth++;
+    if (ch === "}" || ch === "]") {
+      depth--;
+      if (depth === 0) return text.slice(startIdx, i + 1);
+    }
+  }
+  return null;
+}
+function stripMarkdownFences(text) {
+  return text.replace(/^```(?:json)?\s*/im, "").replace(/```\s*$/m, "").trim();
+}
+function parseJsonResponse(raw) {
+  const cleaned = stripMarkdownFences(raw);
+  try {
+    return JSON.parse(cleaned);
+  } catch {
+  }
+  const json = extractJson(cleaned);
+  if (!json) {
+    throw new Error(`No JSON found in LLM response: ${raw.slice(0, 200)}`);
+  }
+  return JSON.parse(json);
+}
+function estimateTokens(text) {
+  return Math.ceil(text.length / 4);
+}
+
 // src/llm/cursor-acp.ts
 var AGENT_BIN = "agent";
 var IS_WINDOWS = process.platform === "win32";
@@ -2376,12 +2425,33 @@ var CursorAcpProvider = class {
   async call(options) {
     const prompt = this.buildPrompt(options);
     const model = options.model || this.defaultModel;
-    return this.runPrint(model, prompt);
+    const result = await this.runPrint(model, prompt);
+    trackUsage(model, {
+      inputTokens: estimateTokens(prompt),
+      outputTokens: estimateTokens(result)
+    });
+    return result;
   }
   async stream(options, callbacks) {
     const prompt = this.buildPrompt(options);
     const model = options.model || this.defaultModel;
-    return this.runPrintStream(model, prompt, callbacks);
+    const inputEstimate = estimateTokens(prompt);
+    let outputChars = 0;
+    const wrappedCallbacks = {
+      onText: (text) => {
+        outputChars += text.length;
+        callbacks.onText(text);
+      },
+      onEnd: (meta) => {
+        trackUsage(model, {
+          inputTokens: inputEstimate,
+          outputTokens: Math.ceil(outputChars / 4)
+        });
+        callbacks.onEnd(meta);
+      },
+      onError: (err) => callbacks.onError(err)
+    };
+    return this.runPrintStream(model, prompt, wrappedCallbacks);
   }
   /**
    * Pre-spawn an agent process so it's ready when the first call comes.
@@ -2473,7 +2543,11 @@ var CursorAcpProvider = class {
         this.killWithEscalation(child);
         if (!settled) {
           settled = true;
-          reject(new Error(`Cursor agent timed out after ${this.timeoutMs / 1e3}s. Set CALIBER_CURSOR_TIMEOUT_MS to increase.`));
+          reject(
+            new Error(
+              `Cursor agent timed out after ${this.timeoutMs / 1e3}s. Set CALIBER_CURSOR_TIMEOUT_MS to increase.`
+            )
+          );
         }
       }, this.timeoutMs);
       timer.unref();
@@ -2509,7 +2583,9 @@ var CursorAcpProvider = class {
         this.killWithEscalation(child);
         if (!settled) {
           settled = true;
-          const err = new Error(`Cursor agent timed out after ${this.timeoutMs / 1e3}s. Set CALIBER_CURSOR_TIMEOUT_MS to increase.`);
+          const err = new Error(
+            `Cursor agent timed out after ${this.timeoutMs / 1e3}s. Set CALIBER_CURSOR_TIMEOUT_MS to increase.`
+          );
           callbacks.onError(err);
           reject(err);
         }
@@ -2616,7 +2692,10 @@ function isCursorAgentAvailable() {
 }
 function isCursorLoggedIn() {
   try {
-    const result = execSync5(`${AGENT_BIN} status`, { stdio: ["ignore", "pipe", "ignore"], timeout: 5e3 });
+    const result = execSync5(`${AGENT_BIN} status`, {
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 5e3
+    });
     return !result.toString().includes("not logged in");
   } catch {
     return false;
@@ -2653,20 +2732,29 @@ var ClaudeCliProvider = class {
   }
   async call(options) {
     const combined = this.buildCombinedPrompt(options);
-    return this.runClaudePrint(combined, options.model);
+    const result = await this.runClaudePrint(combined, options.model);
+    trackUsage(options.model || this.defaultModel, {
+      inputTokens: estimateTokens(combined),
+      outputTokens: estimateTokens(result)
+    });
+    return result;
   }
   async stream(options, callbacks) {
     const combined = this.buildCombinedPrompt(options);
+    const inputEstimate = estimateTokens(combined);
     const args = ["-p"];
     if (options.model) args.push("--model", options.model);
     const child = spawnClaude(args);
     child.stdin.end(combined);
     let settled = false;
+    let outputChars = 0;
     const chunks = [];
     const stderrChunks = [];
     child.stdout.on("data", (chunk) => {
       chunks.push(chunk);
-      callbacks.onText(chunk.toString("utf-8"));
+      const text = chunk.toString("utf-8");
+      outputChars += text.length;
+      callbacks.onText(text);
     });
     child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
     const timer = setTimeout(() => {
@@ -2692,6 +2780,11 @@ var ClaudeCliProvider = class {
       if (settled) return;
       settled = true;
       if (code === 0) {
+        const model = options.model || this.defaultModel;
+        trackUsage(model, {
+          inputTokens: inputEstimate,
+          outputTokens: Math.ceil(outputChars / 4)
+        });
         callbacks.onEnd({ stopReason: "end_turn" });
       } else {
         const stderr = Buffer.concat(stderrChunks).toString("utf-8").trim();
@@ -2766,55 +2859,6 @@ function isClaudeCliAvailable() {
   }
 }
 
-// src/llm/utils.ts
-function extractJson(text) {
-  const startIdx = text.search(/[[{]/);
-  if (startIdx === -1) return null;
-  let depth = 0;
-  let inString = false;
-  let escaped = false;
-  for (let i = startIdx; i < text.length; i++) {
-    const ch = text[i];
-    if (escaped) {
-      escaped = false;
-      continue;
-    }
-    if (ch === "\\" && inString) {
-      escaped = true;
-      continue;
-    }
-    if (ch === '"') {
-      inString = !inString;
-      continue;
-    }
-    if (inString) continue;
-    if (ch === "{" || ch === "[") depth++;
-    if (ch === "}" || ch === "]") {
-      depth--;
-      if (depth === 0) return text.slice(startIdx, i + 1);
-    }
-  }
-  return null;
-}
-function stripMarkdownFences(text) {
-  return text.replace(/^```(?:json)?\s*/im, "").replace(/```\s*$/m, "").trim();
-}
-function parseJsonResponse(raw) {
-  const cleaned = stripMarkdownFences(raw);
-  try {
-    return JSON.parse(cleaned);
-  } catch {
-  }
-  const json = extractJson(cleaned);
-  if (!json) {
-    throw new Error(`No JSON found in LLM response: ${raw.slice(0, 200)}`);
-  }
-  return JSON.parse(json);
-}
-function estimateTokens(text) {
-  return Math.ceil(text.length / 4);
-}
-
 // src/llm/model-recovery.ts
 init_config();
 init_resolve_caliber();
@@ -4761,9 +4805,25 @@ function isTransientError2(error) {
 async function generateSetup(fingerprint, targetAgent, prompt, callbacks, failingChecks, currentScore, passingChecks, options) {
   const isTargetedFix = failingChecks && failingChecks.length > 0 && currentScore !== void 0 && currentScore >= 95 || options?.forceTargetedFix;
   if (isTargetedFix) {
-    return generateMonolithic(fingerprint, targetAgent, prompt, callbacks, failingChecks, currentScore, passingChecks);
+    return generateMonolithic(
+      fingerprint,
+      targetAgent,
+      prompt,
+      callbacks,
+      failingChecks,
+      currentScore,
+      passingChecks
+    );
   }
-  const coreResult = await generateCore(fingerprint, targetAgent, prompt, callbacks, failingChecks, currentScore, passingChecks);
+  const coreResult = await generateCore(
+    fingerprint,
+    targetAgent,
+    prompt,
+    callbacks,
+    failingChecks,
+    currentScore,
+    passingChecks
+  );
   if (!coreResult.setup) {
     return coreResult;
   }
@@ -4812,6 +4872,7 @@ function mergeSkillResults(results, setup) {
   }
   return { succeeded, failed };
 }
+var MAX_SKILL_TOPICS = 5;
 function collectSkillTopics(setup, targetAgent, fingerprint) {
   const topics = [];
   for (const platform of ["claude", "codex", "opencode", "cursor"]) {
@@ -4832,12 +4893,18 @@ function collectSkillTopics(setup, targetAgent, fingerprint) {
       delete platformObj.skillTopics;
     }
   }
-  return topics;
+  return topics.slice(0, MAX_SKILL_TOPICS);
 }
 function getDefaultSkillTopics(fingerprint) {
   const topics = [
-    { name: "development-workflow", description: "Development setup and common workflows. Use when starting development, running the project, or setting up the environment." },
-    { name: "testing-guide", description: "Testing patterns and commands. Use when writing tests, running test suites, or debugging test failures." }
+    {
+      name: "development-workflow",
+      description: "Development setup and common workflows. Use when starting development, running the project, or setting up the environment."
+    },
+    {
+      name: "testing-guide",
+      description: "Testing patterns and commands. Use when writing tests, running test suites, or debugging test failures."
+    }
   ];
   if (fingerprint.frameworks.length > 0) {
     topics.push({
@@ -4855,8 +4922,10 @@ function getDefaultSkillTopics(fingerprint) {
 function buildSkillContext(fingerprint, setup, allDeps) {
   const parts = [];
   if (fingerprint.packageName) parts.push(`Project: ${fingerprint.packageName}`);
-  if (fingerprint.languages.length > 0) parts.push(`Languages: ${fingerprint.languages.join(", ")}`);
-  if (fingerprint.frameworks.length > 0) parts.push(`Frameworks: ${fingerprint.frameworks.join(", ")}`);
+  if (fingerprint.languages.length > 0)
+    parts.push(`Languages: ${fingerprint.languages.join(", ")}`);
+  if (fingerprint.frameworks.length > 0)
+    parts.push(`Frameworks: ${fingerprint.frameworks.join(", ")}`);
   const claude = setup.claude;
   const claudeMd = claude?.claudeMd;
   if (claudeMd) {
@@ -4943,7 +5012,9 @@ async function streamGeneration(config) {
                 }
               }
               sentStatuses = completedLines.length;
-              const jsonStartMatch = preJsonBuffer.match(/(?:^|\n)\s*(?:```json\s*\n\s*)?\{(?=\s*")/);
+              const jsonStartMatch = preJsonBuffer.match(
+                /(?:^|\n)\s*(?:```json\s*\n\s*)?\{(?=\s*")/
+              );
               if (jsonStartMatch) {
                 const matchIndex = preJsonBuffer.indexOf("{", jsonStartMatch.index);
                 inJson = true;
@@ -4958,7 +5029,9 @@ async function streamGeneration(config) {
             let setup = null;
             let jsonToParse = (jsonContent || preJsonBuffer).replace(/```\s*$/g, "").trim();
             if (!jsonContent && preJsonBuffer) {
-              const fallbackMatch = preJsonBuffer.match(/(?:^|\n)\s*(?:```json\s*\n\s*)?\{(?=\s*")/);
+              const fallbackMatch = preJsonBuffer.match(
+                /(?:^|\n)\s*(?:```json\s*\n\s*)?\{(?=\s*")/
+              );
               if (fallbackMatch) {
                 const matchIndex = preJsonBuffer.indexOf("{", fallbackMatch.index);
                 jsonToParse = preJsonBuffer.slice(matchIndex).replace(/```\s*$/g, "").trim();
@@ -4969,7 +5042,10 @@ async function streamGeneration(config) {
             } catch {
             }
             if (!setup && stopReason === "max_tokens" && attempt < MAX_RETRIES2) {
-              if (config.callbacks) config.callbacks.onStatus("Output was truncated, retrying with higher token limit...");
+              if (config.callbacks)
+                config.callbacks.onStatus(
+                  "Output was truncated, retrying with higher token limit..."
+                );
               setTimeout(() => attemptGeneration().then(resolve3), 1e3);
               return;
             }
@@ -4982,12 +5058,18 @@ async function streamGeneration(config) {
               if (config.callbacks) config.callbacks.onComplete(setup, explanation);
               resolve3({ setup, explanation, stopReason: stopReason ?? void 0 });
             } else {
-              resolve3({ setup: null, explanation, raw: preJsonBuffer, stopReason: stopReason ?? void 0 });
+              resolve3({
+                setup: null,
+                explanation,
+                raw: preJsonBuffer,
+                stopReason: stopReason ?? void 0
+              });
             }
           },
           onError: (error) => {
             if (isTransientError2(error) && attempt < MAX_RETRIES2) {
-              if (config.callbacks) config.callbacks.onStatus("Connection interrupted, retrying...");
+              if (config.callbacks)
+                config.callbacks.onStatus("Connection interrupted, retrying...");
               setTimeout(() => attemptGeneration().then(resolve3), 2e3);
               return;
             }
@@ -5004,7 +5086,14 @@ async function streamGeneration(config) {
   return attemptGeneration();
 }
 async function generateCore(fingerprint, targetAgent, prompt, callbacks, failingChecks, currentScore, passingChecks) {
-  const userMessage = buildGeneratePrompt(fingerprint, targetAgent, prompt, failingChecks, currentScore, passingChecks);
+  const userMessage = buildGeneratePrompt(
+    fingerprint,
+    targetAgent,
+    prompt,
+    failingChecks,
+    currentScore,
+    passingChecks
+  );
   return streamGeneration({
     systemPrompt: CORE_GENERATION_PROMPT,
     userMessage,
@@ -5015,7 +5104,14 @@ async function generateCore(fingerprint, targetAgent, prompt, callbacks, failing
   });
 }
 async function generateMonolithic(fingerprint, targetAgent, prompt, callbacks, failingChecks, currentScore, passingChecks) {
-  const userMessage = buildGeneratePrompt(fingerprint, targetAgent, prompt, failingChecks, currentScore, passingChecks);
+  const userMessage = buildGeneratePrompt(
+    fingerprint,
+    targetAgent,
+    prompt,
+    failingChecks,
+    currentScore,
+    passingChecks
+  );
   return streamGeneration({
     systemPrompt: GENERATION_SYSTEM_PROMPT,
     userMessage,
@@ -5096,9 +5192,11 @@ function buildGeneratePrompt(fingerprint, targetAgent, prompt, failingChecks, cu
   const isTargetedFix = failingChecks && failingChecks.length > 0 && currentScore !== void 0 && currentScore >= 95;
   if (isTargetedFix) {
     parts.push(`TARGETED FIX MODE \u2014 current score: ${currentScore}/100, target: ${targetAgent}`);
-    parts.push(`
+    parts.push(
+      `
 The existing config is already high quality. ONLY fix these specific failing checks:
-`);
+`
+    );
     for (const check of failingChecks) {
       if (check.fix) {
         parts.push(`- **${check.name}**`);
@@ -5129,15 +5227,19 @@ IMPORTANT RULES FOR TARGETED FIX:
 - For grounding issues: Add references to the listed project directories in the appropriate sections.
 - Every path or name you reference MUST exist in the project \u2014 use the file tree provided below.`);
   } else if (hasExistingConfigs) {
-    parts.push(`Audit and improve the existing coding agent configuration for target: ${targetAgent}`);
+    parts.push(
+      `Audit and improve the existing coding agent configuration for target: ${targetAgent}`
+    );
   } else {
     parts.push(`Generate an initial coding agent configuration for target: ${targetAgent}`);
   }
   if (fingerprint.gitRemoteUrl) parts.push(`
 Git remote: ${fingerprint.gitRemoteUrl}`);
   if (fingerprint.packageName) parts.push(`Package name: ${fingerprint.packageName}`);
-  if (fingerprint.languages.length > 0) parts.push(`Languages: ${fingerprint.languages.join(", ")}`);
-  if (fingerprint.frameworks.length > 0) parts.push(`Frameworks: ${fingerprint.frameworks.join(", ")}`);
+  if (fingerprint.languages.length > 0)
+    parts.push(`Languages: ${fingerprint.languages.join(", ")}`);
+  if (fingerprint.frameworks.length > 0)
+    parts.push(`Frameworks: ${fingerprint.frameworks.join(", ")}`);
   if (fingerprint.description) parts.push(`Project description: ${fingerprint.description}`);
   if (fingerprint.fileTree.length > 0) {
     const caPaths = fingerprint.codeAnalysis?.files.map((f) => f.path) ?? [];
@@ -5146,36 +5248,52 @@ Git remote: ${fingerprint.gitRemoteUrl}`);
 File tree (${tree.length}/${fingerprint.fileTree.length}):
 ${tree.join("\n")}`);
   }
-  if (existing.claudeMd) parts.push(`
+  if (existing.claudeMd)
+    parts.push(
+      `
 Existing CLAUDE.md:
-${truncate(existing.claudeMd, LIMITS.EXISTING_CONFIG_CHARS)}`);
-  if (existing.agentsMd) parts.push(`
+${truncate(existing.claudeMd, LIMITS.EXISTING_CONFIG_CHARS)}`
+    );
+  if (existing.agentsMd)
+    parts.push(
+      `
 Existing AGENTS.md:
-${truncate(existing.agentsMd, LIMITS.EXISTING_CONFIG_CHARS)}`);
-  if (existing.readmeMd) parts.push(`
+${truncate(existing.agentsMd, LIMITS.EXISTING_CONFIG_CHARS)}`
+    );
+  if (existing.readmeMd)
+    parts.push(
+      `
 Existing README.md:
-${truncate(existing.readmeMd, LIMITS.EXISTING_CONFIG_CHARS)}`);
+${truncate(existing.readmeMd, LIMITS.EXISTING_CONFIG_CHARS)}`
+    );
   if (existing.claudeSkills?.length) {
     parts.push("\n--- Existing Claude Skills ---");
     for (const skill of existing.claudeSkills.slice(0, LIMITS.SKILLS_MAX)) {
-      parts.push(`
+      parts.push(
+        `
 [.claude/skills/${skill.filename}]
-${truncate(skill.content, LIMITS.SKILL_CHARS)}`);
+${truncate(skill.content, LIMITS.SKILL_CHARS)}`
+      );
     }
     if (existing.claudeSkills.length > LIMITS.SKILLS_MAX) {
       parts.push(`
 (${existing.claudeSkills.length - LIMITS.SKILLS_MAX} more skills omitted)`);
     }
   }
-  if (existing.cursorrules) parts.push(`
+  if (existing.cursorrules)
+    parts.push(
+      `
 Existing .cursorrules:
-${truncate(existing.cursorrules, LIMITS.EXISTING_CONFIG_CHARS)}`);
+${truncate(existing.cursorrules, LIMITS.EXISTING_CONFIG_CHARS)}`
+    );
   if (existing.cursorRules?.length) {
     parts.push("\n--- Existing Cursor Rules ---");
     for (const rule of existing.cursorRules.slice(0, LIMITS.RULES_MAX)) {
-      parts.push(`
+      parts.push(
+        `
 [.cursor/rules/${rule.filename}]
-${truncate(rule.content, LIMITS.SKILL_CHARS)}`);
+${truncate(rule.content, LIMITS.SKILL_CHARS)}`
+      );
     }
     if (existing.cursorRules.length > LIMITS.RULES_MAX) {
       parts.push(`
@@ -5185,9 +5303,11 @@ ${truncate(rule.content, LIMITS.SKILL_CHARS)}`);
   if (existing.cursorSkills?.length) {
     parts.push("\n--- Existing Cursor Skills ---");
     for (const skill of existing.cursorSkills.slice(0, LIMITS.SKILLS_MAX)) {
-      parts.push(`
+      parts.push(
+        `
 [.cursor/skills/${skill.name}/SKILL.md]
-${truncate(skill.content, LIMITS.SKILL_CHARS)}`);
+${truncate(skill.content, LIMITS.SKILL_CHARS)}`
+      );
     }
     if (existing.cursorSkills.length > LIMITS.SKILLS_MAX) {
       parts.push(`
@@ -5195,9 +5315,11 @@ ${truncate(skill.content, LIMITS.SKILL_CHARS)}`);
     }
   }
   if (existing.personalLearnings) {
-    parts.push(`
+    parts.push(
+      `
 --- Personal Learnings (developer-specific, include in generated configs) ---
-${existing.personalLearnings}`);
+${existing.personalLearnings}`
+    );
   }
   const allDeps = extractAllDeps(process.cwd());
   if (allDeps.length > 0) {
@@ -5263,7 +5385,10 @@ import fs12 from "fs";
 import path12 from "path";
 function writeClaudeConfig(config) {
   const written = [];
-  fs12.writeFileSync("CLAUDE.md", appendSyncBlock(appendLearningsBlock(appendPreCommitBlock(config.claudeMd))));
+  fs12.writeFileSync(
+    "CLAUDE.md",
+    appendSyncBlock(appendLearningsBlock(appendPreCommitBlock(config.claudeMd)))
+  );
   written.push("CLAUDE.md");
   if (config.skills?.length) {
     for (const skill of config.skills) {
@@ -7864,10 +7989,13 @@ async function searchSkills(fingerprint, targetPlatforms, onStatus) {
   if (!newCandidates.length) {
     return { results: [], contentMap: /* @__PURE__ */ new Map() };
   }
-  onStatus?.(`Scoring ${newCandidates.length} candidates...`);
   let results;
   const config = loadConfig();
-  if (config) {
+  if (newCandidates.length <= 5) {
+    onStatus?.("Few candidates \u2014 skipping scoring");
+    results = newCandidates.map((c) => ({ ...c, score: 70 }));
+  } else if (config) {
+    onStatus?.(`Scoring ${newCandidates.length} candidates...`);
     try {
       const projectContext = buildProjectContext(fingerprint, targetPlatforms);
       results = await scoreWithLLM(newCandidates, projectContext, technologies);
@@ -8286,7 +8414,8 @@ function printSkills(recs) {
 // src/ai/score-refine.ts
 import { existsSync as existsSync9 } from "fs";
 import ora2 from "ora";
-var MAX_REFINE_ITERATIONS = 2;
+var MAX_REFINE_ITERATIONS = 1;
+var MIN_POINTS_TO_REFINE = 4;
 function extractConfigContent(setup) {
   const claude = setup.claude;
   const codex = setup.codex;
@@ -8296,7 +8425,11 @@ function extractConfigContent(setup) {
     cursorrules = cursor.cursorrules;
   }
   const skills = [];
-  for (const [platform, obj] of [["claude", claude], ["codex", codex], ["cursor", cursor]]) {
+  for (const [platform, obj] of [
+    ["claude", claude],
+    ["codex", codex],
+    ["cursor", cursor]
+  ]) {
     const platformSkills = obj?.skills;
     if (Array.isArray(platformSkills)) {
       for (const skill of platformSkills) {
@@ -8315,8 +8448,12 @@ function extractConfigContent(setup) {
 }
 function buildGroundingFixInstruction(unmentionedTopDirs, projectStructure) {
   const dirDescriptions = unmentionedTopDirs.slice(0, 8).map((dir) => {
-    const subdirs = projectStructure.dirs.filter((d) => d.startsWith(`${dir}/`) && !d.includes("/", dir.length + 1));
-    const files = projectStructure.files.filter((f) => f.startsWith(`${dir}/`) && !f.includes("/", dir.length + 1));
+    const subdirs = projectStructure.dirs.filter(
+      (d) => d.startsWith(`${dir}/`) && !d.includes("/", dir.length + 1)
+    );
+    const files = projectStructure.files.filter(
+      (f) => f.startsWith(`${dir}/`) && !f.includes("/", dir.length + 1)
+    );
     const children = [...subdirs.slice(0, 4), ...files.slice(0, 2)];
     const childList = children.map((c) => c.split("/").pop()).join(", ");
     return childList ? `- \`${dir}/\` (contains: ${childList})` : `- \`${dir}/\``;
@@ -8361,7 +8498,9 @@ function validateSetup(setup, dir, checkExists = existsSync9, projectStructure)
   const content = claudeMd ?? agentsMd ?? "";
   if (content) {
     const structure2 = analyzeMarkdownStructure(content);
-    const blockThreshold = CODE_BLOCK_THRESHOLDS.find((t) => structure2.codeBlockCount >= t.minBlocks);
+    const blockThreshold = CODE_BLOCK_THRESHOLDS.find(
+      (t) => structure2.codeBlockCount >= t.minBlocks
+    );
     const blockPoints = blockThreshold?.points ?? 0;
     const maxBlockPoints = CODE_BLOCK_THRESHOLDS[0].points;
     if (blockPoints < maxBlockPoints && structure2.codeBlockCount < CODE_BLOCK_THRESHOLDS[0].minBlocks) {
@@ -8486,7 +8625,9 @@ function buildFeedbackMessage(issues) {
   ];
   for (let i = 0; i < issues.length; i++) {
     const issue = issues[i];
-    lines.push(`${i + 1}. ${issue.check.toUpperCase()} (-${issue.pointsLost} pts): ${issue.detail}`);
+    lines.push(
+      `${i + 1}. ${issue.check.toUpperCase()} (-${issue.pointsLost} pts): ${issue.detail}`
+    );
     lines.push(`   Action: ${issue.fixInstruction}
 `);
   }
@@ -8495,7 +8636,9 @@ function buildFeedbackMessage(issues) {
 function countIssuePoints(issues) {
   return issues.reduce((sum, i) => sum + i.pointsLost, 0);
 }
-async function scoreAndRefine(setup, dir, sessionHistory, callbacks) {
+async function scoreAndRefine(setup, dir, sessionHistory, callbacks, options) {
+  const maxIterations = options?.thorough ? 3 : MAX_REFINE_ITERATIONS;
+  const minPoints = options?.thorough ? 1 : MIN_POINTS_TO_REFINE;
   const existsCache = /* @__PURE__ */ new Map();
   const cachedExists = (path43) => {
     const cached = existsCache.get(path43);
@@ -8508,7 +8651,7 @@ async function scoreAndRefine(setup, dir, sessionHistory, callbacks) {
   let currentSetup = setup;
   let bestSetup = setup;
   let bestLostPoints = Infinity;
-  for (let iteration = 0; iteration < MAX_REFINE_ITERATIONS; iteration++) {
+  for (let iteration = 0; iteration < maxIterations; iteration++) {
     const issues = validateSetup(currentSetup, dir, cachedExists, projectStructure);
     const lostPoints = countIssuePoints(issues);
     if (lostPoints < bestLostPoints) {
@@ -8519,10 +8662,16 @@ async function scoreAndRefine(setup, dir, sessionHistory, callbacks) {
       if (callbacks?.onStatus) callbacks.onStatus("Config passes all scoring checks");
       return bestSetup;
     }
+    if (lostPoints < minPoints) {
+      if (callbacks?.onStatus) callbacks.onStatus("Minor issues \u2014 skipping refinement");
+      return bestSetup;
+    }
     const pointIssues = issues.filter((i) => i.pointsLost > 0);
     const pointIssueNames = pointIssues.map((i) => i.check).join(", ");
     if (callbacks?.onStatus) {
-      callbacks.onStatus(`Fixing ${pointIssues.length} scoring issue${pointIssues.length === 1 ? "" : "s"}: ${pointIssueNames}...`);
+      callbacks.onStatus(
+        `Fixing ${pointIssues.length} scoring issue${pointIssues.length === 1 ? "" : "s"}: ${pointIssueNames}...`
+      );
     }
     const refined = await applyTargetedFixes(currentSetup, issues);
     if (!refined) {
@@ -8557,17 +8706,19 @@ async function applyTargetedFixes(setup, issues) {
   }
   for (const skill of skills) {
     if (failingChecks.has(`Skill quality: ${skill.name}`)) {
-      targets.push({ key: `skill:${skill.name}`, label: `Skill: ${skill.name}`, content: skill.content });
+      targets.push({
+        key: `skill:${skill.name}`,
+        label: `Skill: ${skill.name}`,
+        content: skill.content
+      });
     }
   }
   if (targets.length === 0) return null;
   const feedbackMessage = buildFeedbackMessage(issues);
-  const contentBlock = targets.map(
-    (t) => `### ${t.label}
+  const contentBlock = targets.map((t) => `### ${t.label}
 \`\`\`markdown
 ${t.content}
-\`\`\``
-  ).join("\n\n");
+\`\`\``).join("\n\n");
   const prompt = [
     "Here are the config files with scoring issues:\n",
     contentBlock,
@@ -8618,14 +8769,20 @@ Return ONLY the fixed content as a JSON object with keys ${targets.map((t) => `"
     return null;
   }
 }
-async function runScoreRefineWithSpinner(setup, dir, sessionHistory) {
+async function runScoreRefineWithSpinner(setup, dir, sessionHistory, options) {
   const spinner = ora2("Validating config against scoring criteria...").start();
   try {
-    const refined = await scoreAndRefine(setup, dir, sessionHistory, {
-      onStatus: (msg) => {
-        spinner.text = msg;
-      }
-    });
+    const refined = await scoreAndRefine(
+      setup,
+      dir,
+      sessionHistory,
+      {
+        onStatus: (msg) => {
+          spinner.text = msg;
+        }
+      },
+      options
+    );
     if (refined !== setup) {
       spinner.succeed("Config refined based on scoring feedback");
     } else {
@@ -9365,6 +9522,7 @@ async function refineLoop(currentSetup, sessionHistory, summarizeSetup2, printSu
 // src/commands/init-display.ts
 import chalk12 from "chalk";
 import fs31 from "fs";
+init_types();
 function formatWhatChanged(setup) {
   const lines = [];
   const claude = setup.claude;
@@ -9534,7 +9692,11 @@ function displayTokenUsage() {
     console.log(chalk12.dim("  Token tracking not available for this provider.\n"));
     return;
   }
-  console.log(chalk12.bold("  Token usage:\n"));
+  const config = loadConfig();
+  const isEstimated = config != null && isSeatBased(config.provider);
+  const label = isEstimated ? "Estimated token usage:" : "Token usage:";
+  console.log(chalk12.bold(`  ${label}
+`));
   let totalIn = 0;
   let totalOut = 0;
   for (const m of summary) {
@@ -9552,6 +9714,9 @@ function displayTokenUsage() {
       `    ${chalk12.dim("Total")}: ${totalIn.toLocaleString()} in / ${totalOut.toLocaleString()} out`
     );
   }
+  if (isEstimated) {
+    console.log(chalk12.dim("  (Estimated from character count)"));
+  }
   console.log("");
 }
 
@@ -10233,9 +10398,15 @@ async function initCommand(options) {
         content: summarizeSetup("Initial generation", generatedSetup)
       });
       try {
-        const refined = await scoreAndRefine(generatedSetup, process.cwd(), sessionHistory, {
-          onStatus: (msg) => display.update(TASK_SCORE_REFINE, "running", msg)
-        });
+        const refined = await scoreAndRefine(
+          generatedSetup,
+          process.cwd(),
+          sessionHistory,
+          {
+            onStatus: (msg) => display.update(TASK_SCORE_REFINE, "running", msg)
+          },
+          { thorough: options.thorough }
+        );
         if (refined !== generatedSetup) {
           display.update(TASK_SCORE_REFINE, "done", "Refined");
           generatedSetup = refined;
@@ -11354,7 +11525,8 @@ function detectSyncedAgents(writtenFiles) {
   const joined = writtenFiles.join(" ");
   if (joined.includes("CLAUDE.md") || joined.includes(".claude/")) agents.push("Claude Code");
   if (joined.includes(".cursor/") || joined.includes(".cursorrules")) agents.push("Cursor");
-  if (joined.includes("copilot-instructions") || joined.includes(".github/instructions/")) agents.push("Copilot");
+  if (joined.includes("copilot-instructions") || joined.includes(".github/instructions/"))
+    agents.push("Copilot");
   if (joined.includes("AGENTS.md") || joined.includes(".agents/")) agents.push("Codex");
   return agents;
 }
@@ -13426,9 +13598,7 @@ async function uninstallCommand(options) {
 
 // src/cli.ts
 var __dirname = path41.dirname(fileURLToPath(import.meta.url));
-var pkg = JSON.parse(
-  fs50.readFileSync(path41.resolve(__dirname, "..", "package.json"), "utf-8")
-);
+var pkg = JSON.parse(fs50.readFileSync(path41.resolve(__dirname, "..", "package.json"), "utf-8"));
 var program = new Command();
 var displayVersion = process.env.CALIBER_LOCAL ? `${pkg.version}-local` : pkg.version;
 program.name(process.env.CALIBER_LOCAL ? "caloc" : "caliber").description("AI context infrastructure for coding agents").version(displayVersion).option("--no-traces", "Disable anonymous telemetry for this run");
@@ -13483,22 +13653,38 @@ function parseAgentOption(value) {
   if (value === "both") return ["claude", "cursor"];
   if (value === "all") return ["claude", "cursor", "codex", "opencode", "github-copilot"];
   const valid = ["claude", "cursor", "codex", "opencode", "github-copilot"];
-  const agents = [...new Set(value.split(",").map((s) => s.trim().toLowerCase()).filter((a) => valid.includes(a)))];
+  const agents = [
+    ...new Set(
+      value.split(",").map((s) => s.trim().toLowerCase()).filter((a) => valid.includes(a))
+    )
+  ];
   if (agents.length === 0) {
-    console.error(`Invalid agent "${value}". Choose from: claude, cursor, codex, opencode, github-copilot (comma-separated for multiple)`);
+    console.error(
+      `Invalid agent "${value}". Choose from: claude, cursor, codex, opencode, github-copilot (comma-separated for multiple)`
+    );
     process.exit(1);
   }
   return agents;
 }
-program.command("init").description("Initialize your project for AI-assisted development").option("--agent <type>", "Target agents (comma-separated): claude, cursor, codex, opencode, github-copilot", parseAgentOption).option("--source <paths...>", "Related source paths to include as context").option("--dry-run", "Preview changes without writing files").option("--force", "Overwrite existing config without prompting").option("--debug-report", void 0, false).option("--show-tokens", "Show token usage summary at the end").option("--auto-approve", "Run without interactive prompts (auto-accept all)").option("--verbose", "Show detailed logs of each step").action(tracked("init", initCommand));
-program.command("bootstrap").description("Install agent skills (/setup-caliber, /find-skills, /save-learning) without running init").action(tracked("bootstrap", bootstrapCommand));
+program.command("init").description("Initialize your project for AI-assisted development").option(
+  "--agent <type>",
+  "Target agents (comma-separated): claude, cursor, codex, opencode, github-copilot",
+  parseAgentOption
+).option("--source <paths...>", "Related source paths to include as context").option("--dry-run", "Preview changes without writing files").option("--force", "Overwrite existing config without prompting").option("--debug-report", void 0, false).option("--show-tokens", "Show token usage summary at the end").option("--auto-approve", "Run without interactive prompts (auto-accept all)").option("--verbose", "Show detailed logs of each step").option("--thorough", "Deep analysis \u2014 more refinement passes for maximum quality").action(tracked("init", initCommand));
+program.command("bootstrap").description(
+  "Install agent skills (/setup-caliber, /find-skills, /save-learning) without running init"
+).action(tracked("bootstrap", bootstrapCommand));
 program.command("undo").description("Revert all config changes made by Caliber").action(tracked("undo", undoCommand));
 program.command("uninstall").description("Remove all Caliber resources from this project").option("--force", "Skip confirmation prompt").action(tracked("uninstall", (options) => uninstallCommand(options)));
 program.command("status").description("Show current Caliber config status").option("--json", "Output as JSON").action(tracked("status", statusCommand));
 program.command("regenerate").alias("regen").alias("re").description("Re-analyze project and regenerate config").option("--dry-run", "Preview changes without writing files").action(tracked("regenerate", regenerateCommand));
 program.command("config").description("Configure LLM provider, API key, and model").action(tracked("config", configCommand));
 program.command("skills").description("Discover and install community skills for your project").option("--query <terms>", 'Search for skills by topic (e.g. "react frontend")').option("--install <slugs>", "Install specific skills by slug (comma-separated)").action(tracked("skills", recommendCommand));
-program.command("score").description("Score your AI context configuration (deterministic, no network)").option("--json", "Output as JSON").option("--quiet", "One-line output for scripts/hooks").option("--agent <type>", "Target agents (comma-separated): claude, cursor, codex, opencode, github-copilot", parseAgentOption).option("--compare <ref>", "Compare score against a git ref (branch, tag, or SHA)").action(tracked("score", scoreCommand));
+program.command("score").description("Score your AI context configuration (deterministic, no network)").option("--json", "Output as JSON").option("--quiet", "One-line output for scripts/hooks").option(
+  "--agent <type>",
+  "Target agents (comma-separated): claude, cursor, codex, opencode, github-copilot",
+  parseAgentOption
+).option("--compare <ref>", "Compare score against a git ref (branch, tag, or SHA)").action(tracked("score", scoreCommand));
 program.command("refresh").description("Update docs based on recent code changes").option("--quiet", "Suppress output (for use in hooks)").option("--dry-run", "Preview changes without writing files").action(tracked("refresh", refreshCommand));
 program.command("hooks").description("Manage auto-refresh hooks (toggle interactively)").option("--install", "Enable all hooks non-interactively").option("--remove", "Disable all hooks non-interactively").action(tracked("hooks", hooksCommand));
 program.command("insights").description("Show agent performance insights and learning impact").option("--json", "Output as JSON").action(tracked("insights", insightsCommand));
@@ -13509,7 +13695,12 @@ sources.command("remove").description("Remove a configured source").argument("<n
 program.command("publish").description("Generate a machine-readable summary for other repos to consume").action(tracked("publish", publishCommand));
 var learn = program.command("learn").description("Manage session learning \u2014 extract patterns from your AI coding sessions");
 learn.command("observe").description("Record a tool event from stdin (called by hooks)").option("--failure", "Mark event as a tool failure").option("--prompt", "Record a user prompt event").action(tracked("learn:observe", learnObserveCommand));
-learn.command("finalize").description("Analyze session events and update CALIBER_LEARNINGS.md (called on SessionEnd)").option("--force", "Skip the running-process check (for manual invocation)").option("--auto", "Silent mode for hooks (lower threshold, no interactive output)").option("--incremental", "Extract learnings mid-session without clearing events").action(tracked("learn:finalize", (opts) => learnFinalizeCommand(opts)));
+learn.command("finalize").description("Analyze session events and update CALIBER_LEARNINGS.md (called on SessionEnd)").option("--force", "Skip the running-process check (for manual invocation)").option("--auto", "Silent mode for hooks (lower threshold, no interactive output)").option("--incremental", "Extract learnings mid-session without clearing events").action(
+  tracked(
+    "learn:finalize",
+    (opts) => learnFinalizeCommand(opts)
+  )
+);
 learn.command("install").description("Install learning hooks into .claude/settings.json").action(tracked("learn:install", learnInstallCommand));
 learn.command("remove").description("Remove learning hooks from .claude/settings.json").action(tracked("learn:remove", learnRemoveCommand));
 learn.command("status").description("Show learning system status").action(tracked("learn:status", learnStatusCommand));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rely-ai/caliber",
-  "version": "1.37.0-dev.1774893636",
+  "version": "1.37.1",
   "description": "AI context infrastructure for coding agents — keeps CLAUDE.md, Cursor rules, and skills in sync as your codebase evolves",
   "type": "module",
   "bin": {