@jeremyy_prt/cc-config 1.1.4 → 1.1.9

package/README.md

@@ -32,8 +32,13 @@ npx @jeremyy_prt/cc-config setup
 **Sécurité:**
 - Hook de validation bash (bloque `rm -rf /`, `sudo`, etc.)
 
+**Statusline:**
+- Branche Git avec modifications (`main*`)
+- Contexte utilisé (`23%`)
+- Limites d'usage (`Session: 45%`)
+- Compatible **Mac ET Windows** ✅
+
 **Bonus:**
-- Statusline avec Git et coûts
 - Sons de notification
 - Hooks configurés
 

package/cli.js

@@ -76,14 +76,25 @@ function mergeSettings() {
 
   console.log('⚙️  Configuration des settings...');
 
+  // Lire et adapter le settings.json selon la plateforme
+  let settingsContent = fs.readFileSync(srcSettings, 'utf-8');
+
+  // Remplacer le wrapper selon la plateforme
+  const isWindows = process.platform === 'win32';
+  const wrapperFile = isWindows ? 'statusline-wrapper.cmd' : 'statusline-wrapper.sh';
+  settingsContent = settingsContent.replace(
+    /statusline-wrapper\.(cmd|sh)/g,
+    wrapperFile
+  );
+
   if (fs.existsSync(destSettings)) {
     console.log('   ⚠️  settings.json existe déjà');
     const examplePath = path.join(CLAUDE_DIR, 'settings.example.json');
-    fs.copyFileSync(srcSettings, examplePath);
+    fs.writeFileSync(examplePath, settingsContent);
     console.log(`   → Copié vers settings.example.json`);
     console.log('   → Merge manuel recommandé');
   } else {
-    fs.copyFileSync(srcSettings, destSettings);
+    fs.writeFileSync(destSettings, settingsContent);
     console.log('   ✓ settings.json installé');
   }
 }
@@ -303,6 +314,18 @@ function setup() {
   // Installer dépendances statusline
   installStatuslineDeps();
 
+  // Rendre le wrapper statusline exécutable sur Mac/Linux
+  if (process.platform !== 'win32') {
+    try {
+      const wrapperPath = path.join(CLAUDE_DIR, 'scripts', 'statusline-wrapper.sh');
+      if (fs.existsSync(wrapperPath)) {
+        execSync(`chmod +x "${wrapperPath}"`, { stdio: 'ignore' });
+      }
+    } catch (err) {
+      // Ignore errors
+    }
+  }
+
   // Afficher résumé
   listInstalled();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeremyy_prt/cc-config",
-  "version": "1.1.4",
+  "version": "1.1.9",
   "description": "Configuration personnalisée pour Claude Code avec commandes et agents en français",
   "main": "index.js",
   "bin": {

package/scripts/statusline/src/index.ts

@@ -142,7 +142,7 @@ async function main() {
 
 		await saveSession(input);
 
-		const git = await getGitStatus();
+		const git = await getGitStatus(input.workspace.current_dir);
 		const branch = formatBranch(git, defaultConfig.git);
 		const dirPath = formatPath(
 			input.workspace.current_dir,

package/scripts/statusline/src/lib/context.ts

@@ -1,4 +1,5 @@
 import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
 
 export interface TokenUsage {
   input_tokens: number;
@@ -23,7 +24,7 @@ export async function getContextLength(
   transcriptPath: string,
 ): Promise<number> {
   try {
-    const content = await Bun.file(transcriptPath).text();
+    const content = await readFile(transcriptPath, "utf-8");
     const lines = content.trim().split("\n");
 
     if (lines.length === 0) return 0;

package/scripts/statusline/src/lib/git.ts

@@ -15,11 +15,12 @@ export interface GitStatus {
 	};
 }
 
-function exec(command: string): { stdout: string; exitCode: number } {
+function exec(command: string, cwd?: string): { stdout: string; exitCode: number } {
 	try {
 		const stdout = execSync(command, {
 			encoding: "utf-8",
 			stdio: ["pipe", "pipe", "pipe"],
+			cwd: cwd || process.cwd(),
 		});
 		return { stdout, exitCode: 0 };
 	} catch (error: any) {
@@ -30,9 +31,9 @@ function exec(command: string): { stdout: string; exitCode: number } {
 	}
 }
 
-export async function getGitStatus(): Promise<GitStatus> {
+export async function getGitStatus(cwd?: string): Promise<GitStatus> {
 	try {
-		const isGitRepo = exec("git rev-parse --git-dir");
+		const isGitRepo = exec("git rev-parse --git-dir", cwd);
 		if (isGitRepo.exitCode !== 0) {
 			return {
 				branch: "no-git",
@@ -42,17 +43,17 @@ export async function getGitStatus(): Promise<GitStatus> {
 			};
 		}
 
-		const branchResult = exec("git branch --show-current");
+		const branchResult = exec("git branch --show-current", cwd);
 		const branch = branchResult.stdout.trim() || "detached";
 
-		const diffCheck = exec("git diff-index --quiet HEAD --");
-		const cachedCheck = exec("git diff-index --quiet --cached HEAD --");
+		const diffCheck = exec("git diff-index --quiet HEAD --", cwd);
+		const cachedCheck = exec("git diff-index --quiet --cached HEAD --", cwd);
 
 		if (diffCheck.exitCode !== 0 || cachedCheck.exitCode !== 0) {
-			const unstagedDiff = exec("git diff --numstat").stdout;
-			const stagedDiff = exec("git diff --cached --numstat").stdout;
-			const stagedFilesResult = exec("git diff --cached --name-only").stdout;
-			const unstagedFilesResult = exec("git diff --name-only").stdout;
+			const unstagedDiff = exec("git diff --numstat", cwd).stdout;
+			const stagedDiff = exec("git diff --cached --numstat", cwd).stdout;
+			const stagedFilesResult = exec("git diff --cached --name-only", cwd).stdout;
+			const unstagedFilesResult = exec("git diff --name-only", cwd).stdout;
 
 			const parseStats = (diff: string) => {
 				let added = 0;

package/scripts/statusline/src/lib/spend.ts

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 import type { HookInput } from "./types";
 
 export interface SpendSession {
@@ -19,7 +20,9 @@ export interface SpendData {
 
 export function getSpendFilePath(): string {
 	// Use the project's data folder instead of ~/.claude
-	const projectRoot = join(import.meta.dir, "..", "..");
+	const __filename = fileURLToPath(import.meta.url);
+	const __dirname = dirname(__filename);
+	const projectRoot = join(__dirname, "..", "..");
 	return join(projectRoot, "data", "spend.json");
 }
 
@@ -40,7 +43,9 @@ export async function loadSpendData(): Promise<SpendData> {
 
 export async function saveSpendData(data: SpendData): Promise<void> {
 	const spendFile = getSpendFilePath();
-	const projectRoot = join(import.meta.dir, "..", "..");
+	const __filename = fileURLToPath(import.meta.url);
+	const __dirname = dirname(__filename);
+	const projectRoot = join(__dirname, "..", "..");
 	const dataDir = join(projectRoot, "data");
 
 	if (!existsSync(dataDir)) {

package/scripts/statusline/src/lib/usage-limits.ts

@@ -1,7 +1,8 @@
 import { existsSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { join, dirname } from "node:path";
 import { execSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
 
 export interface UsageLimits {
 	five_hour: {
@@ -21,10 +22,25 @@ interface CachedUsageLimits {
 
 const CACHE_DURATION_MS = 60 * 1000; // 1 minute
 
-function getCacheFilePath(): string {
-	// Utiliser __dirname pour Node.js au lieu de import.meta.dir (Bun)
-	const projectRoot = join(__dirname, "..", "..");
-	return join(projectRoot, "data", "usage-limits-cache.json");
+function getCacheFilePath(): string | null {
+	try {
+		// Utiliser import.meta.url pour ESM (compatible Node.js et Bun)
+		const __filename = fileURLToPath(import.meta.url);
+		const __dirname = dirname(__filename);
+		const projectRoot = join(__dirname, "..", "..");
+		const cacheDir = join(projectRoot, "data");
+
+		// Créer le dossier data s'il n'existe pas
+		if (!existsSync(cacheDir)) {
+			const { mkdirSync } = require("node:fs");
+			mkdirSync(cacheDir, { recursive: true });
+		}
+
+		return join(cacheDir, "usage-limits-cache.json");
+	} catch {
+		// Si erreur, désactiver le cache
+		return null;
+	}
 }
 
 interface Credentials {
@@ -39,17 +55,29 @@ interface Credentials {
 
 export async function getCredentials(): Promise<string | null> {
 	try {
-		// Cette commande ne fonctionne que sur macOS
-		// Sur Windows, retourner null (la statusline affichera sans les limites)
-		if (process.platform !== "darwin") {
-			return null;
+		// Sur macOS : utiliser le Keychain
+		if (process.platform === "darwin") {
+			const result = execSync(
+				'security find-generic-password -s "Claude Code-credentials" -w',
+				{ encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] },
+			);
+			const creds: Credentials = JSON.parse(result.trim());
+			return creds.claudeAiOauth.accessToken;
 		}
 
-		const result = execSync(
-			'security find-generic-password -s "Claude Code-credentials" -w',
-			{ encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] },
+		// Sur Windows/Linux : lire ~/.claude/.credentials.json
+		const credentialsPath = join(
+			process.env.HOME || process.env.USERPROFILE || "",
+			".claude",
+			".credentials.json",
 		);
-		const creds: Credentials = JSON.parse(result.trim());
+
+		if (!existsSync(credentialsPath)) {
+			return null;
+		}
+
+		const credentialsContent = await readFile(credentialsPath, "utf-8");
+		const creds: Credentials = JSON.parse(credentialsContent);
 		return creds.claudeAiOauth.accessToken;
 	} catch {
 		return null;
@@ -90,7 +118,7 @@ export async function fetchUsageLimits(
 async function loadCache(): Promise<CachedUsageLimits | null> {
 	try {
 		const cacheFile = getCacheFilePath();
-		if (!existsSync(cacheFile)) {
+		if (!cacheFile || !existsSync(cacheFile)) {
 			return null;
 		}
 
@@ -112,6 +140,10 @@ async function loadCache(): Promise<CachedUsageLimits | null> {
 async function saveCache(data: UsageLimits): Promise<void> {
 	try {
 		const cacheFile = getCacheFilePath();
+		if (!cacheFile) {
+			return;
+		}
+
 		const cached: CachedUsageLimits = {
 			data,
 			timestamp: Date.now(),

package/scripts/statusline-wrapper.cmd

@@ -0,0 +1,3 @@
+@echo off
+cd /d "%USERPROFILE%\.claude\scripts\statusline"
+"%USERPROFILE%\.claude\scripts\statusline\node_modules\.bin\tsx.cmd" "%USERPROFILE%\.claude\scripts\statusline\src\index.ts"

package/scripts/statusline-wrapper.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd "$HOME/.claude/scripts/statusline"
+"$HOME/.claude/scripts/statusline/node_modules/.bin/tsx" "$HOME/.claude/scripts/statusline/src/index.ts"

package/settings.json

@@ -14,7 +14,7 @@
   },
   "statusLine": {
     "type": "command",
-    "command": "npx tsx ${CLAUDE_CONFIG_DIR}/scripts/statusline/src/index.ts",
+    "command": "${CLAUDE_CONFIG_DIR}/scripts/statusline-wrapper.cmd",
     "padding": 0
   }
 }