repospend 0.1.2 → 0.1.3

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to RepoSpend will be documented in this file.
 
+## 0.1.3
+
+- Correct GPT-5.6 Terra and Luna API-equivalent pricing to the reduced July 30, 2026 OpenAI rates, including cached-input and cache-write rates.
+- Migrate legacy full pricing files so the new Terra and Luna defaults take effect while preserving sparse user overrides and custom model rows.
+- Improve unverified repo and folder grouping by using the outermost project marker below a safe shared-folder boundary, keeping nested non-Git workspace paths together without collapsing them into broad folders such as `Desktop`.
+- Show paths relative to the home directory for unverified workspace labels so similarly named folders such as `src` remain distinguishable.
+
 ## 0.1.2
 
 - Add bundled GPT-5.6 API-equivalent pricing for the Sol, Terra, and Luna tiers, including cache-write and cached-input rates.

package/README.md

@@ -125,7 +125,7 @@ RepoSpend helps you break down local AI coding usage by:
 - input, cached input, output, and reasoning token shape
 - estimated API-equivalent cost
 
-Nested paths are grouped by Git root so usage rolls up to the repository.
+Nested paths are grouped by Git root so usage rolls up to the repository. When no Git root is available, RepoSpend uses the outermost project marker below a safe shared-folder boundary, such as `package.json`, and keeps the grouping visibly unverified.
 
 ## Screenshots
 

package/dist/cli.js

@@ -324,18 +324,19 @@ var pricingInfo = {
   sourceUrls: [
     { label: "OpenAI pricing reference", url: "https://developers.openai.com/api/docs/pricing" },
     { label: "OpenAI GPT-5.6 preview pricing", url: "https://openai.com/index/previewing-gpt-5-6-sol/" },
+    { label: "OpenAI GPT-5.6 price update", url: "https://openai.com/index/advancing-the-price-performance-frontier-with-gpt-5-6/" },
     { label: "Claude pricing reference", url: "https://platform.claude.com/docs/en/about-claude/pricing" },
     { label: "GitHub Copilot model pricing reference", url: "https://docs.github.com/en/copilot/reference/copilot-billing/models-and-pricing" }
   ],
   unit: "USD per 1M tokens",
-  updatedAt: "2026-07-02",
-  note: "RepoSpend estimates API-equivalent cost from local token counts and public API-style Standard pricing. This is not your actual bill; subscriptions, credits, provider terms, cache behavior, regional processing, or other billing factors can make your real cost different."
+  updatedAt: "2026-07-30",
+  note: "RepoSpend estimates API-equivalent cost from local token counts and public API-style Standard pricing. GPT-5.6 Terra and Luna use the reduced OpenAI API rates effective July 30, 2026. This is not your actual bill; subscriptions, credits, provider terms, cache behavior, regional processing, or other billing factors can make your real cost different."
 };
 var defaultPricing = {
   "gpt-5.6": { inputPerMillion: 5, cachedInputPerMillion: 0.5, cacheCreationInputPerMillion: 6.25, outputPerMillion: 30, reasoningOutputPerMillion: 30, note: "GPT-5.6 Sol flagship tier. OpenAI preview pricing lists Sol at $5 input / $30 output per 1M tokens, cache writes at 1.25x input, and cache reads at a 90% discount." },
   "gpt-5.6-sol": { inputPerMillion: 5, cachedInputPerMillion: 0.5, cacheCreationInputPerMillion: 6.25, outputPerMillion: 30, reasoningOutputPerMillion: 30 },
-  "gpt-5.6-terra": { inputPerMillion: 2.5, cachedInputPerMillion: 0.25, cacheCreationInputPerMillion: 3.125, outputPerMillion: 15, reasoningOutputPerMillion: 15 },
-  "gpt-5.6-luna": { inputPerMillion: 1, cachedInputPerMillion: 0.1, cacheCreationInputPerMillion: 1.25, outputPerMillion: 6, reasoningOutputPerMillion: 6 },
+  "gpt-5.6-terra": { inputPerMillion: 2, cachedInputPerMillion: 0.2, cacheCreationInputPerMillion: 2.5, outputPerMillion: 12, reasoningOutputPerMillion: 12, note: "GPT-5.6 Terra reduced API pricing effective July 30, 2026. Cache reads are 90% below input and cache writes are 1.25x input." },
+  "gpt-5.6-luna": { inputPerMillion: 0.2, cachedInputPerMillion: 0.02, cacheCreationInputPerMillion: 0.25, outputPerMillion: 1.2, reasoningOutputPerMillion: 1.2, note: "GPT-5.6 Luna reduced API pricing effective July 30, 2026. Cache reads are 90% below input and cache writes are 1.25x input." },
   "gpt-5.5": { inputPerMillion: 5, cachedInputPerMillion: 0.5, outputPerMillion: 30, reasoningOutputPerMillion: 30 },
   "gpt-5.5-pro": { inputPerMillion: 30, outputPerMillion: 180, reasoningOutputPerMillion: 180 },
   "gpt-5.4": { inputPerMillion: 2.5, cachedInputPerMillion: 0.25, outputPerMillion: 15, reasoningOutputPerMillion: 15 },
@@ -386,17 +387,44 @@ var defaultPricing = {
   "claude-haiku-4-5": { inputPerMillion: 1, cacheCreationInput5mPerMillion: 1.25, cacheCreationInput1hPerMillion: 2, cacheCreationInputPerMillion: 2, cachedInputPerMillion: 0.1, outputPerMillion: 5 },
   "claude-3-5-haiku": { inputPerMillion: 0.8, cacheCreationInput5mPerMillion: 1, cacheCreationInput1hPerMillion: 1.6, cacheCreationInputPerMillion: 1.6, cachedInputPerMillion: 0.08, outputPerMillion: 4 }
 };
+var legacyBundledPricing = {
+  "gpt-5.6-terra": { inputPerMillion: 2.5, cachedInputPerMillion: 0.25, cacheCreationInputPerMillion: 3.125, outputPerMillion: 15, reasoningOutputPerMillion: 15 },
+  "gpt-5.6-luna": { inputPerMillion: 1, cachedInputPerMillion: 0.1, cacheCreationInputPerMillion: 1.25, outputPerMillion: 6, reasoningOutputPerMillion: 6 }
+};
 function loadPricingTable(pricingPath) {
   if (!pricingPath) {
     return defaultPricing;
   }
   try {
     const resolved = path.resolve(pricingPath);
-    return { ...defaultPricing, ...JSON.parse(fs.readFileSync(resolved, "utf8")) };
+    const stored = JSON.parse(fs.readFileSync(resolved, "utf8"));
+    return { ...defaultPricing, ...migrateLegacyBundledPricing(stored) };
   } catch {
     return defaultPricing;
   }
 }
+function pricingOverrides(pricing) {
+  return Object.fromEntries(
+    Object.entries(pricing).filter(([model, modelPricing]) => {
+      const bundled = defaultPricing[model];
+      return !bundled || !pricingEntriesEqual(modelPricing, bundled);
+    })
+  );
+}
+function migrateLegacyBundledPricing(stored) {
+  const isLegacyFullTable = Object.keys(defaultPricing).every((model) => Object.hasOwn(stored, model));
+  if (!isLegacyFullTable) return stored;
+  const migrated = { ...stored };
+  for (const [model, legacyPricing] of Object.entries(legacyBundledPricing)) {
+    if (pricingEntriesEqual(migrated[model], legacyPricing)) delete migrated[model];
+  }
+  return pricingOverrides(migrated);
+}
+function pricingEntriesEqual(left, right) {
+  if (!left || !right) return left === right;
+  const keys = /* @__PURE__ */ new Set([...Object.keys(left), ...Object.keys(right)]);
+  return [...keys].every((key) => left[key] === right[key]);
+}
 function resolvePricingPath(config = {}) {
   return config.pricingPath ? path.resolve(repospendHome(), config.pricingPath) : path.join(repospendHome(), "pricing.json");
 }
@@ -1235,6 +1263,7 @@ function isDashboardVisibleSession(session) {
 
 // packages/core/src/repo.ts
 import fs4 from "node:fs";
+import os2 from "node:os";
 import path4 from "node:path";
 function normalizeRoot(p) {
   const stripped = p.startsWith("\\\\?\\") ? p.slice(4) : p;
@@ -1264,9 +1293,9 @@ function findGitRoot(cwd, fileSystem = fs4) {
 function resolveRepoInfo(cwd, config = {}, fileSystem = fs4) {
   const warnings = [];
   const gitRoot = safeFindGitRoot(cwd, fileSystem);
-  const repoRoot = gitRoot ?? fallbackWorkspaceRoot(cwd);
+  const repoRoot = gitRoot ?? fallbackWorkspaceRoot(cwd, fileSystem);
   const alias = aliasForPath(repoRoot, config);
-  const repoName = alias ?? (path4.basename(repoRoot) || "unknown-workspace");
+  const repoName = alias ?? (gitRoot ? path4.basename(repoRoot) : fallbackWorkspaceLabel(repoRoot));
   const gitMeta = gitRoot ? readGitMetadata(gitRoot, fileSystem) : { remote: void 0, branch: void 0 };
   if (!gitRoot) {
     warnings.push("repo_unverified_no_git_root");
@@ -1287,16 +1316,59 @@ function safeFindGitRoot(cwd, fileSystem) {
     return void 0;
   }
 }
-function fallbackWorkspaceRoot(cwd) {
+var workspaceMarkers = [
+  "package.json",
+  "pyproject.toml",
+  "Cargo.toml",
+  "go.mod",
+  "mix.exs",
+  "composer.json",
+  "Gemfile",
+  "pom.xml",
+  "build.gradle",
+  "Package.swift",
+  "CMakeLists.txt"
+];
+var fallbackWorkspaceCache = /* @__PURE__ */ new Map();
+function fallbackWorkspaceRoot(cwd, fileSystem = fs4) {
   const resolved = normalizeRoot(path4.resolve(cwd || process.cwd()));
-  const home = process.env.HOME ? normalizeRoot(path4.resolve(process.env.HOME)) : void 0;
-  if (home && (resolved === home || resolved.startsWith(`${home}${path4.sep}`))) {
-    const relative = path4.relative(home, resolved).split(path4.sep).filter(Boolean);
-    const first = relative[0];
-    return first ? path4.join(home, first) : home;
+  if (fileSystem === fs4) {
+    const cached = fallbackWorkspaceCache.get(resolved);
+    if (cached) return cached;
+  }
+  const root = findWorkspaceMarkerRoot(resolved, fileSystem) ?? resolved;
+  if (fileSystem === fs4) fallbackWorkspaceCache.set(resolved, root);
+  return root;
+}
+function findWorkspaceMarkerRoot(start, fileSystem) {
+  const home = normalizeRoot(path4.resolve(os2.homedir()));
+  const boundary = isWithin(start, home) ? home : path4.parse(start).root;
+  let candidate;
+  let current = start;
+  while (true) {
+    if (current !== boundary && isAllowedMarkerRoot(current, boundary) && workspaceMarkers.some((marker) => fileSystem.existsSync(path4.join(current, marker)))) {
+      candidate = current;
+    }
+    if (current === boundary) return candidate;
+    const parent = path4.dirname(current);
+    if (parent === current) return candidate;
+    current = parent;
   }
-  const parts = resolved.split(path4.sep).filter(Boolean);
-  return `${path4.sep}${parts.slice(0, Math.min(parts.length, 3)).join(path4.sep)}`;
+}
+function isAllowedMarkerRoot(candidate, boundary) {
+  const relative = path4.relative(boundary, candidate).split(path4.sep).filter(Boolean);
+  return relative.length > 1;
+}
+function isWithin(candidate, parent) {
+  return candidate === parent || candidate.startsWith(`${parent}${path4.sep}`);
+}
+function fallbackWorkspaceLabel(repoRoot) {
+  const home = normalizeRoot(path4.resolve(os2.homedir()));
+  const relativeToHome = path4.relative(home, repoRoot);
+  if (relativeToHome && !relativeToHome.startsWith("..") && !path4.isAbsolute(relativeToHome)) {
+    return relativeToHome.split(path4.sep).filter(Boolean).join("/");
+  }
+  return path4.basename(repoRoot) || "unknown-workspace";
 }
 function readGitMetadata(repoRoot, fileSystem) {
   const gitPath = path4.join(repoRoot, ".git");
@@ -1331,7 +1403,7 @@ function parseBranch(head) {
 // packages/core/src/sources/codex.ts
 import { spawnSync } from "node:child_process";
 import fs5 from "node:fs";
-import os2 from "node:os";
+import os3 from "node:os";
 import path5 from "node:path";
 import { fileURLToPath } from "node:url";
 import Database from "better-sqlite3";
@@ -1856,7 +1928,7 @@ function numberFromKeys(object, keys) {
 var codexSessionCacheVersion = "codex-session-v1";
 var nativeSqliteRebuildAttempted = false;
 function scanCodex(options) {
-  const codexHome = options.codexHome ?? path5.join(os2.homedir(), ".codex");
+  const codexHome = options.codexHome ?? path5.join(os3.homedir(), ".codex");
   const statePath = path5.join(codexHome, "state_5.sqlite");
   const sessionsPath = path5.join(codexHome, "sessions");
   const configPath2 = path5.join(codexHome, "config.toml");
@@ -1938,7 +2010,7 @@ function readThreads(statePath, sessionFiles, options, warnings) {
       warnings.push("Codex threads table has no recognized columns.");
       return [];
     }
-    const importedModels = readImportedModelMap(options.codexHome ?? path5.join(os2.homedir(), ".codex"), warnings);
+    const importedModels = readImportedModelMap(options.codexHome ?? path5.join(os3.homedir(), ".codex"), warnings);
     const rows = db.prepare(`SELECT ${selectedColumns.map((column) => `"${column}"`).join(", ")} FROM threads`).all().filter((row) => rowMatchesScanWindow(row, options.scanWindow));
     const sessions = rows.map((row, index) => threadToUsage(row, index, sessionFiles, options, importedModels));
     return attributeSubagentsToParentSurfaces(sessions, rows);
@@ -2095,7 +2167,7 @@ function threadToUsage(row, index, sessionFiles, options, importedModels = /* @_
     messageCount: sessionBreakdown.messageCount,
     rawTokenTotal: dbTokens || sessionBreakdown.totalTokens || void 0,
     warnings,
-    codexHome: options.codexHome ?? path5.join(os2.homedir(), ".codex"),
+    codexHome: options.codexHome ?? path5.join(os3.homedir(), ".codex"),
     durationMs: durationMs(startedAt, endedAt),
     rawEventCount: sessionBreakdown.rawEventCount,
     parseStatus: sessionBreakdown.parseStatus,
@@ -2169,7 +2241,7 @@ function readStandaloneSessions(sessionFiles, options) {
       messageCount: breakdown.messageCount,
       rawTokenTotal: breakdown.totalTokens || void 0,
       warnings: [...repo.warnings, ...breakdown.warnings],
-      codexHome: options.codexHome ?? path5.join(os2.homedir(), ".codex"),
+      codexHome: options.codexHome ?? path5.join(os3.homedir(), ".codex"),
       durationMs: durationMs(breakdown.startedAt, breakdown.endedAt),
       rawEventCount: breakdown.rawEventCount,
       parseStatus: breakdown.parseStatus,
@@ -2680,7 +2752,7 @@ function errorMessage(error) {
 
 // packages/core/src/sources/claude.ts
 import fs6 from "node:fs";
-import os3 from "node:os";
+import os4 from "node:os";
 import path6 from "node:path";
 function scanClaude(options) {
   const claudeHome = options.claudeHome ?? defaultClaudeHome();
@@ -2734,7 +2806,7 @@ function scanClaude(options) {
 function discoverClaudeSessionFiles(claudeHome, warnings, explicitHome) {
   const files = [];
   const projectDirs = /* @__PURE__ */ new Set();
-  const projectsPaths = explicitHome ? [path6.join(claudeHome, "projects")] : unique3([...configuredClaudeHomes(claudeHome).map((root) => path6.join(root, "projects")), path6.join(os3.homedir(), ".config", "claude", "projects")]);
+  const projectsPaths = explicitHome ? [path6.join(claudeHome, "projects")] : unique3([...configuredClaudeHomes(claudeHome).map((root) => path6.join(root, "projects")), path6.join(os4.homedir(), ".config", "claude", "projects")]);
   for (const projectsPath of projectsPaths) {
     collectProjectFiles(projectsPath, files, projectDirs, warnings);
   }
@@ -3248,10 +3320,10 @@ function claudeSourceAppLabel(entrypoint) {
   return "Claude Code";
 }
 function defaultClaudeHome() {
-  return process.env.CLAUDE_CONFIG_DIR?.split(",").map((item) => item.trim()).filter(Boolean)[0] ?? path6.join(os3.homedir(), ".claude");
+  return process.env.CLAUDE_CONFIG_DIR?.split(",").map((item) => item.trim()).filter(Boolean)[0] ?? path6.join(os4.homedir(), ".claude");
 }
 function defaultDesktopSessionRoots() {
-  const home = os3.homedir();
+  const home = os4.homedir();
   const xdg = process.env.XDG_CONFIG_HOME || path6.join(home, ".config");
   return [
     path6.join(home, "Library", "Application Support", "Claude", "local-agent-mode-sessions"),
@@ -3342,12 +3414,12 @@ function safeMtimeMs(filePath) {
 
 // packages/core/src/sources/copilot.ts
 import fs7 from "node:fs";
-import os4 from "node:os";
+import os5 from "node:os";
 import path7 from "node:path";
 var maxJsonlBytes = 50 * 1024 * 1024;
 var copilotOtelEnv = "COPILOT_OTEL_FILE_EXPORTER_PATH";
 function scanCopilot(options) {
-  const copilotHome = options.copilotHome ?? path7.join(os4.homedir(), ".copilot");
+  const copilotHome = options.copilotHome ?? path7.join(os5.homedir(), ".copilot");
   const discovery = discoverCopilotFiles(copilotHome, Boolean(options.copilotHome), options.codeUserRoots);
   const files = discovery.files.filter((file) => fileMayOverlapScanWindow2(file.filePath, options.scanWindow));
   const sessionMap = /* @__PURE__ */ new Map();
@@ -4016,7 +4088,7 @@ function timestampMs2(value) {
   return iso ? Date.parse(iso) : void 0;
 }
 function defaultCodeUserRoots() {
-  const home = os4.homedir();
+  const home = os5.homedir();
   if (process.platform === "win32") {
     const appData = process.env.APPDATA ?? path7.join(home, "AppData", "Roaming");
     return ["Code", "Code - Insiders", "VSCodium"].map((name) => path7.join(appData, name, "User"));
@@ -4151,7 +4223,7 @@ function errorMessage3(error) {
 
 // packages/core/src/sources/cursor.ts
 import fs8 from "node:fs";
-import os5 from "node:os";
+import os6 from "node:os";
 import path8 from "node:path";
 import Database2 from "better-sqlite3";
 var parserVersion = "cursor-v1";
@@ -4160,7 +4232,7 @@ var maxDatabaseBytes = 100 * 1024 * 1024;
 var cursorStoragePrefixes = ["cursor.", "anysphere."];
 var interestingTerms = ["cursor", "composer", "aichat", "ai_chat", "aiservice", "agent-transcript", "prompttokenbreakdown"];
 function scanCursor(options) {
-  const cursorHome = options.cursorHome ?? path8.join(os5.homedir(), ".cursor");
+  const cursorHome = options.cursorHome ?? path8.join(os6.homedir(), ".cursor");
   const discovery = discoverCursorFiles(cursorHome, Boolean(options.cursorHome));
   const jsonlFiles = discovery.jsonlFiles.filter((filePath) => fileMayOverlapScanWindow3(filePath, options.scanWindow));
   const databaseFiles = discovery.databaseFiles.filter((filePath) => fileMayOverlapScanWindow3(filePath, options.scanWindow));
@@ -4276,7 +4348,7 @@ function cursorOwnedChildDirs(root) {
   }
 }
 function defaultCursorAppPaths() {
-  const home = os5.homedir();
+  const home = os6.homedir();
   if (process.platform === "win32") {
     const appData = process.env.APPDATA ?? path8.join(home, "AppData", "Roaming");
     const globalStoragePath2 = path8.join(appData, "Cursor", "User", "globalStorage");
@@ -5116,7 +5188,7 @@ function writeConfigData(nextConfig) {
 function writePricingData(models) {
   const config = loadConfig();
   const pricingPath = resolvePricingPath(config);
-  savePricingTable(pricingPath, models);
+  savePricingTable(pricingPath, pricingOverrides(models));
   clearScanCache();
   return {
     path: pricingPath,

package/docs/pricing.md

@@ -6,6 +6,10 @@ The bundled table is seeded from public OpenAI, Anthropic, Google, and GitHub Co
 
 The bundled defaults use currently published standard API prices unless a provider has an active introductory API rate. For example, Claude Sonnet 5 uses Anthropic's $2 input and $10 output introductory rate through August 31, 2026, with a pricing-table note for the $3 input and $15 output standard rate that starts September 1, 2026.
 
+OpenAI reduced GPT-5.6 pricing effective July 30, 2026. RepoSpend uses $2 input and $12 output per 1M tokens for Terra, and $0.20 input and $1.20 output for Luna. Cached input remains 90% below the uncached input rate, and cache writes are billed at 1.25x the uncached input rate, so Luna's bundled cache-write rate is $0.25 per 1M tokens.
+
+The Settings page persists only custom or intentionally edited model rows. This lets future bundled rate updates flow through automatically. Older full pricing files are migrated for the GPT-5.6 Terra and Luna reductions when they still contain the previous bundled rates.
+
 Some GitHub Copilot model rows are hosted or fine-tuned vendor models such as Raptor mini, MAI-Code-1-Flash, and Kimi K2.7 Code. RepoSpend prices those rows from GitHub's public per-token table as API-equivalent estimates, not as a Copilot invoice.
 
 For Claude models, RepoSpend uses Anthropic's cache-write TTL split when local

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repospend",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Local-first dashboard for tracking AI coding token usage and API-equivalent spend by repository, session, model, and tool.",
   "license": "Apache-2.0",
   "author": "Mehmet Mustafa Demir",