instrlint 0.1.3 → 0.1.5

package/dist/cli.cjs

@@ -815,8 +815,12 @@ function analyzeBudget(instructions) {
       autoFixable: false
     });
   }
-  const { tokens: rulesTokens, method: rulesMethod } = sumTokens(instructions.rules);
-  const { tokens: skillsTokens, method: skillsMethod } = sumTokens(instructions.skills);
+  const { tokens: rulesTokens, method: rulesMethod } = sumTokens(
+    instructions.rules
+  );
+  const { tokens: skillsTokens, method: skillsMethod } = sumTokens(
+    instructions.skills
+  );
   const { tokens: subFilesTokens, method: subFilesMethod } = sumTokens(
     instructions.subFiles
   );
@@ -854,11 +858,18 @@ function analyzeBudget(instructions) {
       autoFixable: false
     });
   }
-  const tokenMethod = [rootFileMethod, rulesMethod, skillsMethod, subFilesMethod].every(
-    (m) => m === "measured"
-  ) ? "measured" : "estimated";
+  const tokenMethod = [
+    rootFileMethod,
+    rulesMethod,
+    skillsMethod,
+    subFilesMethod
+  ].every((m) => m === "measured") ? "measured" : "estimated";
   const fileBreakdown = [
-    { path: instructions.rootFile.path, tokenCount: rootFileTokens, tokenMethod: rootFileMethod },
+    {
+      path: instructions.rootFile.path,
+      tokenCount: rootFileTokens,
+      tokenMethod: rootFileMethod
+    },
     ...instructions.rules.map((r) => ({
       path: r.path,
       tokenCount: r.tokenCount,
@@ -878,6 +889,7 @@ function analyzeBudget(instructions) {
   const summary = {
     systemPromptTokens: SYSTEM_PROMPT_TOKENS,
     rootFileTokens,
+    rootFileLines: rootLines,
     rootFileMethod,
     rulesTokens,
     rulesMethod,
@@ -1454,6 +1466,8 @@ var INFO_DEDUCTION = 1;
 var MAX_CRITICAL_DEDUCTION = 40;
 var MAX_WARNING_DEDUCTION = 30;
 var MAX_INFO_DEDUCTION = 10;
+var MAX_ROOT_FILE_PENALTY = 30;
+var MAX_BUDGET_DEDUCTION = 30;
 function gradeFromScore(score) {
   if (score >= 90) return "A";
   if (score >= 80) return "B";
@@ -1465,16 +1479,32 @@ function calculateScore(findings, budget) {
   const criticals = findings.filter((f) => f.severity === "critical").length;
   const warnings = findings.filter((f) => f.severity === "warning").length;
   const infos = findings.filter((f) => f.severity === "info").length;
-  const criticalDeduction = Math.min(criticals * CRITICAL_DEDUCTION, MAX_CRITICAL_DEDUCTION);
-  const warningDeduction = Math.min(warnings * WARNING_DEDUCTION, MAX_WARNING_DEDUCTION);
+  const criticalDeduction = Math.min(
+    criticals * CRITICAL_DEDUCTION,
+    MAX_CRITICAL_DEDUCTION
+  );
+  const warningDeduction = Math.min(
+    warnings * WARNING_DEDUCTION,
+    MAX_WARNING_DEDUCTION
+  );
   const infoDeduction = Math.min(infos * INFO_DEDUCTION, MAX_INFO_DEDUCTION);
+  const rootLines = budget.rootFileLines;
+  let rootFilePenalty = 0;
+  if (rootLines > 400) {
+    rootFilePenalty = 10 + Math.floor((rootLines - 400) / 100) * 5;
+  } else if (rootLines > 200) {
+    rootFilePenalty = 5 + Math.floor((rootLines - 200) / 100) * 3;
+  }
+  rootFilePenalty = Math.min(rootFilePenalty, MAX_ROOT_FILE_PENALTY);
   const baselinePct = budget.totalBaseline / CONTEXT_WINDOW2;
   let budgetDeduction = 0;
-  if (baselinePct > 0.5) budgetDeduction = 15;
-  else if (baselinePct > 0.25) budgetDeduction = 5;
+  if (baselinePct > 0.25) {
+    budgetDeduction = 5 + Math.floor((baselinePct - 0.25) * 40);
+  }
+  budgetDeduction = Math.min(budgetDeduction, MAX_BUDGET_DEDUCTION);
   const score = Math.max(
     0,
-    100 - criticalDeduction - warningDeduction - infoDeduction - budgetDeduction
+    100 - criticalDeduction - warningDeduction - infoDeduction - rootFilePenalty - budgetDeduction
   );
   return { score, grade: gradeFromScore(score) };
 }
@@ -1586,6 +1616,8 @@ var en_default = {
   "markdown.budgetIssues": "Budget Issues",
   "markdown.refactoringOpportunities": "Refactoring Opportunities",
   "markdown.lineRef": "(line {{line}})",
+  "markdown.budgetCategory": "Category",
+  "markdown.budgetTokens": "Tokens",
   "markdown.actionPlan": "## Action Plan",
   "markdown.attribution": "*Generated by [instrlint](https://github.com/jed1978/instrlint)*",
   "ci.passed": "\u2713 instrlint passed  score={{score}} grade={{grade}}",
@@ -1691,6 +1723,8 @@ var zh_TW_default = {
   "markdown.budgetIssues": "Token \u9810\u7B97\u554F\u984C",
   "markdown.refactoringOpportunities": "\u91CD\u69CB\u5EFA\u8B70",
   "markdown.lineRef": "\uFF08\u7B2C {{line}} \u884C\uFF09",
+  "markdown.budgetCategory": "\u985E\u5225",
+  "markdown.budgetTokens": "Token \u6578",
   "markdown.actionPlan": "## \u884C\u52D5\u8A08\u756B",
   "markdown.attribution": "*\u7531 [instrlint](https://github.com/jed1978/instrlint) \u751F\u6210*",
   "ci.passed": "\u2713 instrlint \u901A\u904E  \u5206\u6578={{score}} \u7B49\u7D1A={{grade}}",
@@ -2034,15 +2068,25 @@ function mdSeverityIcon(f) {
   if (f.severity === "warning") return "\u{1F7E1}";
   return "\u2139\uFE0F";
 }
+function mdBar(fraction, width = 20) {
+  const filled = Math.round(Math.min(1, Math.max(0, fraction)) * width);
+  const empty = width - filled;
+  return "`" + "\u2588".repeat(filled) + "\u2591".repeat(empty) + "`";
+}
+function mdFormatTokens(count, method) {
+  const fmt = new Intl.NumberFormat(getLocale());
+  return method === "estimated" ? `~${fmt.format(count)}` : fmt.format(count);
+}
 function reportMarkdown(report, extraSections = []) {
-  const { project, tool, score, grade, findings } = report;
+  const { project, tool, score, grade, findings, budget } = report;
   const criticals = findings.filter((f) => f.severity === "critical").length;
   const warnings = findings.filter((f) => f.severity === "warning").length;
   const infos = findings.filter((f) => f.severity === "info").length;
+  const gradeEmoji = grade === "A" ? "\u{1F7E2}" : grade === "B" ? "\u{1F535}" : grade === "C" ? "\u{1F7E1}" : grade === "D" ? "\u{1F7E0}" : "\u{1F534}";
   const lines = [
     `# ${t("markdown.title", { project })}`,
     "",
-    t("markdown.scoreLine", { score: String(score), grade, tool }),
+    `${gradeEmoji} **${score}/100 (${grade})** ${mdBar(score / 100, 25)} \xB7 \`${tool}\``,
     "",
     t("markdown.summary"),
     "",
@@ -2053,6 +2097,58 @@ function reportMarkdown(report, extraSections = []) {
     `| ${t("markdown.info")} | ${infos} |`,
     ""
   ];
+  const window = budget.totalBaseline + budget.availableTokens;
+  const budgetRows = [
+    {
+      labelKey: "label.systemPrompt",
+      tokens: budget.systemPromptTokens,
+      method: "estimated"
+    },
+    {
+      labelKey: "label.rootFile",
+      tokens: budget.rootFileTokens,
+      method: budget.rootFileMethod
+    },
+    {
+      labelKey: "label.ruleFiles",
+      tokens: budget.rulesTokens,
+      method: budget.rulesMethod
+    },
+    {
+      labelKey: "label.skillFiles",
+      tokens: budget.skillsTokens,
+      method: budget.skillsMethod
+    },
+    {
+      labelKey: "label.subDirFiles",
+      tokens: budget.subFilesTokens,
+      method: budget.subFilesMethod
+    },
+    {
+      labelKey: "label.mcpServers",
+      tokens: budget.mcpTokens,
+      method: "estimated"
+    }
+  ].filter((r) => r.tokens > 0);
+  lines.push(`## ${t("label.tokenBudget")}`, "");
+  lines.push(
+    `| ${t("markdown.budgetCategory")} | ${t("markdown.budgetTokens")} | % | |`,
+    "|------|--------|---|---|"
+  );
+  for (const row of budgetRows) {
+    const pctVal = Math.round(row.tokens / window * 100);
+    lines.push(
+      `| ${t(row.labelKey)} | ${mdFormatTokens(row.tokens, row.method)} | ${pctVal}% | ${mdBar(row.tokens / window, 12)} |`
+    );
+  }
+  const baselinePct = Math.round(budget.totalBaseline / window * 100);
+  lines.push(
+    `| **${t("label.baselineTotal")}** | **${mdFormatTokens(budget.totalBaseline, budget.tokenMethod)}** | **${baselinePct}%** | ${mdBar(budget.totalBaseline / window, 12)} |`
+  );
+  lines.push(
+    `| ${t("label.available")} | ${mdFormatTokens(budget.availableTokens, "estimated")} | ${100 - baselinePct}% | |`
+  );
+  lines.push("");
   const categories = [
     {
       labelKey: "markdown.contradictions",
@@ -2303,7 +2399,21 @@ function markdownStructureSuggestions(suggestions, projectRoot) {
 var import_fs10 = require("fs");
 var import_path8 = require("path");
 var import_os = require("os");
-var CURRENT_VERSION = "0.1.3";
+var import_url = require("url");
+function readPackageVersion() {
+  const thisFile = (0, import_url.fileURLToPath)(importMetaUrl);
+  for (const levels of [2, 3]) {
+    const pkgPath = (0, import_path8.join)(thisFile, ...Array(levels).fill(".."), "package.json");
+    if ((0, import_fs10.existsSync)(pkgPath)) {
+      const raw = JSON.parse((0, import_fs10.readFileSync)(pkgPath, "utf8"));
+      if (typeof raw === "object" && raw !== null && "version" in raw && typeof raw.version === "string") {
+        return raw.version;
+      }
+    }
+  }
+  return "0.0.0";
+}
+var CURRENT_VERSION = readPackageVersion();
 var VERSION_RE = /^instrlint-version:\s*(.+)$/m;
 function extractVersion(content) {
   const m = VERSION_RE.exec(content);
@@ -2342,17 +2452,30 @@ function checkSkillUpdate(projectRoot) {
   return null;
 }
 function injectVersion(content, version) {
-  return content.replace(/^(---\n[\s\S]*?)(---)$/m, `$1instrlint-version: ${version}
-$2`);
+  if (/^instrlint-version:/m.test(content)) {
+    return content.replace(
+      /^instrlint-version:.*$/m,
+      `instrlint-version: ${version}`
+    );
+  }
+  const updated = content.replace(
+    /^(---\n[\s\S]*?)(---)$/m,
+    `$1instrlint-version: ${version}
+$2`
+  );
+  if (updated === content) {
+    throw new Error("injectVersion: no YAML frontmatter found in skill file");
+  }
+  return updated;
 }
 
 // src/commands/install-command.ts
 var import_fs11 = require("fs");
 var import_path9 = require("path");
 var import_os2 = require("os");
-var import_url = require("url");
+var import_url2 = require("url");
 function resolveSkillFile(target) {
-  const thisFile = (0, import_url.fileURLToPath)(importMetaUrl);
+  const thisFile = (0, import_url2.fileURLToPath)(importMetaUrl);
   const subDir = target === "claude-code" ? "claude-code" : "codex";
   for (const levels of [2, 3]) {
     const parts = Array(levels).fill("..");
@@ -2540,12 +2663,9 @@ async function runAll(opts, output = console) {
     output.log(
       `  ${import_chalk4.default.yellow("\u26A0")}  ${import_chalk4.default.bold(t("install.outdatedTitle"))} (${t("install.outdatedVersions", { installed: skillUpdate.installedVersion, current: skillUpdate.currentVersion })})`
     );
-    const confirmed = await promptYesNo(
-      `  ${t("install.updatePrompt")}`,
-      output
-    );
+    const confirmed = await promptYesNo(`  ${t("install.updatePrompt")}`);
     if (confirmed) {
-      runInstall(
+      const installResult = runInstall(
         {
           claudeCode: true,
           project: skillUpdate.isProject,
@@ -2554,12 +2674,17 @@ async function runAll(opts, output = console) {
         },
         output
       );
+      if (installResult.exitCode !== 0) {
+        output.error?.(
+          `Update failed: ${installResult.errorMessage ?? "unknown error"}`
+        );
+      }
     }
     output.log("");
   }
   return { exitCode: 0 };
 }
-function promptYesNo(question, output) {
+function promptYesNo(question) {
   return new Promise((resolve) => {
     const rl = (0, import_readline.createInterface)({
       input: process.stdin,
@@ -2967,7 +3092,7 @@ function runInitCi(opts, output = console) {
 var program = new import_commander.Command();
 program.enablePositionalOptions().name("instrlint").description(
   "Lint and optimize your CLAUDE.md / AGENTS.md \u2014 find dead rules, token waste, and structural issues"
-).version("0.1.0").option(
+).version(CURRENT_VERSION).option(
   "--format <type>",
   "output format (terminal|json|markdown)",
   "terminal"