aiblueprint-cli 1.4.13 → 1.4.15

package/claude-code-config/scripts/statusline/src/lib/render-pure.ts

@@ -3,8 +3,6 @@
  *
  * ARCHITECTURE: Raw data in, formatted string out.
  * ALL config decisions happen here, not in data preparation.
- *
- * FREE VERSION: Simplified - No limits, weekly, or daily tracking
  */
 
 import type { StatuslineConfig } from "./config-types";
@@ -14,13 +12,52 @@ import {
 	formatDuration,
 	formatPath,
 	formatProgressBar,
+	formatResetTime,
 	formatTokens,
 } from "./formatters";
 
+const WEEKLY_HOURS = 168; // 7 days * 24 hours
+const FIVE_HOUR_MINUTES = 300; // 5 hours * 60 minutes
+
 // ─────────────────────────────────────────────────────────────
-// DATA TYPES - Simplified for free version
+// RAW DATA TYPES - No pre-formatting, just raw values
 // ─────────────────────────────────────────────────────────────
 
+export interface GitChanges {
+	files: number;
+	added: number;
+	deleted: number;
+}
+
+export interface RawGitData {
+	branch: string;
+	dirty: boolean;
+	staged: GitChanges;
+	unstaged: GitChanges;
+}
+
+export interface UsageLimit {
+	utilization: number;
+	resets_at: string | null;
+}
+
+export interface RawStatuslineData {
+	git: RawGitData | null;
+	path: string;
+	modelName: string;
+	cost: number;
+	durationMs: number;
+	contextTokens: number | null;
+	contextPercentage: number | null;
+	usageLimits?: {
+		five_hour: UsageLimit | null;
+		seven_day: UsageLimit | null;
+	};
+	periodCost?: number;
+	todayCost?: number;
+}
+
+// Legacy interface for backwards compatibility
 export interface StatuslineData {
 	branch: string;
 	dirPath: string;
@@ -29,12 +66,63 @@ export interface StatuslineData {
 	sessionDuration: string;
 	contextTokens: number | null;
 	contextPercentage: number | null;
+	usageLimits?: {
+		five_hour: UsageLimit | null;
+		seven_day: UsageLimit | null;
+	};
+	periodCost?: number;
+	todayCost?: number;
 }
 
 // ─────────────────────────────────────────────────────────────
 // FORMATTING - All config-aware formatting in one place
 // ─────────────────────────────────────────────────────────────
 
+function formatGitPart(
+	git: RawGitData | null,
+	config: StatuslineConfig["git"],
+): string {
+	if (!git || !config.enabled) return "";
+
+	const parts: string[] = [];
+
+	if (config.showBranch) {
+		parts.push(colors.lightGray(git.branch));
+	}
+
+	if (git.dirty && config.showDirtyIndicator) {
+		// Append to branch name without space
+		if (parts.length > 0) {
+			parts[parts.length - 1] += colors.purple("*");
+		} else {
+			parts.push(colors.purple("*"));
+		}
+	}
+
+	const changeParts: string[] = [];
+
+	if (config.showChanges) {
+		const totalAdded = git.staged.added + git.unstaged.added;
+		const totalDeleted = git.staged.deleted + git.unstaged.deleted;
+		if (totalAdded > 0) changeParts.push(colors.green(`+${totalAdded}`));
+		if (totalDeleted > 0) changeParts.push(colors.red(`-${totalDeleted}`));
+	}
+
+	if (config.showStaged && git.staged.files > 0) {
+		changeParts.push(colors.gray(`~${git.staged.files}`));
+	}
+
+	if (config.showUnstaged && git.unstaged.files > 0) {
+		changeParts.push(colors.yellow(`~${git.unstaged.files}`));
+	}
+
+	if (changeParts.length > 0) {
+		parts.push(changeParts.join(" "));
+	}
+
+	return parts.join(" ");
+}
+
 function formatSessionPart(
 	cost: number,
 	durationMs: number,
@@ -106,12 +194,179 @@ function formatSessionPart(
 	return `${colors.gray("S:")} ${items.join(sep)}`;
 }
 
+function formatLimitsPart(
+	fiveHour: UsageLimit | null,
+	periodCost: number,
+	config: StatuslineConfig["limits"],
+): string {
+	if (!config.enabled || !fiveHour) return "";
+
+	const parts: string[] = [];
+
+	if (config.cost.enabled && periodCost > 0) {
+		parts.push(
+			`${colors.gray("$")}${colors.dimWhite(formatCost(periodCost, config.cost.format))}`,
+		);
+	}
+
+	if (config.percentage.enabled) {
+		if (config.percentage.progressBar.enabled) {
+			parts.push(
+				formatProgressBar({
+					percentage: fiveHour.utilization,
+					length: config.percentage.progressBar.length,
+					style: config.percentage.progressBar.style,
+					colorMode: config.percentage.progressBar.color,
+					background: config.percentage.progressBar.background,
+				}),
+			);
+		}
+
+		if (config.percentage.showValue) {
+			parts.push(
+				`${colors.lightGray(fiveHour.utilization.toString())}${colors.gray("%")}`,
+			);
+		}
+	}
+
+	if (config.showPacingDelta && fiveHour.resets_at) {
+		const delta = calculateFiveHourDelta(
+			fiveHour.utilization,
+			fiveHour.resets_at,
+		);
+		parts.push(
+			`${colors.gray("(")}${formatPacingDelta(delta)}${colors.gray(")")}`,
+		);
+	}
+
+	if (config.showTimeLeft && fiveHour.resets_at) {
+		parts.push(colors.gray(`(${formatResetTime(fiveHour.resets_at)})`));
+	}
+
+	return parts.length > 0 ? `${colors.gray("L:")} ${parts.join(" ")}` : "";
+}
+
+function shouldShowWeekly(
+	config: StatuslineConfig["weeklyUsage"],
+	fiveHourUtilization: number | null,
+): boolean {
+	if (config.enabled === true) return true;
+	if (config.enabled === false) return false;
+	if (config.enabled === "90%" && fiveHourUtilization !== null) {
+		return fiveHourUtilization >= 90;
+	}
+	return false;
+}
+
+function calculateWeeklyDelta(
+	utilization: number,
+	resetsAt: string | null,
+): number {
+	if (!resetsAt) return 0;
+
+	const resetDate = new Date(resetsAt);
+	const now = new Date();
+	const diffMs = resetDate.getTime() - now.getTime();
+	const hoursRemaining = Math.max(0, diffMs / 3600000);
+	const timeElapsedPercent =
+		((WEEKLY_HOURS - hoursRemaining) / WEEKLY_HOURS) * 100;
+
+	return utilization - timeElapsedPercent;
+}
+
+function formatPacingDelta(delta: number): string {
+	const sign = delta >= 0 ? "+" : "";
+	const value = `${sign}${delta.toFixed(1)}%`;
+
+	if (delta > 5) return colors.green(value);
+	if (delta > 0) return colors.lightGray(value);
+	if (delta > -10) return colors.yellow(value);
+	return colors.red(value);
+}
+
+function calculateFiveHourDelta(
+	utilization: number,
+	resetsAt: string | null,
+): number {
+	if (!resetsAt) return 0;
+
+	const resetDate = new Date(resetsAt);
+	const now = new Date();
+	const diffMs = resetDate.getTime() - now.getTime();
+	const minutesRemaining = Math.max(0, diffMs / 60000);
+	const timeElapsedPercent =
+		((FIVE_HOUR_MINUTES - minutesRemaining) / FIVE_HOUR_MINUTES) * 100;
+
+	return utilization - timeElapsedPercent;
+}
+
+function formatWeeklyPart(
+	sevenDay: UsageLimit | null,
+	fiveHourUtilization: number | null,
+	periodCost: number,
+	config: StatuslineConfig["weeklyUsage"],
+): string {
+	if (!shouldShowWeekly(config, fiveHourUtilization) || !sevenDay) return "";
+
+	const parts: string[] = [];
+
+	if (config.cost.enabled && periodCost > 0) {
+		parts.push(
+			`${colors.gray("$")}${colors.dimWhite(formatCost(periodCost, config.cost.format))}`,
+		);
+	}
+
+	if (config.percentage.enabled) {
+		if (config.percentage.progressBar.enabled) {
+			parts.push(
+				formatProgressBar({
+					percentage: sevenDay.utilization,
+					length: config.percentage.progressBar.length,
+					style: config.percentage.progressBar.style,
+					colorMode: config.percentage.progressBar.color,
+					background: config.percentage.progressBar.background,
+				}),
+			);
+		}
+
+		if (config.percentage.showValue) {
+			parts.push(
+				`${colors.lightGray(sevenDay.utilization.toString())}${colors.gray("%")}`,
+			);
+		}
+	}
+
+	if (config.showPacingDelta && sevenDay.resets_at) {
+		const delta = calculateWeeklyDelta(
+			sevenDay.utilization,
+			sevenDay.resets_at,
+		);
+		parts.push(
+			`${colors.gray("(")}${formatPacingDelta(delta)}${colors.gray(")")}`,
+		);
+	}
+
+	if (config.showTimeLeft && sevenDay.resets_at) {
+		parts.push(colors.gray(`(${formatResetTime(sevenDay.resets_at)})`));
+	}
+
+	return parts.length > 0 ? `${colors.gray("W:")} ${parts.join(" ")}` : "";
+}
+
+function formatDailyPart(
+	todayCost: number,
+	config: StatuslineConfig["dailySpend"],
+): string {
+	if (!config.cost.enabled || todayCost <= 0) return "";
+	return `${colors.gray("D:")} ${colors.gray("$")}${colors.dimWhite(formatCost(todayCost, config.cost.format))}`;
+}
+
 // ─────────────────────────────────────────────────────────────
-// MAIN RENDER FUNCTION - Simple version
+// MAIN RENDER FUNCTION - Raw data + config = output
 // ─────────────────────────────────────────────────────────────
 
-export function renderStatusline(
-	data: StatuslineData,
+export function renderStatuslineRaw(
+	data: RawStatuslineData,
 	config: StatuslineConfig,
 ): string {
 	const sep = colors.gray(config.separator);
@@ -120,16 +375,12 @@ export function renderStatusline(
 	// Line 1: Git + Path + Model
 	const line1Parts: string[] = [];
 
-	// Git branch
-	if (data.branch) {
-		line1Parts.push(colors.lightGray(data.branch));
-	}
+	const gitPart = formatGitPart(data.git, config.git);
+	if (gitPart) line1Parts.push(gitPart);
 
-	// Path
-	const pathPart = formatPath(data.dirPath, config.pathDisplayMode);
+	const pathPart = formatPath(data.path, config.pathDisplayMode);
 	line1Parts.push(colors.gray(pathPart));
 
-	// Model name (hide Sonnet if configured)
 	const isSonnet = data.modelName.toLowerCase().includes("sonnet");
 	if (!isSonnet || config.showSonnetModel) {
 		line1Parts.push(colors.peach(data.modelName));
@@ -137,21 +388,38 @@ export function renderStatusline(
 
 	sections.push(line1Parts.join(` ${sep} `));
 
-	// Line 2: Session info (cost, tokens, percentage, duration)
-	const cost = parseFloat(data.sessionCost.replace(/[$,]/g, "")) || 0;
-	const durationMs = parseDurationToMs(data.sessionDuration);
-
+	// Line 2: Session info
 	const sessionPart = formatSessionPart(
-		cost,
-		durationMs,
+		data.cost,
+		data.durationMs,
 		data.contextTokens,
 		data.contextPercentage,
 		config.context.maxContextTokens,
 		config.session,
 	);
-
 	if (sessionPart) sections.push(sessionPart);
 
+	// Limits
+	const limitsPart = formatLimitsPart(
+		data.usageLimits?.five_hour ?? null,
+		data.periodCost ?? 0,
+		config.limits,
+	);
+	if (limitsPart) sections.push(limitsPart);
+
+	// Weekly
+	const weeklyPart = formatWeeklyPart(
+		data.usageLimits?.seven_day ?? null,
+		data.usageLimits?.five_hour?.utilization ?? null,
+		data.periodCost ?? 0,
+		config.weeklyUsage,
+	);
+	if (weeklyPart) sections.push(weeklyPart);
+
+	// Daily
+	const dailyPart = formatDailyPart(data.todayCost ?? 0, config.dailySpend);
+	if (dailyPart) sections.push(dailyPart);
+
 	const output = sections.join(` ${sep} `);
 
 	if (config.oneLine) return output;
@@ -163,9 +431,61 @@ export function renderStatusline(
 }
 
 // ─────────────────────────────────────────────────────────────
-// HELPERS
+// LEGACY SUPPORT - For backwards compatibility with old data format
 // ─────────────────────────────────────────────────────────────
 
+export function renderStatusline(
+	data: StatuslineData,
+	config: StatuslineConfig,
+): string {
+	// Convert legacy format to raw format
+	// Parse pre-formatted values back to raw (best effort)
+	const rawData: RawStatuslineData = {
+		git: parseGitFromBranch(data.branch),
+		path: data.dirPath.startsWith("~") ? data.dirPath : data.dirPath,
+		modelName: data.modelName,
+		cost: parseFloat(data.sessionCost.replace(/[$,]/g, "")) || 0,
+		durationMs: parseDurationToMs(data.sessionDuration),
+		contextTokens: data.contextTokens,
+		contextPercentage: data.contextPercentage,
+		usageLimits: data.usageLimits,
+		periodCost: data.periodCost,
+		todayCost: data.todayCost,
+	};
+
+	return renderStatuslineRaw(rawData, config);
+}
+
+// Helper to parse legacy branch string back to git data
+function parseGitFromBranch(branch: string): RawGitData | null {
+	if (!branch) return null;
+
+	// Parse "main* +10 -5" format
+	const dirty = branch.includes("*");
+	const branchName =
+		branch.replace(/\*.*$/, "").replace(/\*/, "").trim() || "main";
+
+	const addMatch = branch.match(/\+(\d+)/);
+	const delMatch = branch.match(/-(\d+)/);
+	const added = addMatch ? parseInt(addMatch[1], 10) : 0;
+	const deleted = delMatch ? parseInt(delMatch[1], 10) : 0;
+
+	return {
+		branch: branchName,
+		dirty,
+		staged: {
+			files: 0,
+			added: Math.floor(added / 2),
+			deleted: Math.floor(deleted / 2),
+		},
+		unstaged: {
+			files: 0,
+			added: Math.ceil(added / 2),
+			deleted: Math.ceil(deleted / 2),
+		},
+	};
+}
+
 // Helper to parse "12m" or "1h 30m" back to ms
 function parseDurationToMs(duration: string): number {
 	let ms = 0;

package/claude-code-config/scripts/statusline/src/lib/utils.ts

@@ -0,0 +1,15 @@
+export function normalizeResetsAt(resetsAt: string): string {
+	try {
+		const date = new Date(resetsAt);
+		const minutes = date.getMinutes();
+		const roundedMinutes = Math.round(minutes / 5) * 5;
+
+		date.setMinutes(roundedMinutes);
+		date.setSeconds(0);
+		date.setMilliseconds(0);
+
+		return date.toISOString();
+	} catch {
+		return resetsAt;
+	}
+}