claude-slim 2.2.0 → 2.2.2

package/dist/cleaner.js

@@ -11,6 +11,20 @@ async function pathExists(p) {
         return false;
     }
 }
+// Record the manifest entry; if it fails, run the caller's compensation to
+// undo the filesystem side effect so we never leave an untracked orphan.
+async function recordOrRollback(entry, rollback) {
+    try {
+        await appendManifest(entry);
+    }
+    catch (err) {
+        try {
+            await rollback();
+        }
+        catch { /* best-effort */ }
+        throw err;
+    }
+}
 export async function cleanIssues(issues) {
     await ensureDisabledDir();
     const disabledDir = getDisabledDir();
@@ -29,6 +43,7 @@ export async function cleanIssues(issues) {
                     tokenCount: issue.tokens,
                     tier: issue.tier,
                 };
+                // unlink is not reversible; best-effort append only
                 await appendManifest(entry);
                 moved.push(entry);
             }
@@ -48,7 +63,7 @@ export async function cleanIssues(issues) {
                     tokenCount: issue.tokens,
                     tier: issue.tier,
                 };
-                await appendManifest(entry);
+                await recordOrRollback(entry, () => rename(dest, issue.path));
                 moved.push(entry);
             }
             else if (issue.type === 'temp_cache') {
@@ -62,6 +77,7 @@ export async function cleanIssues(issues) {
                     tokenCount: 0,
                     tier: issue.tier,
                 };
+                // rm is not reversible; best-effort append only
                 await appendManifest(entry);
                 moved.push(entry);
             }
@@ -84,7 +100,7 @@ export async function cleanIssues(issues) {
                     tokenCount: issue.tokens,
                     tier: issue.tier,
                 };
-                await appendManifest(entry);
+                await recordOrRollback(entry, () => rename(backupDir, issue.path));
                 moved.push(entry);
             }
             else if (issue.type === 'oversized_memory' || issue.type === 'disabled_plugin') {

package/dist/cli.js

@@ -1,17 +1,22 @@
 #!/usr/bin/env node
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
 import { createInterface } from 'node:readline';
 import { Command } from 'commander';
 import { initTokenizer, flushCache } from './tokenizer.js';
-import { scan } from './scanner.js';
+import { scan, SKILL_PROMPT_OVERHEAD_TOKENS } from './scanner.js';
 import { cleanIssues, restoreItem } from './cleaner.js';
 import { readManifest } from './manifest.js';
 import { formatScanSummary, formatReportBox, calculateReport, } from './report.js';
 import { resolveSelection, resolveRestoreSelection } from './selection.js';
+const pkgPath = join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
+const { version: PKG_VERSION } = JSON.parse(readFileSync(pkgPath, 'utf-8'));
 const program = new Command();
 program
     .name('claude-slim')
     .description('Analyze and reduce Claude Code token overhead')
-    .version('2.2.0');
+    .version(PKG_VERSION);
 // --- scan ---
 program
     .command('scan')
@@ -116,17 +121,30 @@ program
         return;
     }
     const sessionsPerDay = parseInt(opts.sessionsPerDay, 10) || 2;
-    // Reconstruct "before" state: current + what was removed
-    const removedSkillCount = movedEntries.filter((e) => e.type !== 'oversized_memory').length;
-    const totalBefore = result.totalTokensBefore + removedSkillCount * 30;
+    // Reconstruct "before" state: current + what was removed.
+    // Only skill-type entries contributed to the per-skill prompt overhead
+    // (stale_project restores memory tokens separately; broken_symlink/
+    // temp_cache never counted toward totalTokensBefore).
+    const SKILL_TYPES = new Set(['template', 'duplicate', 'skill_dup', 'oversized_skill']);
+    const removedSkillEntries = movedEntries.filter((e) => SKILL_TYPES.has(e.type));
+    const removedMemoryTokens = movedEntries
+        .filter((e) => e.type === 'stale_project')
+        .reduce((sum, e) => sum + (e.tokenCount || 0), 0);
+    const totalBefore = result.totalTokensBefore
+        + removedSkillEntries.length * SKILL_PROMPT_OVERHEAD_TOKENS
+        + removedMemoryTokens;
     const pseudoBefore = {
         ...result,
         totalTokensBefore: totalBefore,
         localSkills: [
             ...result.localSkills,
-            ...movedEntries
-                .filter((e) => e.type !== 'oversized_memory')
-                .map((e) => ({ name: e.name, path: e.from, sizeBytes: 0, tokens: e.tokenCount || 0, source: 'local' })),
+            ...removedSkillEntries.map((e) => ({
+                name: e.name,
+                path: e.from,
+                sizeBytes: 0,
+                tokens: e.tokenCount || 0,
+                source: 'local',
+            })),
         ],
     };
     const reportData = calculateReport(pseudoBefore, result, movedEntries, sessionsPerDay);

package/dist/report.d.ts

@@ -18,6 +18,6 @@ export interface ReportData {
     sessionsPerDay: number;
     breakdown: BreakdownRow[];
 }
-export declare function calculateReport(scanBefore: ScanResult, scanAfter: ScanResult | null, movedEntries: ManifestEntry[], sessionsPerDay?: number): ReportData;
+export declare function calculateReport(scanBefore: ScanResult, scanAfter: ScanResult, movedEntries: ManifestEntry[], sessionsPerDay?: number): ReportData;
 export declare function formatReportBox(data: ReportData): string;
 export declare function formatScanSummary(result: ScanResult): string;

package/dist/report.js

@@ -6,7 +6,7 @@ const SESSIONS_PER_DAY_DEFAULT = 2;
 const PRICE_PER_1K_TOKENS = 0.003; // Claude Sonnet input price
 export function calculateReport(scanBefore, scanAfter, movedEntries, sessionsPerDay = SESSIONS_PER_DAY_DEFAULT) {
     const before = scanBefore.totalTokensBefore;
-    const after = scanAfter ? scanAfter.totalTokensBefore : before;
+    const after = scanAfter.totalTokensBefore;
     // Use actual scan difference for accurate savings, not SKILL.md file sizes
     const saved = before - after;
     const percent = before > 0 ? (saved / before) * 100 : 0;
@@ -18,15 +18,11 @@ export function calculateReport(scanBefore, scanAfter, movedEntries, sessionsPer
     const monthlySavings = (saved / 1000) * PRICE_PER_1K_TOKENS * sessionsPerDay * 30;
     // Breakdown rows
     const localBefore = scanBefore.localSkills.length;
-    const localAfter = scanAfter ? scanAfter.localSkills.length : localBefore - movedEntries.filter((e) => e.type !== 'oversized_memory').length;
+    const localAfter = scanAfter.localSkills.length;
     const promptBefore = scanBefore.localSkills.length + scanBefore.pluginSkills.length;
-    const promptAfter = scanAfter
-        ? scanAfter.localSkills.length + scanAfter.pluginSkills.length
-        : promptBefore - movedEntries.filter((e) => e.type !== 'oversized_memory').length;
+    const promptAfter = scanAfter.localSkills.length + scanAfter.pluginSkills.length;
     const memBefore = scanBefore.memoryFiles.reduce((s, m) => s + m.sizeBytes, 0);
-    const memAfter = scanAfter
-        ? scanAfter.memoryFiles.reduce((s, m) => s + m.sizeBytes, 0)
-        : memBefore;
+    const memAfter = scanAfter.memoryFiles.reduce((s, m) => s + m.sizeBytes, 0);
     const breakdown = [
         {
             label: 'Local skills',
@@ -207,6 +203,8 @@ export function formatScanSummary(result) {
         lines.push('');
         const tierLabels = { 1: 'Auto', 2: 'Recommended', 3: 'Optional' };
         const tierColors = { 1: '31', 2: '33', 3: '37' };
+        // These actions delete or unlink — they cannot be restored via `claude-slim restore`.
+        const permanentTypes = new Set(['temp_cache', 'broken_symlink']);
         for (let i = 0; i < result.issues.length; i++) {
             const issue = result.issues[i];
             const selected = issue.tier === 1 ? '\u2713' : '\u25cb';
@@ -214,7 +212,8 @@ export function formatScanSummary(result) {
             const color = tierColors[issue.tier] || '37';
             const detail = issue.detail ? ` (${issue.detail})` : '';
             const tokStr = issue.tokens > 0 ? ` ~${issue.tokens.toLocaleString()} tok` : '';
-            lines.push(`  ${selected} ${i + 1}. \x1b[${color}m[${tierLabel}]\x1b[0m ${issue.type}: ${issue.name}${detail}${tokStr}`);
+            const permanent = permanentTypes.has(issue.type) ? ' \x1b[31m(permanent)\x1b[0m' : '';
+            lines.push(`  ${selected} ${i + 1}. \x1b[${color}m[${tierLabel}]\x1b[0m ${issue.type}: ${issue.name}${detail}${tokStr}${permanent}`);
         }
     }
     lines.push('');

package/dist/scanner.d.ts

@@ -1,9 +1,11 @@
 import type { ScanResult, SkillInfo } from './types.js';
+export declare const SKILL_PROMPT_OVERHEAD_TOKENS = 30;
 interface SkillCandidate {
     skill: SkillInfo;
     realMdPath: string;
 }
 export declare function dedupeBySymlink(candidates: SkillCandidate[]): SkillInfo[];
+export declare function parseDisabledPlugins(output: string): Set<string>;
 export declare function parseClaudeMdSections(content: string): Array<{
     name: string;
     sizeBytes: number;

package/dist/scanner.js

@@ -3,6 +3,9 @@ import { join } from 'node:path';
 import { countTokensCached } from './tokenizer.js';
 import { getClaudeDir, getSkillsDir, getPluginsDir, getProjectsDir } from './paths.js';
 const STALE_DAYS = 90;
+const OVERSIZED_SKILL_BYTES = 10240;
+const OVERSIZED_MEMORY_BYTES = 5120;
+export const SKILL_PROMPT_OVERHEAD_TOKENS = 30;
 async function safeReadFile(p) {
     try {
         return await readFile(p, 'utf-8');
@@ -73,7 +76,9 @@ async function getDirSize(dir) {
     }
     return total;
 }
-// Content cache: avoids re-reading files during classification
+// Content cache: avoids re-reading files during classification.
+// Reset on every scan() so repeat invocations (e.g. pre/post-cleanup) do
+// not accumulate entries for paths that no longer exist.
 const contentCache = new Map();
 async function resolveRealPath(p) {
     try {
@@ -279,11 +284,10 @@ async function scanMemoryFiles() {
     await Promise.all(scanPromises);
     return { memoryFiles, staleProjects };
 }
-async function getDisabledPlugins() {
-    const output = await runCommand('claude plugin list');
-    if (!output)
-        return new Set();
+export function parseDisabledPlugins(output) {
     const disabled = new Set();
+    if (!output)
+        return disabled;
     let currentName = null;
     for (const line of output.split('\n')) {
         const trimmed = line.trim();
@@ -302,6 +306,9 @@ async function getDisabledPlugins() {
     }
     return disabled;
 }
+async function getDisabledPlugins() {
+    return parseDisabledPlugins(await runCommand('claude plugin list'));
+}
 export function parseClaudeMdSections(content) {
     const sections = [];
     const lines = content.split('\n');
@@ -399,8 +406,8 @@ function classifyIssues(localSkills, pluginSkills, brokenSymlinks, memoryFiles,
                 path: skill.path,
             });
         }
-        // Tier 3: oversized skills (>10KB)
-        if (skill.sizeBytes > 10240) {
+        // Tier 3: oversized skills
+        if (skill.sizeBytes > OVERSIZED_SKILL_BYTES) {
             issues.push({
                 type: 'oversized_skill',
                 tier: 3,
@@ -435,9 +442,9 @@ function classifyIssues(localSkills, pluginSkills, brokenSymlinks, memoryFiles,
             path: temp.path,
         });
     }
-    // Tier 2: oversized memory files (>5KB)
+    // Tier 2: oversized memory files
     for (const mem of memoryFiles) {
-        if (mem.sizeBytes > 5120) {
+        if (mem.sizeBytes > OVERSIZED_MEMORY_BYTES) {
             issues.push({
                 type: 'oversized_memory',
                 tier: 2,
@@ -470,7 +477,7 @@ function classifyIssues(localSkills, pluginSkills, brokenSymlinks, memoryFiles,
                 tier: 2,
                 name: plugin.name,
                 detail: `${plugin.skillCount} skills`,
-                tokens: plugin.skillCount * 30,
+                tokens: plugin.skillCount * SKILL_PROMPT_OVERHEAD_TOKENS,
                 path: join(getPluginsDir(), plugin.name),
             });
         }
@@ -480,6 +487,7 @@ function classifyIssues(localSkills, pluginSkills, brokenSymlinks, memoryFiles,
     return issues;
 }
 export async function scan() {
+    contentCache.clear();
     const [{ skills: localSkills, brokenSymlinks }, { skills: pluginSkills, plugins, tempCaches }, { memoryFiles, staleProjects }, mcp, disabledPlugins,] = await Promise.all([
         scanLocalSkills(),
         scanPluginSkills(),
@@ -500,7 +508,7 @@ export async function scan() {
     const claudeMdSections = claudeMdContent ? parseClaudeMdSections(claudeMdContent) : [];
     const issues = classifyIssues(localSkills, pluginSkills, brokenSymlinks, memoryFiles, tempCaches, staleProjects, disabledPlugins, plugins);
     // Estimate total tokens at startup
-    const skillListingTokens = (localSkills.length + pluginSkills.length) * 30;
+    const skillListingTokens = (localSkills.length + pluginSkills.length) * SKILL_PROMPT_OVERHEAD_TOKENS;
     const memoryTokens = memoryFiles.reduce((sum, m) => sum + m.tokens, 0);
     const totalTokensBefore = skillListingTokens + claudeMdTokens + memoryTokens;
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-slim",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Analyze and reduce Claude Code token overhead",
   "type": "module",
   "bin": {

package/skills/claude-slim/SKILL.md

@@ -41,26 +41,28 @@ bash "${CLAUDE_PLUGIN_ROOT}/skills/claude-slim/scripts/scan.sh"
 
 After getting the scan JSON, YOU must interpret and present results to the user. Do NOT just dump raw CLI output. Present a full diagnostic report in the user's language.
 
+> **Templates below are shown in English for readability. Always translate headers, labels, and prompts into the user's detected language when rendering.**
+
 ### 2-1. Environment Snapshot Table
 
 Show a summary table:
 
-| 항목 | 수치 | 토큰 |
-|------|------|------|
-| 로컬 스킬 | N개 (XKB) | X tok |
-| 플러그인 | N개 (M 스킬) | ~X tok |
+| Item | Count | Tokens |
+|------|-------|--------|
+| Local skills | N (XKB) | X tok |
+| Plugins | N (M skills) | ~X tok |
 | CLAUDE.md | XKB | X tok |
-| 메모리 파일 | N개 (XKB) | ~X tok |
-| **세션 시작 오버헤드** | | **~X tok** |
+| Memory files | N (XKB) | ~X tok |
+| **Session startup overhead** | | **~X tok** |
 
 ### 2-2. Plugin Detail Table
 
 List each plugin with skill count and a judgment:
 
-| 플러그인 | 스킬 수 | 비고 |
-|----------|:-------:|------|
-| omc | 36 | 코어 플러그인. 유지 |
-| temp_local_... | 1 | **실패한 설치 잔여물. 삭제 대상** |
+| Plugin | Skills | Notes |
+|--------|:------:|-------|
+| omc | 36 | Core plugin. Keep. |
+| temp_local_... | 1 | **Failed install remnant. Cleanup target.** |
 
 Annotate each with status: actively used, possibly unused, or cleanup target. Flag `temp_local_*` entries as failed install remnants.
 
@@ -68,18 +70,18 @@ Annotate each with status: actively used, possibly unused, or cleanup target. Fl
 
 Group issues by tier and explain EACH one with context and recommendation:
 
-**Tier 1 — 즉시 정리 (위험 없음):**
+**Tier 1 — Immediate cleanup (zero risk):**
 These are safe to remove with zero risk: broken symlinks, empty templates, .skill/ duplicates, temp_local_* cache. Pre-selected. Explain why each is safe.
 
-**Tier 2 — 정리 추천:**
+**Tier 2 — Recommended cleanup:**
 These are recommended but need user judgment. For each issue, explain:
 - What is it and why it's flagged
 - What happens if you remove it (safe? any side effects?)
 - How many tokens it saves
 
-Example: "frontend-design이 로컬과 플러그인에 둘 다 있습니다. 로컬 제거해도 플러그인 버전이 남으니 안전하게 제거 가능. ~823 tok 절감."
+Example: "frontend-design exists both locally and in a plugin. Removing the local copy is safe because the plugin version remains. Saves ~823 tok."
 
-**Tier 3 — 선택 사항 (사용자 판단):**
+**Tier 3 — Optional (user judgment):**
 These are large skills that cost tokens but might be in active use. For each:
 - Show size and token cost
 - Judge whether the user likely uses it (based on what it does)
@@ -94,7 +96,7 @@ End with a numbered action list, ordered by impact:
 
 Show estimated total token savings if all recommended actions are taken.
 
-If subcommand is `scan`, stop here. Ask "정리할까요?" only for the full pipeline.
+If subcommand is `scan`, stop here. Ask a localized equivalent of "Proceed with cleanup?" only for the full pipeline.
 
 ---
 
@@ -133,7 +135,7 @@ cd "${CLAUDE_PLUGIN_ROOT}" && node dist/cli.js restore
 
 ## Language
 
-Detect the user's language from their most recent message. Present all reports, analysis, and explanations in that language. The CLI output is machine-readable — translate only the user-facing interpretation.
+Detect the user's language from their most recent message. Present all reports, analysis, and explanations in that language — including table headers, tier labels, prompts, and every user-facing string. The CLI output is machine-readable (always English) and must not be echoed verbatim; translate its content into the user's language when you interpret it. The example tables above are written in English only for authoring clarity — do not treat them as a required output format.
 
 ## Rules