@rely-ai/caliber 1.7.9 → 1.9.0

package/dist/bin.js

@@ -627,6 +627,33 @@ init_config();
 
 // src/llm/anthropic.ts
 import Anthropic from "@anthropic-ai/sdk";
+
+// src/llm/usage.ts
+var usageByModel = /* @__PURE__ */ new Map();
+function trackUsage(model, usage) {
+  const existing = usageByModel.get(model);
+  if (existing) {
+    existing.inputTokens += usage.inputTokens;
+    existing.outputTokens += usage.outputTokens;
+    existing.cacheReadTokens += usage.cacheReadTokens ?? 0;
+    existing.cacheWriteTokens += usage.cacheWriteTokens ?? 0;
+    existing.calls += 1;
+  } else {
+    usageByModel.set(model, {
+      model,
+      inputTokens: usage.inputTokens,
+      outputTokens: usage.outputTokens,
+      cacheReadTokens: usage.cacheReadTokens ?? 0,
+      cacheWriteTokens: usage.cacheWriteTokens ?? 0,
+      calls: 1
+    });
+  }
+}
+function getUsageSummary() {
+  return Array.from(usageByModel.values());
+}
+
+// src/llm/anthropic.ts
 var AnthropicProvider = class {
   client;
   defaultModel;
@@ -641,6 +668,16 @@ var AnthropicProvider = class {
       system: [{ type: "text", text: options.system, cache_control: { type: "ephemeral" } }],
       messages: [{ role: "user", content: options.prompt }]
     });
+    const model = options.model || this.defaultModel;
+    if (response.usage) {
+      const u = response.usage;
+      trackUsage(model, {
+        inputTokens: u.input_tokens ?? 0,
+        outputTokens: u.output_tokens ?? 0,
+        cacheReadTokens: u.cache_read_input_tokens,
+        cacheWriteTokens: u.cache_creation_input_tokens
+      });
+    }
     const block = response.content[0];
     return block.type === "text" ? block.text : "";
   }
@@ -667,11 +704,24 @@ var AnthropicProvider = class {
       messages
     });
     let stopReason;
+    let usage;
+    const model = options.model || this.defaultModel;
     stream.on("message", (message) => {
-      stopReason = message.stop_reason;
+      const msg = message;
+      stopReason = msg.stop_reason;
+      const u = msg.usage;
+      if (u) {
+        usage = {
+          inputTokens: u.input_tokens ?? 0,
+          outputTokens: u.output_tokens ?? 0,
+          cacheReadTokens: u.cache_read_input_tokens,
+          cacheWriteTokens: u.cache_creation_input_tokens
+        };
+        trackUsage(model, usage);
+      }
     });
     stream.on("text", (text) => callbacks.onText(text));
-    stream.on("end", () => callbacks.onEnd({ stopReason }));
+    stream.on("end", () => callbacks.onEnd({ stopReason, usage }));
     stream.on("error", (error) => callbacks.onError(error));
   }
 };
@@ -722,6 +772,16 @@ var VertexProvider = class {
       system: [{ type: "text", text: options.system, cache_control: { type: "ephemeral" } }],
       messages: [{ role: "user", content: options.prompt }]
     });
+    const model = options.model || this.defaultModel;
+    if (response.usage) {
+      const u = response.usage;
+      trackUsage(model, {
+        inputTokens: u.input_tokens ?? 0,
+        outputTokens: u.output_tokens ?? 0,
+        cacheReadTokens: u.cache_read_input_tokens,
+        cacheWriteTokens: u.cache_creation_input_tokens
+      });
+    }
     const block = response.content[0];
     return block.type === "text" ? block.text : "";
   }
@@ -740,11 +800,24 @@ var VertexProvider = class {
       messages
     });
     let stopReason;
+    let usage;
+    const model = options.model || this.defaultModel;
     stream.on("message", (message) => {
-      stopReason = message.stop_reason;
+      const msg = message;
+      stopReason = msg.stop_reason;
+      const u = msg.usage;
+      if (u) {
+        usage = {
+          inputTokens: u.input_tokens ?? 0,
+          outputTokens: u.output_tokens ?? 0,
+          cacheReadTokens: u.cache_read_input_tokens,
+          cacheWriteTokens: u.cache_creation_input_tokens
+        };
+        trackUsage(model, usage);
+      }
     });
     stream.on("text", (text) => callbacks.onText(text));
-    stream.on("end", () => callbacks.onEnd({ stopReason }));
+    stream.on("end", () => callbacks.onEnd({ stopReason, usage }));
     stream.on("error", (error) => callbacks.onError(error));
   }
 };
@@ -770,6 +843,13 @@ var OpenAICompatProvider = class {
         { role: "user", content: options.prompt }
       ]
     });
+    const model = options.model || this.defaultModel;
+    if (response.usage) {
+      trackUsage(model, {
+        inputTokens: response.usage.prompt_tokens ?? 0,
+        outputTokens: response.usage.completion_tokens ?? 0
+      });
+    }
     return response.choices[0]?.message?.content || "";
   }
   async listModels() {
@@ -797,13 +877,23 @@ var OpenAICompatProvider = class {
     });
     try {
       let stopReason;
+      let usage;
+      const model = options.model || this.defaultModel;
       for await (const chunk of stream) {
         const delta = chunk.choices[0]?.delta?.content;
         if (delta != null) callbacks.onText(delta);
         const finishReason = chunk.choices[0]?.finish_reason;
         if (finishReason) stopReason = finishReason === "length" ? "max_tokens" : finishReason;
+        const chunkUsage = chunk.usage;
+        if (chunkUsage) {
+          usage = {
+            inputTokens: chunkUsage.prompt_tokens ?? 0,
+            outputTokens: chunkUsage.completion_tokens ?? 0
+          };
+          trackUsage(model, usage);
+        }
       }
-      callbacks.onEnd({ stopReason });
+      callbacks.onEnd({ stopReason, usage });
     } catch (error) {
       callbacks.onError(error instanceof Error ? error : new Error(String(error)));
     }
@@ -1476,7 +1566,7 @@ Quality (25 pts):
 - No contradictions (2 pts) \u2014 consistent tool/style recommendations
 
 Coverage (20 pts):
-- Dependency coverage (10 pts) \u2014 CRITICAL: mention the project's actual dependencies by name in CLAUDE.md or skills. Reference the key packages from package.json/requirements.txt/go.mod. The scoring checks whether each non-trivial dependency name appears somewhere in your output. Aim for >80% coverage.
+- Dependency coverage (10 pts) \u2014 CRITICAL: the exact dependency list is provided in your input under "DEPENDENCY COVERAGE". Mention AT LEAST 85% of them by name in CLAUDE.md or skills. You get full points at 85%+, proportional below that. Weave them naturally into architecture, key deps, and conventions sections.
 - Service/MCP coverage (6 pts) \u2014 reference detected services (DB, cloud, etc.)
 - MCP completeness (4 pts) \u2014 full points if no external services detected
 
@@ -1737,6 +1827,98 @@ async function enrichWithLLM(fingerprint, dir) {
   }
 }
 
+// src/utils/dependencies.ts
+import { readFileSync } from "fs";
+import { join } from "path";
+function readFileOrNull(path26) {
+  try {
+    return readFileSync(path26, "utf-8");
+  } catch {
+    return null;
+  }
+}
+function readJsonOrNull(path26) {
+  const content = readFileOrNull(path26);
+  if (!content) return null;
+  try {
+    return JSON.parse(content);
+  } catch {
+    return null;
+  }
+}
+function extractNpmDeps(dir) {
+  const pkg3 = readJsonOrNull(join(dir, "package.json"));
+  if (!pkg3) return [];
+  const deps = {
+    ...pkg3.dependencies,
+    ...pkg3.devDependencies
+  };
+  const trivial = /* @__PURE__ */ new Set([
+    "typescript",
+    "@types/node",
+    "tslib",
+    "ts-node",
+    "tsx",
+    "prettier",
+    "eslint",
+    "@eslint/js",
+    "rimraf",
+    "cross-env",
+    "dotenv",
+    "nodemon",
+    "husky",
+    "lint-staged",
+    "commitlint",
+    "@commitlint/cli",
+    "@commitlint/config-conventional"
+  ]);
+  const trivialPatterns = [
+    /^@rely-ai\//,
+    /^@caliber-ai\//,
+    /^eslint-/,
+    /^@eslint\//,
+    /^prettier-/,
+    /^@typescript-eslint\//
+  ];
+  return Object.keys(deps).filter((d) => !trivial.has(d) && !d.startsWith("@types/") && !trivialPatterns.some((p) => p.test(d))).slice(0, 30);
+}
+function extractPythonDeps(dir) {
+  const reqTxt = readFileOrNull(join(dir, "requirements.txt"));
+  if (reqTxt) {
+    return reqTxt.split("\n").map((l) => l.trim().split(/[=<>!~\[]/)[0].trim()).filter((l) => l && !l.startsWith("#")).slice(0, 30);
+  }
+  const pyproject = readFileOrNull(join(dir, "pyproject.toml"));
+  if (pyproject) {
+    const depMatch = pyproject.match(/dependencies\s*=\s*\[([\s\S]*?)\]/);
+    if (depMatch) {
+      return depMatch[1].split("\n").map((l) => l.trim().replace(/["',]/g, "").split(/[=<>!~\[]/)[0].trim()).filter((l) => l.length > 0).slice(0, 30);
+    }
+  }
+  return [];
+}
+function extractGoDeps(dir) {
+  const goMod = readFileOrNull(join(dir, "go.mod"));
+  if (!goMod) return [];
+  const requireBlock = goMod.match(/require\s*\(([\s\S]*?)\)/);
+  if (!requireBlock) return [];
+  return requireBlock[1].split("\n").map((l) => l.trim().split(/\s/)[0]).filter((l) => l && !l.startsWith("//")).map((l) => l.split("/").pop() || l).slice(0, 30);
+}
+function extractRustDeps(dir) {
+  const cargo = readFileOrNull(join(dir, "Cargo.toml"));
+  if (!cargo) return [];
+  const depSection = cargo.match(/\[dependencies\]([\s\S]*?)(?:\[|$)/);
+  if (!depSection) return [];
+  return depSection[1].split("\n").map((l) => l.trim().split(/\s*=/)[0].trim()).filter((l) => l.length > 0 && !l.startsWith("#")).slice(0, 30);
+}
+function extractAllDeps(dir) {
+  return [
+    ...extractNpmDeps(dir),
+    ...extractPythonDeps(dir),
+    ...extractGoDeps(dir),
+    ...extractRustDeps(dir)
+  ];
+}
+
 // src/ai/generate.ts
 var GENERATION_MAX_TOKENS = 64e3;
 var MODEL_MAX_OUTPUT_TOKENS = 128e3;
@@ -1818,9 +2000,9 @@ async function generateSetup(fingerprint, targetAgent, prompt, callbacks, failin
             }
             if (setup) {
               if (callbacks) callbacks.onComplete(setup, explanation);
-              resolve2({ setup, explanation });
+              resolve2({ setup, explanation, stopReason: stopReason ?? void 0 });
             } else {
-              resolve2({ setup: null, explanation, raw: preJsonBuffer });
+              resolve2({ setup: null, explanation, raw: preJsonBuffer, stopReason: stopReason ?? void 0 });
             }
           },
           onError: (error) => {
@@ -1830,12 +2012,12 @@ async function generateSetup(fingerprint, targetAgent, prompt, callbacks, failin
               return;
             }
             if (callbacks) callbacks.onError(error.message);
-            resolve2({ setup: null, raw: error.message });
+            resolve2({ setup: null, raw: error.message, stopReason: "error" });
           }
         }
       ).catch((error) => {
         if (callbacks) callbacks.onError(error.message);
-        resolve2({ setup: null, raw: error.message });
+        resolve2({ setup: null, raw: error.message, stopReason: "error" });
       });
     });
   };
@@ -1983,6 +2165,12 @@ ${truncate(cfg.content, LIMITS.CONFIG_FILE_CHARS)}`);
       parts.push("\n(Code analysis was truncated due to size limits \u2014 not all files are shown.)");
     }
   }
+  const allDeps = extractAllDeps(process.cwd());
+  if (allDeps.length > 0) {
+    parts.push(`
+DEPENDENCY COVERAGE \u2014 mention at least 85% of these ${allDeps.length} packages by name in CLAUDE.md or skills for full coverage points:`);
+    parts.push(allDeps.join(", "));
+  }
   if (prompt) parts.push(`
 User instructions: ${prompt}`);
   return parts.join("\n");
@@ -3140,11 +3328,11 @@ async function runInteractiveProviderSetup(options) {
 
 // src/scoring/index.ts
 import { existsSync as existsSync8 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // src/scoring/checks/existence.ts
-import { existsSync as existsSync3, readdirSync as readdirSync2, readFileSync as readFileSync2 } from "fs";
-import { join as join2 } from "path";
+import { existsSync as existsSync3, readdirSync as readdirSync2, readFileSync as readFileSync3 } from "fs";
+import { join as join3 } from "path";
 
 // src/scoring/constants.ts
 var POINTS_CLAUDE_MD_EXISTS = 6;
@@ -3248,100 +3436,27 @@ function computeGrade(score) {
 }
 
 // src/scoring/checks/coverage.ts
-import { readFileSync, readdirSync } from "fs";
-import { join } from "path";
-function readFileOrNull(path26) {
-  try {
-    return readFileSync(path26, "utf-8");
-  } catch {
-    return null;
-  }
-}
-function readJsonOrNull(path26) {
-  const content = readFileOrNull(path26);
-  if (!content) return null;
+import { readFileSync as readFileSync2, readdirSync } from "fs";
+import { join as join2 } from "path";
+function readFileOrNull2(path26) {
   try {
-    return JSON.parse(content);
+    return readFileSync2(path26, "utf-8");
   } catch {
     return null;
   }
 }
-function extractNpmDeps(dir) {
-  const pkg3 = readJsonOrNull(join(dir, "package.json"));
-  if (!pkg3) return [];
-  const deps = {
-    ...pkg3.dependencies,
-    ...pkg3.devDependencies
-  };
-  const trivial = /* @__PURE__ */ new Set([
-    "typescript",
-    "@types/node",
-    "tslib",
-    "ts-node",
-    "tsx",
-    "prettier",
-    "eslint",
-    "@eslint/js",
-    "rimraf",
-    "cross-env",
-    "dotenv",
-    "nodemon",
-    "husky",
-    "lint-staged",
-    "commitlint",
-    "@commitlint/cli",
-    "@commitlint/config-conventional"
-  ]);
-  const trivialPatterns = [
-    /^@rely-ai\//,
-    /^@caliber-ai\//,
-    /^eslint-/,
-    /^@eslint\//,
-    /^prettier-/,
-    /^@typescript-eslint\//
-  ];
-  return Object.keys(deps).filter((d) => !trivial.has(d) && !d.startsWith("@types/") && !trivialPatterns.some((p) => p.test(d))).slice(0, 30);
-}
-function extractPythonDeps(dir) {
-  const reqTxt = readFileOrNull(join(dir, "requirements.txt"));
-  if (reqTxt) {
-    return reqTxt.split("\n").map((l) => l.trim().split(/[=<>!~\[]/)[0].trim()).filter((l) => l && !l.startsWith("#")).slice(0, 30);
-  }
-  const pyproject = readFileOrNull(join(dir, "pyproject.toml"));
-  if (pyproject) {
-    const depMatch = pyproject.match(/dependencies\s*=\s*\[([\s\S]*?)\]/);
-    if (depMatch) {
-      return depMatch[1].split("\n").map((l) => l.trim().replace(/["',]/g, "").split(/[=<>!~\[]/)[0].trim()).filter((l) => l.length > 0).slice(0, 30);
-    }
-  }
-  return [];
-}
-function extractGoDeps(dir) {
-  const goMod = readFileOrNull(join(dir, "go.mod"));
-  if (!goMod) return [];
-  const requireBlock = goMod.match(/require\s*\(([\s\S]*?)\)/);
-  if (!requireBlock) return [];
-  return requireBlock[1].split("\n").map((l) => l.trim().split(/\s/)[0]).filter((l) => l && !l.startsWith("//")).map((l) => l.split("/").pop() || l).slice(0, 30);
-}
-function extractRustDeps(dir) {
-  const cargo = readFileOrNull(join(dir, "Cargo.toml"));
-  if (!cargo) return [];
-  const depSection = cargo.match(/\[dependencies\]([\s\S]*?)(?:\[|$)/);
-  if (!depSection) return [];
-  return depSection[1].split("\n").map((l) => l.trim().split(/\s*=/)[0].trim()).filter((l) => l.length > 0 && !l.startsWith("#")).slice(0, 30);
-}
 function collectAllConfigContent(dir) {
   const parts = [];
-  const claudeMd = readFileOrNull(join(dir, "CLAUDE.md"));
+  const claudeMd = readFileOrNull2(join2(dir, "CLAUDE.md"));
   if (claudeMd) parts.push(claudeMd);
-  const cursorrules = readFileOrNull(join(dir, ".cursorrules"));
+  const cursorrules = readFileOrNull2(join2(dir, ".cursorrules"));
   if (cursorrules) parts.push(cursorrules);
-  for (const skillsDir of [join(dir, ".claude", "skills"), join(dir, ".cursor", "skills")]) {
+  for (const skillsDir of [join2(dir, ".claude", "skills"), join2(dir, ".cursor", "skills")]) {
     try {
       const entries = readdirSync(skillsDir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isDirectory()) {
-          const skill = readFileOrNull(join(skillsDir, entry.name, "SKILL.md"));
+          const skill = readFileOrNull2(join2(skillsDir, entry.name, "SKILL.md"));
           if (skill) parts.push(skill);
         }
       }
@@ -3349,10 +3464,10 @@ function collectAllConfigContent(dir) {
     }
   }
   try {
-    const rulesDir = join(dir, ".cursor", "rules");
+    const rulesDir = join2(dir, ".cursor", "rules");
     const mdcFiles = readdirSync(rulesDir).filter((f) => f.endsWith(".mdc"));
     for (const f of mdcFiles) {
-      const content = readFileOrNull(join(rulesDir, f));
+      const content = readFileOrNull2(join2(rulesDir, f));
       if (content) parts.push(content);
     }
   } catch {
@@ -3400,7 +3515,7 @@ function getConfiguredMcpServers(dir) {
   ];
   for (const rel of mcpFiles) {
     try {
-      const content = readFileSync(join(dir, rel), "utf-8");
+      const content = readFileSync2(join2(dir, rel), "utf-8");
       const parsed = JSON.parse(content);
       const mcpServers = parsed.mcpServers;
       if (mcpServers) {
@@ -3516,7 +3631,7 @@ function hasMcpServers(dir) {
   ];
   for (const rel of mcpFiles) {
     try {
-      const content = readFileSync2(join2(dir, rel), "utf-8");
+      const content = readFileSync3(join3(dir, rel), "utf-8");
       const parsed = JSON.parse(content);
       const servers = parsed.mcpServers;
       if (servers && Object.keys(servers).length > 0) {
@@ -3530,7 +3645,7 @@ function hasMcpServers(dir) {
 }
 function checkExistence(dir) {
   const checks = [];
-  const claudeMdExists = existsSync3(join2(dir, "CLAUDE.md"));
+  const claudeMdExists = existsSync3(join3(dir, "CLAUDE.md"));
   checks.push({
     id: "claude_md_exists",
     name: "CLAUDE.md exists",
@@ -3541,8 +3656,8 @@ function checkExistence(dir) {
     detail: claudeMdExists ? "Found at project root" : "Not found",
     suggestion: claudeMdExists ? void 0 : "Create a CLAUDE.md with project context and commands"
   });
-  const hasCursorrules = existsSync3(join2(dir, ".cursorrules"));
-  const cursorRulesDir = existsSync3(join2(dir, ".cursor", "rules"));
+  const hasCursorrules = existsSync3(join3(dir, ".cursorrules"));
+  const cursorRulesDir = existsSync3(join3(dir, ".cursor", "rules"));
   const cursorRulesExist = hasCursorrules || cursorRulesDir;
   checks.push({
     id: "cursor_rules_exist",
@@ -3554,7 +3669,7 @@ function checkExistence(dir) {
     detail: hasCursorrules ? ".cursorrules found" : cursorRulesDir ? ".cursor/rules/ found" : "No Cursor rules",
     suggestion: cursorRulesExist ? void 0 : "Add .cursor/rules/ for Cursor users on your team"
   });
-  const agentsMdExists = existsSync3(join2(dir, "AGENTS.md"));
+  const agentsMdExists = existsSync3(join3(dir, "AGENTS.md"));
   checks.push({
     id: "codex_agents_md_exists",
     name: "AGENTS.md exists",
@@ -3565,8 +3680,8 @@ function checkExistence(dir) {
     detail: agentsMdExists ? "Found at project root" : "Not found",
     suggestion: agentsMdExists ? void 0 : "Create AGENTS.md with project context for Codex"
   });
-  const claudeSkills = countFiles(join2(dir, ".claude", "skills"), /\.(md|SKILL\.md)$/);
-  const codexSkills = countFiles(join2(dir, ".agents", "skills"), /SKILL\.md$/);
+  const claudeSkills = countFiles(join3(dir, ".claude", "skills"), /\.(md|SKILL\.md)$/);
+  const codexSkills = countFiles(join3(dir, ".agents", "skills"), /SKILL\.md$/);
   const skillCount = claudeSkills.length + codexSkills.length;
   const skillBase = skillCount >= 1 ? POINTS_SKILLS_EXIST : 0;
   const skillBonus = Math.min((skillCount - 1) * POINTS_SKILLS_BONUS_PER_EXTRA, POINTS_SKILLS_BONUS_CAP);
@@ -3582,7 +3697,7 @@ function checkExistence(dir) {
     detail: skillCount === 0 ? "No skills found" : `${skillCount} skill${skillCount === 1 ? "" : "s"} found`,
     suggestion: skillCount === 0 ? "Add .claude/skills/ with project-specific workflows" : skillCount < 3 ? "Optimal is 2-3 focused skills (SkillsBench research)" : void 0
   });
-  const mdcFiles = countFiles(join2(dir, ".cursor", "rules"), /\.mdc$/);
+  const mdcFiles = countFiles(join3(dir, ".cursor", "rules"), /\.mdc$/);
   const mdcCount = mdcFiles.length;
   checks.push({
     id: "cursor_mdc_rules",
@@ -3624,11 +3739,11 @@ function checkExistence(dir) {
 }
 
 // src/scoring/checks/quality.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { join as join3 } from "path";
-function readFileOrNull2(path26) {
+import { readFileSync as readFileSync4 } from "fs";
+import { join as join4 } from "path";
+function readFileOrNull3(path26) {
   try {
-    return readFileSync3(path26, "utf-8");
+    return readFileSync4(path26, "utf-8");
   } catch {
     return null;
   }
@@ -3638,9 +3753,9 @@ function countLines(content) {
 }
 function checkQuality(dir) {
   const checks = [];
-  const claudeMd = readFileOrNull2(join3(dir, "CLAUDE.md"));
-  const cursorrules = readFileOrNull2(join3(dir, ".cursorrules"));
-  const agentsMd = readFileOrNull2(join3(dir, "AGENTS.md"));
+  const claudeMd = readFileOrNull3(join4(dir, "CLAUDE.md"));
+  const cursorrules = readFileOrNull3(join4(dir, ".cursorrules"));
+  const agentsMd = readFileOrNull3(join4(dir, "AGENTS.md"));
   const allContent = [claudeMd, cursorrules, agentsMd].filter(Boolean);
   const combinedContent = allContent.join("\n");
   const primaryInstructions = claudeMd ?? agentsMd;
@@ -3779,17 +3894,17 @@ function checkQuality(dir) {
 }
 
 // src/scoring/checks/accuracy.ts
-import { existsSync as existsSync5, readFileSync as readFileSync4, readdirSync as readdirSync3, statSync } from "fs";
-import { join as join4 } from "path";
-function readFileOrNull3(path26) {
+import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync3, statSync } from "fs";
+import { join as join5 } from "path";
+function readFileOrNull4(path26) {
   try {
-    return readFileSync4(path26, "utf-8");
+    return readFileSync5(path26, "utf-8");
   } catch {
     return null;
   }
 }
 function readJsonOrNull2(path26) {
-  const content = readFileOrNull3(path26);
+  const content = readFileOrNull4(path26);
   if (!content) return null;
   try {
     return JSON.parse(content);
@@ -3798,12 +3913,12 @@ function readJsonOrNull2(path26) {
   }
 }
 function getPackageScripts(dir) {
-  const pkg3 = readJsonOrNull2(join4(dir, "package.json"));
+  const pkg3 = readJsonOrNull2(join5(dir, "package.json"));
   if (!pkg3?.scripts) return /* @__PURE__ */ new Set();
   return new Set(Object.keys(pkg3.scripts));
 }
 function validateDocumentedCommands(dir) {
-  const claudeMd = readFileOrNull3(join4(dir, "CLAUDE.md"));
+  const claudeMd = readFileOrNull4(join5(dir, "CLAUDE.md"));
   if (!claudeMd) return { valid: [], invalid: [], total: 0 };
   const scripts = getPackageScripts(dir);
   const valid = [];
@@ -3838,8 +3953,8 @@ function validateDocumentedCommands(dir) {
     valid.push(match[0]);
   }
   const makePattern = /make\s+(\S+)/g;
-  if (existsSync5(join4(dir, "Makefile"))) {
-    const makefile = readFileOrNull3(join4(dir, "Makefile"));
+  if (existsSync5(join5(dir, "Makefile"))) {
+    const makefile = readFileOrNull4(join5(dir, "Makefile"));
     const makeTargets = /* @__PURE__ */ new Set();
     if (makefile) {
       for (const line of makefile.split("\n")) {
@@ -3861,7 +3976,7 @@ function validateDocumentedCommands(dir) {
   return { valid, invalid, total: valid.length + invalid.length };
 }
 function validateDocumentedPaths(dir) {
-  const claudeMd = readFileOrNull3(join4(dir, "CLAUDE.md"));
+  const claudeMd = readFileOrNull4(join5(dir, "CLAUDE.md"));
   if (!claudeMd) return { valid: [], invalid: [], total: 0 };
   const valid = [];
   const invalid = [];
@@ -3872,7 +3987,7 @@ function validateDocumentedPaths(dir) {
     const filePath = match[1];
     if (seen.has(filePath)) continue;
     seen.add(filePath);
-    if (existsSync5(join4(dir, filePath))) {
+    if (existsSync5(join5(dir, filePath))) {
       valid.push(filePath);
     } else {
       invalid.push(filePath);
@@ -3884,13 +3999,13 @@ function detectConfigDrift(dir) {
   const srcDirs = ["src", "lib", "app", "cmd", "internal", "pages", "components"];
   let latestSrcMtime = 0;
   for (const srcDir of srcDirs) {
-    const fullPath = join4(dir, srcDir);
+    const fullPath = join5(dir, srcDir);
     if (!existsSync5(fullPath)) continue;
     try {
       const files = readdirSync3(fullPath, { recursive: true }).map(String).filter((f) => /\.(ts|js|tsx|jsx|py|go|rs|java|rb)$/.test(f));
       for (const file of files.slice(0, 100)) {
         try {
-          const stat = statSync(join4(fullPath, file));
+          const stat = statSync(join5(fullPath, file));
           if (stat.mtime.getTime() > latestSrcMtime) {
             latestSrcMtime = stat.mtime.getTime();
           }
@@ -3904,7 +4019,7 @@ function detectConfigDrift(dir) {
   let latestConfigMtime = 0;
   for (const configFile of configFiles) {
     try {
-      const stat = statSync(join4(dir, configFile));
+      const stat = statSync(join5(dir, configFile));
       if (stat.mtime.getTime() > latestConfigMtime) {
         latestConfigMtime = stat.mtime.getTime();
       }
@@ -3970,11 +4085,11 @@ function checkAccuracy(dir) {
 }
 
 // src/scoring/checks/freshness.ts
-import { existsSync as existsSync6, readFileSync as readFileSync5, statSync as statSync2 } from "fs";
-import { join as join5 } from "path";
-function readFileOrNull4(path26) {
+import { existsSync as existsSync6, readFileSync as readFileSync6, statSync as statSync2 } from "fs";
+import { join as join6 } from "path";
+function readFileOrNull5(path26) {
   try {
-    return readFileSync5(path26, "utf-8");
+    return readFileSync6(path26, "utf-8");
   } catch {
     return null;
   }
@@ -3991,8 +4106,8 @@ function daysSinceModified(filePath) {
 }
 function checkFreshness(dir) {
   const checks = [];
-  const claudeMdPath = join5(dir, "CLAUDE.md");
-  const agentsMdPath = join5(dir, "AGENTS.md");
+  const claudeMdPath = join6(dir, "CLAUDE.md");
+  const agentsMdPath = join6(dir, "AGENTS.md");
   const primaryPath = existsSync6(claudeMdPath) ? claudeMdPath : agentsMdPath;
   const primaryName = existsSync6(claudeMdPath) ? "CLAUDE.md" : "AGENTS.md";
   const daysOld = daysSinceModified(primaryPath);
@@ -4026,7 +4141,7 @@ function checkFreshness(dir) {
   ];
   const secretFindings = [];
   for (const rel of filesToScan) {
-    const content = readFileOrNull4(join5(dir, rel));
+    const content = readFileOrNull5(join6(dir, rel));
     if (!content) continue;
     const lines = content.split("\n");
     for (let i = 0; i < lines.length; i++) {
@@ -4054,10 +4169,10 @@ function checkFreshness(dir) {
     detail: hasSecrets ? `${secretFindings.length} potential secret${secretFindings.length === 1 ? "" : "s"} found in ${secretFindings[0].file}:${secretFindings[0].line}` : "No secrets detected",
     suggestion: hasSecrets ? `Remove secrets from ${secretFindings[0].file}:${secretFindings[0].line} \u2014 use environment variables instead` : void 0
   });
-  const settingsPath = join5(dir, ".claude", "settings.json");
+  const settingsPath = join6(dir, ".claude", "settings.json");
   let hasPermissions = false;
   let permissionDetail = "";
-  const settingsContent = readFileOrNull4(settingsPath);
+  const settingsContent = readFileOrNull5(settingsPath);
   if (settingsContent) {
     try {
       const settings = JSON.parse(settingsContent);
@@ -4085,12 +4200,12 @@ function checkFreshness(dir) {
 }
 
 // src/scoring/checks/bonus.ts
-import { existsSync as existsSync7, readFileSync as readFileSync6, readdirSync as readdirSync4 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync7, readdirSync as readdirSync4 } from "fs";
 import { execSync as execSync8 } from "child_process";
-import { join as join6 } from "path";
-function readFileOrNull5(path26) {
+import { join as join7 } from "path";
+function readFileOrNull6(path26) {
   try {
-    return readFileSync6(path26, "utf-8");
+    return readFileSync7(path26, "utf-8");
   } catch {
     return null;
   }
@@ -4098,8 +4213,8 @@ function readFileOrNull5(path26) {
 function hasPreCommitHook(dir) {
   try {
     const gitDir = execSync8("git rev-parse --git-dir", { cwd: dir, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
-    const hookPath = join6(gitDir, "hooks", "pre-commit");
-    const content = readFileOrNull5(hookPath);
+    const hookPath = join7(gitDir, "hooks", "pre-commit");
+    const content = readFileOrNull6(hookPath);
     return content ? content.includes("caliber") : false;
   } catch {
     return false;
@@ -4110,7 +4225,7 @@ function checkBonus(dir) {
   let hasClaudeHooks = false;
   let hasPrecommit = false;
   const hookSources = [];
-  const settingsContent = readFileOrNull5(join6(dir, ".claude", "settings.json"));
+  const settingsContent = readFileOrNull6(join7(dir, ".claude", "settings.json"));
   if (settingsContent) {
     try {
       const settings = JSON.parse(settingsContent);
@@ -4138,7 +4253,7 @@ function checkBonus(dir) {
     detail: hookDetail,
     suggestion: hasHooks ? void 0 : "Run `caliber hooks --install` for auto-refresh"
   });
-  const agentsMdExists = existsSync7(join6(dir, "AGENTS.md"));
+  const agentsMdExists = existsSync7(join7(dir, "AGENTS.md"));
   checks.push({
     id: "agents_md_exists",
     name: "AGENTS.md exists",
@@ -4149,14 +4264,14 @@ function checkBonus(dir) {
     detail: agentsMdExists ? "Found at project root" : "Not found",
     suggestion: agentsMdExists ? void 0 : "Add AGENTS.md \u2014 the emerging cross-agent standard (60k+ repos)"
   });
-  const skillsDir = join6(dir, ".claude", "skills");
+  const skillsDir = join7(dir, ".claude", "skills");
   let openSkillsCount = 0;
   let totalSkillFiles = 0;
   try {
     const entries = readdirSync4(skillsDir, { withFileTypes: true });
     for (const entry of entries) {
       if (entry.isDirectory()) {
-        const skillMd = readFileOrNull5(join6(skillsDir, entry.name, "SKILL.md"));
+        const skillMd = readFileOrNull6(join7(skillsDir, entry.name, "SKILL.md"));
         if (skillMd) {
           totalSkillFiles++;
           if (skillMd.trimStart().startsWith("---")) {
@@ -4225,9 +4340,9 @@ function filterChecksForTarget(checks, target) {
 }
 function detectTargetAgent(dir) {
   const agents = [];
-  if (existsSync8(join7(dir, "CLAUDE.md")) || existsSync8(join7(dir, ".claude", "skills"))) agents.push("claude");
-  if (existsSync8(join7(dir, ".cursorrules")) || existsSync8(join7(dir, ".cursor", "rules"))) agents.push("cursor");
-  if (existsSync8(join7(dir, ".codex")) || existsSync8(join7(dir, ".agents", "skills"))) agents.push("codex");
+  if (existsSync8(join8(dir, "CLAUDE.md")) || existsSync8(join8(dir, ".claude", "skills"))) agents.push("claude");
+  if (existsSync8(join8(dir, ".cursorrules")) || existsSync8(join8(dir, ".cursor", "rules"))) agents.push("cursor");
+  if (existsSync8(join8(dir, ".codex")) || existsSync8(join8(dir, ".agents", "skills"))) agents.push("codex");
   return agents.length > 0 ? agents : ["claude"];
 }
 function computeLocalScore(dir, targetAgent) {
@@ -4391,8 +4506,8 @@ function displayScoreDelta(before, after) {
 import chalk7 from "chalk";
 import ora from "ora";
 import select4 from "@inquirer/select";
-import { mkdirSync, readFileSync as readFileSync7, readdirSync as readdirSync5, existsSync as existsSync9, writeFileSync } from "fs";
-import { join as join8, dirname as dirname2 } from "path";
+import { mkdirSync, readFileSync as readFileSync8, readdirSync as readdirSync5, existsSync as existsSync9, writeFileSync } from "fs";
+import { join as join9, dirname as dirname2 } from "path";
 
 // src/scanner/index.ts
 import fs21 from "fs";
@@ -4711,19 +4826,19 @@ function detectLocalPlatforms() {
 }
 function getSkillPath(platform, slug) {
   if (platform === "cursor") {
-    return join8(".cursor", "skills", slug, "SKILL.md");
+    return join9(".cursor", "skills", slug, "SKILL.md");
   }
   if (platform === "codex") {
-    return join8(".agents", "skills", slug, "SKILL.md");
+    return join9(".agents", "skills", slug, "SKILL.md");
   }
-  return join8(".claude", "skills", slug, "SKILL.md");
+  return join9(".claude", "skills", slug, "SKILL.md");
 }
 function getInstalledSkills() {
   const installed = /* @__PURE__ */ new Set();
   const dirs = [
-    join8(process.cwd(), ".claude", "skills"),
-    join8(process.cwd(), ".cursor", "skills"),
-    join8(process.cwd(), ".agents", "skills")
+    join9(process.cwd(), ".claude", "skills"),
+    join9(process.cwd(), ".cursor", "skills"),
+    join9(process.cwd(), ".agents", "skills")
   ];
   for (const dir of dirs) {
     try {
@@ -4924,10 +5039,10 @@ Already installed skills: ${Array.from(installed).join(", ")}`);
   return parts.join("\n");
 }
 function extractTopDeps() {
-  const pkgPath = join8(process.cwd(), "package.json");
+  const pkgPath = join9(process.cwd(), "package.json");
   if (!existsSync9(pkgPath)) return [];
   try {
-    const pkg3 = JSON.parse(readFileSync7(pkgPath, "utf-8"));
+    const pkg3 = JSON.parse(readFileSync8(pkgPath, "utf-8"));
     const deps = Object.keys(pkg3.dependencies ?? {});
     const trivial = /* @__PURE__ */ new Set([
       "typescript",
@@ -5233,7 +5348,7 @@ async function installSkills(recs, platforms, contentMap) {
     if (!content) continue;
     for (const platform of platforms) {
       const skillPath = getSkillPath(platform, rec.slug);
-      const fullPath = join8(process.cwd(), skillPath);
+      const fullPath = join9(process.cwd(), skillPath);
       mkdirSync(dirname2(fullPath), { recursive: true });
       writeFileSync(fullPath, content, "utf-8");
       installed.push(`[${platform}] ${skillPath}`);
@@ -5427,7 +5542,7 @@ async function initCommand(options) {
 `));
   if (report) {
     report.markStep("Fingerprint");
-    report.addJson("Fingerprint: Git", { remote: fingerprint.remote, packageName: fingerprint.packageName });
+    report.addJson("Fingerprint: Git", { remote: fingerprint.gitRemoteUrl, packageName: fingerprint.packageName });
     report.addCodeBlock("Fingerprint: File Tree", fingerprint.fileTree.join("\n"));
     report.addJson("Fingerprint: Detected Stack", { languages: fingerprint.languages, frameworks: fingerprint.frameworks, tools: fingerprint.tools });
     report.addJson("Fingerprint: Existing Configs", fingerprint.existingConfigs);
@@ -5458,11 +5573,18 @@ async function initCommand(options) {
 
 | Check | Passed | Points | Max |
 |-------|--------|--------|-----|
-` + baselineScore.checks.map((c) => `| ${c.name} | ${c.passed ? "Yes" : "No"} | ${c.points} | ${c.maxPoints} |`).join("\n"));
+` + baselineScore.checks.map((c) => `| ${c.name} | ${c.passed ? "Yes" : "No"} | ${c.earnedPoints} | ${c.maxPoints} |`).join("\n"));
     report.addSection("Generation: Target Agents", targetAgent.join(", "));
   }
   const hasExistingConfig = !!(fingerprint.existingConfigs.claudeMd || fingerprint.existingConfigs.claudeSettings || fingerprint.existingConfigs.claudeSkills?.length || fingerprint.existingConfigs.cursorrules || fingerprint.existingConfigs.cursorRules?.length || fingerprint.existingConfigs.agentsMd);
-  const NON_LLM_CHECKS = /* @__PURE__ */ new Set(["hooks_configured", "agents_md_exists", "permissions_configured", "mcp_servers"]);
+  const NON_LLM_CHECKS = /* @__PURE__ */ new Set([
+    "hooks_configured",
+    "agents_md_exists",
+    "permissions_configured",
+    "mcp_servers",
+    "service_coverage",
+    "mcp_completeness"
+  ]);
   if (hasExistingConfig && baselineScore.score === 100) {
     trackInitScoreComputed(baselineScore.score, passingCount, failingCount, true);
     console.log(chalk8.bold.green("  Your setup is already optimal \u2014 nothing to change.\n"));
@@ -5526,6 +5648,7 @@ async function initCommand(options) {
   genMessages.start();
   let generatedSetup = null;
   let rawOutput;
+  let genStopReason;
   try {
     const result = await generateSetup(
       fingerprint,
@@ -5551,15 +5674,18 @@ async function initCommand(options) {
       generatedSetup = result.setup;
       rawOutput = result.raw;
     }
+    genStopReason = result.stopReason;
   } catch (err) {
     genMessages.stop();
     const msg = err instanceof Error ? err.message : "Unknown error";
     genSpinner.fail(`Generation failed: ${msg}`);
+    writeErrorLog(config, void 0, msg, "exception");
     throw new Error("__exit__");
   }
   genMessages.stop();
   if (!generatedSetup) {
     genSpinner.fail("Failed to generate setup.");
+    writeErrorLog(config, rawOutput, void 0, genStopReason);
     if (rawOutput) {
       console.log(chalk8.dim("\nRaw LLM output (JSON parse failed):"));
       console.log(chalk8.dim(rawOutput.slice(0, 500)));
@@ -5702,7 +5828,44 @@ async function initCommand(options) {
   if (hookChoice === "skip") {
     console.log(chalk8.dim("  Skipped auto-refresh hooks. Run ") + chalk8.hex("#83D1EB")("caliber hooks --install") + chalk8.dim(" later to enable."));
   }
-  const afterScore = computeLocalScore(process.cwd(), targetAgent);
+  let afterScore = computeLocalScore(process.cwd(), targetAgent);
+  if (afterScore.score < 100) {
+    const polishFailingChecks = afterScore.checks.filter((c) => !c.passed && c.maxPoints > 0).filter((c) => !NON_LLM_CHECKS.has(c.id));
+    if (polishFailingChecks.length > 0) {
+      console.log("");
+      console.log(chalk8.dim(`  Score: ${afterScore.score}/100 \u2014 polishing ${polishFailingChecks.length} remaining check${polishFailingChecks.length === 1 ? "" : "s"}...`));
+      const polishFailing = polishFailingChecks.map((c) => ({
+        name: c.name,
+        suggestion: c.suggestion
+      }));
+      const polishPassing = afterScore.checks.filter((c) => c.passed).map((c) => ({ name: c.name }));
+      try {
+        const polishResult = await generateSetup(
+          fingerprint,
+          targetAgent,
+          void 0,
+          {
+            onStatus: () => {
+            },
+            onComplete: () => {
+            },
+            onError: () => {
+            }
+          },
+          polishFailing,
+          afterScore.score,
+          polishPassing
+        );
+        if (polishResult.setup) {
+          const polishWriteResult = writeSetup(polishResult.setup);
+          if (polishWriteResult.written.length > 0) {
+            afterScore = computeLocalScore(process.cwd(), targetAgent);
+          }
+        }
+      } catch {
+      }
+    }
+  }
   if (afterScore.score < baselineScore.score) {
     trackInitScoreRegression(baselineScore.score, afterScore.score);
     console.log("");
@@ -5723,7 +5886,7 @@ async function initCommand(options) {
 
 | Check | Passed | Points | Max |
 |-------|--------|--------|-----|
-` + afterScore.checks.map((c) => `| ${c.name} | ${c.passed ? "Yes" : "No"} | ${c.points} | ${c.maxPoints} |`).join("\n"));
+` + afterScore.checks.map((c) => `| ${c.name} | ${c.passed ? "Yes" : "No"} | ${c.earnedPoints} | ${c.maxPoints} |`).join("\n"));
   }
   displayScoreDelta(baselineScore, afterScore);
   console.log(title.bold("\n  Step 6/6 \u2014 Community skills\n"));
@@ -5756,6 +5919,9 @@ async function initCommand(options) {
   console.log(`    ${title("caliber skills")}         Discover community skills for your stack`);
   console.log(`    ${title("caliber undo")}         Revert all changes from this run`);
   console.log("");
+  if (options.showTokens) {
+    displayTokenUsage();
+  }
   if (report) {
     report.markStep("Finished");
     const reportPath = path19.join(process.cwd(), ".caliber", "debug-report.md");
@@ -6032,6 +6198,45 @@ function ensurePermissions() {
   if (!fs24.existsSync(".claude")) fs24.mkdirSync(".claude", { recursive: true });
   fs24.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
 }
+function displayTokenUsage() {
+  const summary = getUsageSummary();
+  if (summary.length === 0) return;
+  console.log(chalk8.bold("  Token usage:\n"));
+  let totalIn = 0;
+  let totalOut = 0;
+  for (const m of summary) {
+    totalIn += m.inputTokens;
+    totalOut += m.outputTokens;
+    const cacheInfo = m.cacheReadTokens > 0 || m.cacheWriteTokens > 0 ? chalk8.dim(` (cache: ${m.cacheReadTokens.toLocaleString()} read, ${m.cacheWriteTokens.toLocaleString()} write)`) : "";
+    console.log(`    ${chalk8.dim(m.model)}: ${m.inputTokens.toLocaleString()} in / ${m.outputTokens.toLocaleString()} out  (${m.calls} call${m.calls === 1 ? "" : "s"})${cacheInfo}`);
+  }
+  if (summary.length > 1) {
+    console.log(`    ${chalk8.dim("Total")}: ${totalIn.toLocaleString()} in / ${totalOut.toLocaleString()} out`);
+  }
+  console.log("");
+}
+function writeErrorLog(config, rawOutput, error, stopReason) {
+  try {
+    const logPath = path19.join(process.cwd(), ".caliber", "error-log.md");
+    const lines = [
+      `# Generation Error \u2014 ${(/* @__PURE__ */ new Date()).toISOString()}`,
+      "",
+      `**Provider**: ${config.provider}`,
+      `**Model**: ${config.model}`,
+      `**Stop reason**: ${stopReason || "unknown"}`,
+      ""
+    ];
+    if (error) {
+      lines.push("## Error", "```", error, "```", "");
+    }
+    lines.push("## Raw LLM Output", "```", rawOutput || "(empty)", "```");
+    fs24.mkdirSync(path19.join(process.cwd(), ".caliber"), { recursive: true });
+    fs24.writeFileSync(logPath, lines.join("\n"));
+    console.log(chalk8.dim(`
+  Error log written to .caliber/error-log.md`));
+  } catch {
+  }
+}
 
 // src/commands/undo.ts
 import chalk9 from "chalk";
@@ -7196,7 +7401,7 @@ function parseAgentOption(value) {
   }
   return agents;
 }
-program.command("init").description("Initialize your project for AI-assisted development").option("--agent <type>", "Target agents (comma-separated): claude, cursor, codex", parseAgentOption).option("--dry-run", "Preview changes without writing files").option("--force", "Overwrite existing setup without prompting").option("--debug-report", void 0, false).action(tracked("init", initCommand));
+program.command("init").description("Initialize your project for AI-assisted development").option("--agent <type>", "Target agents (comma-separated): claude, cursor, codex", parseAgentOption).option("--dry-run", "Preview changes without writing files").option("--force", "Overwrite existing setup without prompting").option("--debug-report", void 0, false).option("--show-tokens", "Show token usage summary at the end").action(tracked("init", initCommand));
 program.command("undo").description("Revert all config changes made by Caliber").action(tracked("undo", undoCommand));
 program.command("status").description("Show current Caliber setup status").option("--json", "Output as JSON").action(tracked("status", statusCommand));
 program.command("regenerate").alias("regen").alias("re").description("Re-analyze project and regenerate setup").option("--dry-run", "Preview changes without writing files").action(tracked("regenerate", regenerateCommand));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rely-ai/caliber",
-  "version": "1.7.9",
+  "version": "1.9.0",
   "description": "Analyze your codebase and generate optimized AI agent configs (CLAUDE.md, .cursorrules, skills) — no API key needed",
   "type": "module",
   "bin": {