claude-usage-limits 1.9.1 → 1.9.2

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "usage-limits",
   "displayName": "Usage Limits",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Puts your remaining Claude Code usage limit into Claude's context before every prompt, so it opens with what fits in the budget instead of starting work that gets cut off. Reports headroom as turns rather than percentages, prices a job before you start it, and detects your plan tier.",
   "author": {
     "name": "Ridelink",

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "usage-limits",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Reports how much of your Codex usage limit is left as turns of work rather than a percentage, prices a job before you start it, and counts the other agents sharing the same budget.",
   "author": {
     "name": "Ridelink",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-usage-limits",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Puts your remaining Claude Code usage limit into Claude's context before every prompt, so it opens with what fits in the budget instead of starting work that gets cut off. Reports headroom as turns rather than percentages, prices a job before you start it, and detects your plan tier.",
   "keywords": [
     "claude",

package/skills/usage-limits/references/how-it-works.md

@@ -118,6 +118,14 @@ really somewhere in 1.5 to 2.5. At low readings the projection can be off by
 a quarter or more in either direction. The report flags this below 5 percent.
 Above about 20 percent it tightens up considerably.
 
+**Two files can claim to be the account state.** The meter lives in
+`~/.claude.json`, but a Claude Code migration also writes a small
+`~/.claude/.claude.json` holding machine ids and no meter at all. Whichever
+one actually carries `cachedUsageUtilization` is the one read. Choosing on
+existence alone found the stub, concluded there was no Claude snapshot, and
+sent host detection off to Codex, which reported that agent's meter inside a
+Claude session.
+
 **One machine only.** Transcripts are local. Usage from another machine, from
 claude.ai, or from a cloud session counts against the same limit but leaves no
 local record. The percentages stay correct; the calibration reads low, which

package/skills/usage-limits/scripts/host.js

@@ -38,15 +38,28 @@ function exists(file) {
 
 // Claude Code only writes this once it has talked to the API, so its presence
 // is a stronger signal than the directory existing.
-function claudeHasSnapshot() {
+//
+// Look in both places rather than stopping at whichever exists. A migration
+// leaves a small ~/.claude/.claude.json carrying machine ids and no meter,
+// while the account state stays in the home directory file; stopping at the
+// stub answered "no Claude snapshot" on a machine plainly running Claude Code,
+// and detection then fell through to Codex and reported its meter instead.
+function claudeSnapshotFile() {
   const scoped = path.join(claudeConfigDir(), '.claude.json');
-  const file = exists(scoped) ? scoped : path.join(os.homedir(), '.claude.json');
-  try {
-    const parsed = JSON.parse(fs.readFileSync(file, 'utf8'));
-    return Boolean(parsed && parsed.cachedUsageUtilization);
-  } catch (err) {
-    return false;
+  const home = path.join(os.homedir(), '.claude.json');
+  for (const file of scoped === home ? [home] : [scoped, home]) {
+    try {
+      const parsed = JSON.parse(fs.readFileSync(file, 'utf8'));
+      if (parsed && parsed.cachedUsageUtilization) return file;
+    } catch (err) {
+      // Missing or unreadable is just "not this one".
+    }
   }
+  return null;
+}
+
+function claudeHasSnapshot() {
+  return claudeSnapshotFile() !== null;
 }
 
 function codexHasSessions() {
@@ -91,6 +104,7 @@ module.exports = {
   codexHome,
   claudeConfigDir,
   claudeHasSnapshot,
+  claudeSnapshotFile,
   codexHasSessions,
   exists,
 };

package/skills/usage-limits/scripts/usage.js

@@ -185,10 +185,35 @@ function configDir() {
 
 // The CLI keeps its account state in ~/.claude.json, or next to the config
 // directory when CLAUDE_CONFIG_DIR moves it.
-function accountFile() {
+//
+// Both can exist at once, and the one in the config directory is not
+// necessarily the one with the meter in it: a Claude Code migration writes a
+// small ~/.claude/.claude.json holding machine ids and migration flags while
+// the account state, including cachedUsageUtilization, stays in the home
+// directory file. Picking on existence alone found that stub, reported no
+// snapshot, and sent host detection off to Codex - which is how a Claude
+// session ends up quoting another agent's meter entirely. So choose the file
+// that actually carries a snapshot, and only fall back to existence.
+function accountFiles() {
   const scoped = path.join(configDir(), '.claude.json');
-  if (fs.existsSync(scoped)) return scoped;
-  return path.join(os.homedir(), '.claude.json');
+  const home = path.join(os.homedir(), '.claude.json');
+  return scoped === home ? [home] : [scoped, home];
+}
+
+function hasSnapshot(file) {
+  const parsed = readJson(file);
+  return Boolean(parsed && parsed.cachedUsageUtilization);
+}
+
+function accountFile() {
+  const candidates = accountFiles();
+  for (const file of candidates) {
+    if (hasSnapshot(file)) return file;
+  }
+  for (const file of candidates) {
+    if (fs.existsSync(file)) return file;
+  }
+  return candidates[candidates.length - 1];
 }
 
 function readJson(file) {
@@ -1775,6 +1800,25 @@ function statusLine(collected) {
       unreported: snapshot.utilization === 0 && !Number.isFinite(resetsAt),
     });
   }
+
+  // The per-model weeklies are not bucket keys, they are entries in the
+  // account's own `limits` list, so a loop over the bucket table never saw
+  // them. On a plan where the Fable weekly is the limit that actually binds,
+  // that meant the status line quoting the shared weekly at 24% while the
+  // window about to stop the work sat at 76, which is the wrong number in the
+  // most convincing possible place.
+  for (const limit of limitWindows(utilization)) {
+    if (!limit.family) continue;
+    const msToReset = Number.isFinite(limit.resetsAt) ? limit.resetsAt - now : null;
+    parts.push({
+      label: limit.family,
+      percent: limit.percent,
+      msToReset,
+      stale: msToReset !== null && msToReset <= 0,
+      unreported: false,
+    });
+  }
+
   if (!parts.length) return '';
 
   const trusted = parts.filter((part) => !part.stale && !part.unreported);
@@ -2376,6 +2420,7 @@ module.exports = {
   SATURATION_LIMIT,
   MIN_BASELINE_TURNS,
   MIN_BASELINE_PERCENT,
+  accountFile,
   buildWindows,
   limitWindows,
   lastRejections,