aiblueprint-cli 1.4.81 → 1.4.83

package/agents-config/scripts/statusline/src/lib/features/spend/index.ts

@@ -0,0 +1,178 @@
+import type { HookInput } from "../../types";
+import { normalizeResetsAt } from "../../utils";
+import {
+	addToPeriodCost,
+	getAllSessions,
+	getPeriodCost,
+	getProjectMaxCost,
+	getSession,
+	getSessionsByDate,
+	getSessionTotalCounted,
+	getTodaySessionsTotal,
+	getTracking,
+	updateProjectMaxCost,
+	upsertSession,
+	upsertTracking,
+} from "./database";
+import { appendPayloadLogWithContext } from "./payload-logger";
+import type { SpendSessionV2 } from "./types";
+
+export async function saveSessionV2(
+	input: HookInput,
+	currentResetsAt?: string,
+): Promise<void> {
+	if (
+		!input.session_id ||
+		input.cost.total_cost_usd === 0 ||
+		input.cost.total_cost_usd === null
+	) {
+		return;
+	}
+
+	const sessionId = input.session_id;
+	const newTotalCost = input.cost.total_cost_usd; // Cumulative from Claude Code
+	const today = new Date().toISOString().split("T")[0];
+	const normalizedPeriodId = currentResetsAt
+		? normalizeResetsAt(currentResetsAt)
+		: null;
+
+	// Get TODAY's session entry for this specific session
+	const existingTodaySession = getSession(sessionId, today);
+
+	// Get project max cost (for detecting /clear continuation)
+	const projectMaxCost = getProjectMaxCost(input.cwd, today);
+
+	// Get session's own cumulative count
+	const sessionCumulativeCounted = getSessionTotalCounted(sessionId);
+
+	// SMART DETECTION for various scenarios
+	let deltaCost: number;
+
+	const isNewSession = sessionCumulativeCounted === 0;
+	const isClearContinuation = isNewSession && newTotalCost > projectMaxCost;
+
+	if (isNewSession && !isClearContinuation) {
+		// First time seeing this session - don't count pre-existing cost
+		deltaCost = 0;
+	} else if (isClearContinuation) {
+		// /clear created new session but costs accumulated from before
+		deltaCost = newTotalCost - projectMaxCost;
+	} else {
+		// Normal case: use session-level tracking
+		deltaCost = Math.max(0, newTotalCost - sessionCumulativeCounted);
+	}
+
+	// Log with full context for debugging
+	appendPayloadLogWithContext(
+		input,
+		existingTodaySession?.total_cost ?? 0,
+		sessionCumulativeCounted,
+		deltaCost,
+		isNewSession,
+		isClearContinuation,
+		false, // billing reset detection removed
+		projectMaxCost,
+	);
+
+	// Always update project max if we surpass it
+	if (newTotalCost > projectMaxCost) {
+		updateProjectMaxCost(input.cwd, today, newTotalCost);
+	}
+
+	// Today's cost for THIS session = previous + delta
+	const todayCost = (existingTodaySession?.total_cost ?? 0) + deltaCost;
+
+	// Track cumulative for this session
+	// For new sessions, start from current cost (not from 0 + delta)
+	const newCumulativeCounted =
+		isNewSession && !isClearContinuation
+			? newTotalCost
+			: sessionCumulativeCounted + deltaCost;
+
+	upsertSession({
+		session_id: sessionId,
+		total_cost: todayCost,
+		cwd: input.cwd,
+		date: today,
+		duration_ms: input.cost.total_duration_ms,
+		lines_added: input.cost.total_lines_added,
+		lines_removed: input.cost.total_lines_removed,
+		last_resets_at: normalizedPeriodId,
+		cumulative_counted: newCumulativeCounted,
+	});
+
+	if (!normalizedPeriodId) {
+		return;
+	}
+
+	if (deltaCost > 0) {
+		const tracking = getTracking(sessionId, normalizedPeriodId);
+
+		upsertTracking({
+			session_id: sessionId,
+			period_id: normalizedPeriodId,
+			counted_cost: (tracking?.counted_cost ?? 0) + deltaCost,
+			last_session_cost: newTotalCost,
+		});
+
+		addToPeriodCost(normalizedPeriodId, deltaCost);
+	} else {
+		const tracking = getTracking(sessionId, normalizedPeriodId);
+		if (!tracking) {
+			upsertTracking({
+				session_id: sessionId,
+				period_id: normalizedPeriodId,
+				counted_cost: 0,
+				last_session_cost: newTotalCost,
+			});
+		}
+	}
+}
+
+export function getCurrentPeriodCostV2(periodId: string): number {
+	return getPeriodCost(periodId);
+}
+
+export function getTodayCostV2(): number {
+	return getTodaySessionsTotal();
+}
+
+export function getMonthStart(): Date {
+	const today = new Date();
+	return new Date(today.getFullYear(), today.getMonth(), 1);
+}
+
+export function getAllSessionsV2(): SpendSessionV2[] {
+	return getAllSessions().map((row) => ({
+		session_id: row.session_id,
+		total_cost: row.total_cost,
+		cwd: row.cwd,
+		date: row.date,
+		duration_ms: row.duration_ms,
+		lines_added: row.lines_added,
+		lines_removed: row.lines_removed,
+		last_resets_at: row.last_resets_at,
+		cumulative_counted: row.cumulative_counted,
+	}));
+}
+
+export function getSessionsByDateV2(date: string): SpendSessionV2[] {
+	return getSessionsByDate(date).map((row) => ({
+		session_id: row.session_id,
+		total_cost: row.total_cost,
+		cwd: row.cwd,
+		date: row.date,
+		duration_ms: row.duration_ms,
+		lines_added: row.lines_added,
+		lines_removed: row.lines_removed,
+		last_resets_at: row.last_resets_at,
+		cumulative_counted: row.cumulative_counted,
+	}));
+}
+
+export function calculateTotalCost(sessions: SpendSessionV2[]): number {
+	return sessions.reduce((sum, session) => sum + session.total_cost, 0);
+}
+
+export { getPeriodCost } from "./database";
+export type { SpendSessionV2 } from "./types";

package/agents-config/scripts/statusline/src/lib/features/spend/payload-logger.ts

@@ -0,0 +1,163 @@
+import {
+	appendFileSync,
+	existsSync,
+	mkdirSync,
+	readFileSync,
+	writeFileSync,
+} from "node:fs";
+import { join } from "node:path";
+import type { HookInput } from "../../types";
+
+const DATA_DIR = join(import.meta.dir, "..", "..", "..", "..", "data");
+const PAYLOADS_FILE = join(DATA_DIR, "payloads.jsonl");
+const MAX_ENTRIES = 10000;
+
+// Enable payload logging with: STATUSLINE_DEBUG=1
+const DEBUG_ENABLED = process.env.STATUSLINE_DEBUG === "1";
+
+export interface PayloadLogEntry {
+	event_id: string;
+	timestamp: string;
+	session_id: string;
+	cwd: string;
+	total_cost_usd: number;
+	total_duration_ms: number;
+	lines_added: number;
+	lines_removed: number;
+	model_id: string;
+	transcript_path: string;
+	context?: {
+		existing_session_cost?: number;
+		session_cumulative_counted?: number;
+		delta_cost?: number;
+		is_new_session?: boolean;
+		is_clear_continuation?: boolean;
+		is_billing_reset?: boolean;
+		project_max_cost?: number;
+	};
+}
+
+function generateEventId(): string {
+	return `${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
+}
+
+export function appendPayloadLog(
+	input: HookInput,
+	context?: PayloadLogEntry["context"],
+): void {
+	if (!DEBUG_ENABLED) {
+		return;
+	}
+
+	if (!existsSync(DATA_DIR)) {
+		mkdirSync(DATA_DIR, { recursive: true });
+	}
+
+	const entry: PayloadLogEntry = {
+		event_id: generateEventId(),
+		timestamp: new Date().toISOString(),
+		session_id: input.session_id,
+		cwd: input.cwd,
+		total_cost_usd: input.cost.total_cost_usd,
+		total_duration_ms: input.cost.total_duration_ms,
+		lines_added: input.cost.total_lines_added,
+		lines_removed: input.cost.total_lines_removed,
+		model_id: input.model.id,
+		transcript_path: input.transcript_path,
+		...(context && { context }),
+	};
+
+	const line = JSON.stringify(entry) + "\n";
+	appendFileSync(PAYLOADS_FILE, line);
+}
+
+export function appendPayloadLogWithContext(
+	input: HookInput,
+	existingSessionCost: number,
+	sessionCumulativeCounted: number,
+	deltaCost: number,
+	isNewSession: boolean,
+	isClearContinuation: boolean,
+	isBillingReset: boolean,
+	projectMaxCost: number,
+): void {
+	appendPayloadLog(input, {
+		existing_session_cost: existingSessionCost,
+		session_cumulative_counted: sessionCumulativeCounted,
+		delta_cost: deltaCost,
+		is_new_session: isNewSession,
+		is_clear_continuation: isClearContinuation,
+		is_billing_reset: isBillingReset,
+		project_max_cost: projectMaxCost,
+	});
+}
+
+export function readPayloadLogs(): PayloadLogEntry[] {
+	if (!existsSync(PAYLOADS_FILE)) {
+		return [];
+	}
+
+	const content = readFileSync(PAYLOADS_FILE, "utf-8");
+	const lines = content.trim().split("\n").filter(Boolean);
+
+	return lines.map((line) => JSON.parse(line) as PayloadLogEntry);
+}
+
+export function rotatePayloadLogs(): void {
+	const entries = readPayloadLogs();
+
+	if (entries.length <= MAX_ENTRIES) {
+		return;
+	}
+
+	const toKeep = entries.slice(-MAX_ENTRIES);
+	const content = toKeep.map((e) => JSON.stringify(e)).join("\n") + "\n";
+	writeFileSync(PAYLOADS_FILE, content);
+}
+
+export function getPayloadsGroupedBySession(): Map<string, PayloadLogEntry[]> {
+	const entries = readPayloadLogs();
+	const grouped = new Map<string, PayloadLogEntry[]>();
+
+	for (const entry of entries) {
+		const existing = grouped.get(entry.session_id) || [];
+		existing.push(entry);
+		grouped.set(entry.session_id, existing);
+	}
+
+	return grouped;
+}
+
+export function getTodayPayloads(): PayloadLogEntry[] {
+	const today = new Date().toISOString().split("T")[0];
+	const entries = readPayloadLogs();
+
+	return entries.filter((e) => e.timestamp.startsWith(today));
+}
+
+export function getTodayRealCost(): number {
+	const todayEntries = getTodayPayloads();
+	if (todayEntries.length === 0) return 0;
+
+	// Group by session
+	const sessions = new Map<string, PayloadLogEntry[]>();
+	for (const entry of todayEntries) {
+		const existing = sessions.get(entry.session_id) || [];
+		existing.push(entry);
+		sessions.set(entry.session_id, existing);
+	}
+
+	// Calculate real delta per session (last_cost - first_cost)
+	let totalRealCost = 0;
+	for (const [, entries] of sessions) {
+		const sorted = entries.sort(
+			(a, b) =>
+				new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime(),
+		);
+		const realDelta =
+			sorted[sorted.length - 1].total_cost_usd - sorted[0].total_cost_usd;
+		totalRealCost += Math.max(0, realDelta);
+	}
+
+	return totalRealCost;
+}

package/agents-config/scripts/statusline/src/lib/features/spend/types.ts

@@ -0,0 +1,37 @@
+export interface SessionRow {
+	session_id: string;
+	total_cost: number;
+	cwd: string;
+	date: string;
+	duration_ms: number;
+	lines_added: number;
+	lines_removed: number;
+	last_resets_at: string | null;
+	cumulative_counted: number;
+}
+
+export interface PeriodRow {
+	period_id: string;
+	total_cost: number;
+	utilization: number;
+	date: string;
+}
+
+export interface TrackingRow {
+	session_id: string;
+	period_id: string;
+	counted_cost: number;
+	last_session_cost: number;
+}
+
+export interface SpendSessionV2 {
+	session_id: string;
+	total_cost: number;
+	cwd: string;
+	date: string;
+	duration_ms: number;
+	lines_added: number;
+	lines_removed: number;
+	last_resets_at: string | null;
+	cumulative_counted: number;
+}

package/agents-config/scripts/statusline/src/lib/presets.ts

@@ -21,7 +21,7 @@ const minimalConfig: StatuslineConfig = {
 	},
 	session: {
 		infoSeparator: null,
-		cost: { enabled: false, format: "decimal1" },
+		cost: { enabled: true, format: "decimal1" },
 		duration: { enabled: false },
 		tokens: { enabled: false, showMax: false, showDecimals: false },
 		percentage: {
@@ -37,7 +37,7 @@ const minimalConfig: StatuslineConfig = {
 		},
 	},
 	limits: {
-		enabled: false,
+		enabled: true,
 		showTimeLeft: false,
 		showPacingDelta: false,
 		cost: { enabled: false, format: "decimal1" },
@@ -93,7 +93,7 @@ const fullConfig: StatuslineConfig = {
 	},
 	session: {
 		infoSeparator: null,
-		cost: { enabled: false, format: "decimal2" },
+		cost: { enabled: true, format: "decimal2" },
 		duration: { enabled: true },
 		tokens: { enabled: true, showMax: true, showDecimals: true },
 		percentage: {
@@ -109,10 +109,10 @@ const fullConfig: StatuslineConfig = {
 		},
 	},
 	limits: {
-		enabled: false,
-		showTimeLeft: false,
-		showPacingDelta: false,
-		cost: { enabled: false, format: "decimal1" },
+		enabled: true,
+		showTimeLeft: true,
+		showPacingDelta: true,
+		cost: { enabled: true, format: "decimal1" },
 		percentage: {
 			enabled: true,
 			showValue: true,
@@ -126,10 +126,10 @@ const fullConfig: StatuslineConfig = {
 		},
 	},
 	weeklyUsage: {
-		enabled: false,
-		showTimeLeft: false,
-		showPacingDelta: false,
-		cost: { enabled: false, format: "decimal1" },
+		enabled: true,
+		showTimeLeft: true,
+		showPacingDelta: true,
+		cost: { enabled: true, format: "decimal1" },
 		percentage: {
 			enabled: true,
 			showValue: true,
@@ -143,7 +143,7 @@ const fullConfig: StatuslineConfig = {
 		},
 	},
 	dailySpend: {
-		cost: { enabled: false, format: "decimal1" },
+		cost: { enabled: true, format: "decimal1" },
 	},
 	context: {
 		...defaultConfig.context,
@@ -153,7 +153,7 @@ const fullConfig: StatuslineConfig = {
 export const PRESETS: Preset[] = [
 	{
 		name: "Minimal",
-		description: "Essential info only: percentage and branch",
+		description: "Essential info only: cost, percentage, branch",
 		config: minimalConfig,
 	},
 	{

package/agents-config/scripts/statusline/statusline.config.free.json

@@ -17,7 +17,7 @@
 	"separator": "•",
 	"session": {
 		"infoSeparator": null,
-		"cost": { "enabled": false, "format": "decimal1" },
+		"cost": { "enabled": true, "format": "decimal1" },
 		"duration": { "enabled": true },
 		"tokens": { "enabled": true, "showMax": false, "showDecimals": false },
 		"percentage": {
@@ -75,5 +75,8 @@
 	},
 	"dailySpend": {
 		"cost": { "enabled": false, "format": "decimal1" }
+	},
+	"thinking": {
+		"showDisabledWarning": true
 	}
 }

package/agents-config/scripts/statusline/statusline.config.json

@@ -1,7 +1,7 @@
 {
 	"features": {
-		"usageLimits": false,
-		"spendTracking": false
+		"usageLimits": true,
+		"spendTracking": true
 	},
 	"oneLine": true,
 	"showSonnetModel": false,
@@ -11,22 +11,31 @@
 		"showBranch": true,
 		"showDirtyIndicator": true,
 		"showChanges": false,
-		"showStaged": true,
+		"showStaged": false,
 		"showUnstaged": true
 	},
 	"separator": "•",
 	"session": {
 		"infoSeparator": null,
-		"cost": { "enabled": false, "format": "decimal1" },
-		"duration": { "enabled": true },
-		"tokens": { "enabled": true, "showMax": false, "showDecimals": false },
+		"cost": {
+			"enabled": true,
+			"format": "decimal1"
+		},
+		"duration": {
+			"enabled": false
+		},
+		"tokens": {
+			"enabled": false,
+			"showMax": false,
+			"showDecimals": false
+		},
 		"percentage": {
 			"enabled": true,
 			"showValue": true,
 			"progressBar": {
 				"enabled": true,
-				"length": 10,
-				"style": "braille",
+				"length": 5,
+				"style": "filled",
 				"color": "progressive",
 				"background": "none"
 			}
@@ -41,29 +50,35 @@
 	},
 	"limits": {
 		"enabled": false,
-		"showTimeLeft": false,
-		"showPacingDelta": false,
-		"cost": { "enabled": false, "format": "decimal1" },
+		"showTimeLeft": true,
+		"showPacingDelta": true,
+		"cost": {
+			"enabled": true,
+			"format": "decimal1"
+		},
 		"percentage": {
-			"enabled": false,
-			"showValue": false,
+			"enabled": true,
+			"showValue": true,
 			"progressBar": {
-				"enabled": false,
-				"length": 10,
-				"style": "braille",
+				"enabled": true,
+				"length": 5,
+				"style": "filled",
 				"color": "progressive",
 				"background": "none"
 			}
 		}
 	},
 	"weeklyUsage": {
-		"enabled": false,
-		"showTimeLeft": false,
-		"showPacingDelta": false,
-		"cost": { "enabled": false, "format": "decimal1" },
-		"percentage": {
+		"enabled": true,
+		"showTimeLeft": true,
+		"showPacingDelta": true,
+		"cost": {
 			"enabled": false,
-			"showValue": false,
+			"format": "decimal1"
+		},
+		"percentage": {
+			"enabled": true,
+			"showValue": true,
 			"progressBar": {
 				"enabled": false,
 				"length": 10,
@@ -74,6 +89,12 @@
 		}
 	},
 	"dailySpend": {
-		"cost": { "enabled": false, "format": "decimal1" }
+		"cost": {
+			"enabled": false,
+			"format": "decimal1"
+		}
+	},
+	"thinking": {
+		"showDisabledWarning": true
 	}
 }

package/agents-config/skills/{agents-managers → agents-manager}/SKILL.md

@@ -179,7 +179,7 @@ Tailor instructions to the specific task domain. Don't create generic "helper" a
 </system_prompt_guidelines>
 
 <agent_xml_structure>
-Agent.md files are system prompts consumed only by Claude. Like skills and slash commands, they should use pure XML structure for optimal parsing and token efficiency.
+Agent.md files are system prompts consumed only by Claude. Like skills, they should use pure XML structure for optimal parsing and token efficiency.
 
 <recommended_tags>
 Common tags for agent structure:

package/agents-config/skills/{agents-managers → agents-manager}/references/writing-agent-prompts.md

@@ -1,7 +1,7 @@
 <key_insight>
 Agent prompts should be task-specific, not generic. They define a specialized role with clear focus areas, workflows, and constraints.
 
-**Critical**: Agent.md files use pure XML structure (no markdown headings). Like skills and slash commands, this improves parsing and token efficiency.
+**Critical**: Agent.md files use pure XML structure (no markdown headings). Like skills, this improves parsing and token efficiency.
 </key_insight>
 
 <xml_structure_rule>

package/agents-config/skills/apex/SKILL.md

@@ -0,0 +1,61 @@
+---
+name: apex
+description: Structured implementation using the APEX method (Analyze → Plan → Execute → eXamine). Use when implementing a feature or fixing a bug that benefits from a clear, deliberate workflow instead of jumping straight to code.
+argument-hint: "[-x] <task-description>"
+---
+
+# APEX
+
+Implement `$ARGUMENTS` with a deliberate, four-phase workflow. Think before each phase.
+
+Add `-x` to the request for an extra adversarial review pass after validation.
+
+## A — Analyze
+
+Gather just enough context to act with confidence:
+
+- Use `Glob`/`Grep` to find the files and patterns you'll touch
+- Read the closest existing example and follow its conventions
+- Restate the task as 2-4 concrete acceptance criteria
+- Note open questions; ask only if a wrong assumption would be costly
+
+## P — Plan
+
+Write a short, file-by-file plan before editing:
+
+- List each file to create or change and what changes in it
+- Pick the simplest approach that satisfies the criteria
+- Order the steps so the code stays runnable along the way
+
+## E — Execute
+
+Implement the plan:
+
+- Match the surrounding code's naming, structure, and idioms
+- Stay strictly in scope — no "while I'm here" refactors
+- Comments only where intent is genuinely non-obvious
+- Run the formatter if the project has one
+
+## X — eXamine
+
+Validate, then optionally review:
+
+1. **Validate**: run `lint`, `typecheck`, and relevant tests. Fix only what you broke; re-run until clean.
+2. **Review** (only if `-x`): re-read the diff as a skeptic — check for bugs, security holes, missed edge cases, and overcomplication. Fix what you find.
+
+## Output
+
+```
+## APEX complete
+
+**Task:** {what was implemented}
+**Criteria:** {✓ per acceptance criterion}
+**Files changed:** {list}
+**Validation:** ✓ lint ✓ typecheck ✓ tests
+```
+
+## Rules
+
+- One step at a time — finish each phase before the next
+- Stay in scope; ship the smallest change that meets the criteria
+- If blocked after 2 attempts, report the blocker and stop

package/agents-config/skills/appstore-connect/SKILL.md

@@ -8,7 +8,7 @@ description: Interact with App Store Connect via the asc CLI - apps, builds, Tes
 Read, manage, and ship any of the user's App Store apps through the **`asc`** CLI (App Store Connect CLI by Rork). `asc` covers nearly the entire ASC surface; reach for the raw API only for the rare gap.
 
 <auth>
-`asc` is already authenticated on this machine (a default keychain profile). Verify before doing real work:
+`asc` is usually already authenticated on this machine (a default keychain profile). Verify before doing real work:
 
 ```bash
 asc auth status            # shows stored credential profiles + which is default
@@ -17,7 +17,7 @@ asc doctor                 # diagnose auth/config issues
 ```
 
 - Multiple accounts/teams: `asc --profile <name> <command>` selects a profile.
-- A NEW account with no stored key: run the `appstore-connect-setup` skill (locates the `.p8`, key id, and issuer id, then `asc auth login`). Never print or commit `.p8` keys, key ids, or issuer ids.
+- **Not authenticated / no working credential / a NEW account with no stored key:** read [references/setup.md](references/setup.md) and follow it — a battle-tested workflow to locate the `.p8`, key id, and issuer id, then `asc auth login`. Never print or commit `.p8` keys, key ids, or issuer ids.
 </auth>
 
 <how_to_drive>