@indigoai-us/hq-cli 5.105.0 → 5.105.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [5.105.1] — 2026-08-31
+
+### Fixed
+
+- Token usage reports now automatically include Claude activity stored in
+  named profiles such as `.claude-ridge`, with no extra setting required.
+
 ## [5.105.0] — 2026-08-31
 
 ### Changed

package/dist/lib/core-utils/token-usage-report.d.ts

@@ -2,6 +2,8 @@ import { type UtilityIo } from "./common.js";
 export type TokenUsageReportOptions = UtilityIo & {
     projectDir?: string;
     now?: Date;
+    homeDir?: string;
+    menubarPath?: string;
 };
 /** Print token usage totals from Claude session JSONL files. */
 export declare function tokenUsageReport(args?: string[], options?: TokenUsageReportOptions): number;

package/dist/lib/core-utils/token-usage-report.js

@@ -11,12 +11,27 @@ const parseJsonl = (file) => fs.readFileSync(file, "utf8").split(/\r?\n/).flatMa
 catch {
     return [];
 } });
-const listJsonl = (dir) => { try {
-    return fs.readdirSync(dir).filter((name) => name.endsWith(".jsonl")).sort();
-}
-catch {
-    return [];
-} };
+const listJsonl = (dir) => {
+    const found = [];
+    const visit = (current, relative) => {
+        let entries;
+        try {
+            entries = fs.readdirSync(current, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            const nextRelative = path.join(relative, entry.name);
+            if (entry.isDirectory() && entry.name !== "subagents")
+                visit(path.join(current, entry.name), nextRelative);
+            else if (entry.isFile() && entry.name.endsWith(".jsonl"))
+                found.push(nextRelative);
+        }
+    };
+    visit(dir, "");
+    return found.sort();
+};
 const readNumber = (value) => typeof value === "number" ? value : 0;
 function firstUser(record) { const content = record.message?.content; if (typeof content === "string")
     return content.slice(0, 120); if (Array.isArray(content) && content.length) {
@@ -24,10 +39,42 @@ function firstUser(record) { const content = record.message?.content; if (typeof
     if (first && typeof first === "object" && typeof first.text === "string")
         return first.text.slice(0, 120);
 } return ""; }
-function comparison(projectDir, before, after, minHours, json, stdout) {
+function savedClaudeProjectsDir(menubarPath) {
+    try {
+        const value = JSON.parse(fs.readFileSync(menubarPath, "utf8")).claudeProjectsDir;
+        return typeof value === "string" && value.trim() ? value.trim() : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function resolveProjectDirs(options) {
+    if (options.projectDir)
+        return [path.resolve(options.projectDir)];
+    const projectsEnv = process.env.CLAUDE_PROJECTS_DIR?.trim();
+    if (projectsEnv)
+        return [path.resolve(projectsEnv)];
+    const home = options.homeDir ?? os.homedir();
+    const configEnv = process.env.CLAUDE_CONFIG_DIR?.trim();
+    if (configEnv)
+        return [path.resolve(configEnv, "projects")];
+    const roots = [
+        path.join(home, ".claude", "projects"),
+        savedClaudeProjectsDir(options.menubarPath ?? path.join(home, ".hq", "menubar.json")),
+    ];
+    try {
+        for (const entry of fs.readdirSync(home, { withFileTypes: true })) {
+            if (entry.isDirectory() && (entry.name === ".claude" || entry.name.startsWith(".claude-")))
+                roots.push(path.join(home, entry.name, "projects"));
+        }
+    }
+    catch { /* standard and saved fallbacks still apply */ }
+    return [...new Set(roots.filter((value) => Boolean(value)).map((value) => path.resolve(value)))];
+}
+function comparison(projectDirs, before, after, minHours, json, stdout) {
     const parseRange = (range) => range.split(":").map((value) => new Date(`${value}T00:00:00Z`));
     const [bStart, bEnd] = parseRange(before), [aStart, aEnd] = parseRange(after);
-    const collect = (start, end) => listJsonl(projectDir).flatMap((name) => {
+    const collect = (start, end) => projectDirs.flatMap((projectDir) => listJsonl(projectDir).flatMap((name) => {
         const rows = parseJsonl(path.join(projectDir, name));
         let cr = 0, first, last;
         for (const row of rows) {
@@ -47,7 +94,7 @@ function comparison(projectDir, before, after, minHours, json, stdout) {
         if (hours < minHours)
             return [];
         return [{ sid: name.replace(/\.jsonl$/, "").slice(0, 8), hours: Math.round(hours * 10) / 10, cr, cr_per_hour: Math.trunc(cr / hours) }];
-    });
+    }));
     const bRows = collect(bStart, bEnd), aRows = collect(aStart, aEnd);
     const median = (rows) => { if (!rows.length)
         return 0; const values = rows.map((row) => row.cr_per_hour).sort((a, b) => a - b); const mid = Math.floor(values.length / 2); return Math.trunc(values.length % 2 ? values[mid] : (values[mid - 1] + values[mid]) / 2); };
@@ -111,62 +158,60 @@ export function tokenUsageReport(args = [], options = {}) {
             return 1;
         }
     }
-    // Preserve the bundled shell asset's historical parameter-expansion parsing:
-    // the `}` in `{your-name}` terminates `${CLAUDE_PROJECTS_DIR:-…}` early, so
-    // its literal `-Documents-HQ}` suffix remains even when the environment
-    // variable is set. `projectDir` is the explicit native test/integration seam.
-    const projectDir = options.projectDir ?? `${process.env.CLAUDE_PROJECTS_DIR ?? path.join(os.homedir(), ".claude/projects/-Users-{your-name")}-Documents-HQ}`;
+    const projectDirs = resolveProjectDirs(options).filter((dir) => fs.existsSync(dir) && fs.statSync(dir).isDirectory());
     if (before && after) {
-        comparison(projectDir, before, after, minHours, json, stdout);
+        comparison(projectDirs, before, after, minHours, json, stdout);
         return 0;
     }
-    if (!fs.existsSync(projectDir) || !fs.statSync(projectDir).isDirectory()) {
-        line(stderr, `Project dir not found: ${projectDir}`);
+    if (!projectDirs.length) {
+        line(stderr, `Claude activity folders not found`);
         return 1;
     }
     const now = options.now ?? new Date();
     const cutoff = since || dayOf(new Date(now.getTime() - (lastDays - 1) * 86_400_000));
     const days = new Map(), sessions = new Map();
-    for (const name of listJsonl(projectDir)) {
-        const file = path.join(projectDir, name);
-        const stat = fs.statSync(file);
-        const mtime = dayOf(stat.mtime);
-        if (mtime < cutoff)
-            continue;
-        let inp = 0, out = 0, cc = 0, cr = 0, firstTs = "", lastTs = "", first = "";
-        for (const record of parseJsonl(file)) {
-            const usage = record.message?.usage;
-            inp += readNumber(usage?.input_tokens);
-            out += readNumber(usage?.output_tokens);
-            cc += readNumber(usage?.cache_creation_input_tokens);
-            cr += readNumber(usage?.cache_read_input_tokens);
-            if (record.timestamp) {
-                if (!firstTs)
-                    firstTs = record.timestamp;
-                lastTs = record.timestamp;
+    for (const projectDir of projectDirs)
+        for (const name of listJsonl(projectDir)) {
+            const file = path.join(projectDir, name);
+            const stat = fs.statSync(file);
+            const mtime = dayOf(stat.mtime);
+            if (mtime < cutoff)
+                continue;
+            let inp = 0, out = 0, cc = 0, cr = 0, firstTs = "", lastTs = "", first = "";
+            for (const record of parseJsonl(file)) {
+                const usage = record.message?.usage;
+                inp += readNumber(usage?.input_tokens);
+                out += readNumber(usage?.output_tokens);
+                cc += readNumber(usage?.cache_creation_input_tokens);
+                cr += readNumber(usage?.cache_read_input_tokens);
+                if (record.timestamp) {
+                    if (!firstTs)
+                        firstTs = record.timestamp;
+                    lastTs = record.timestamp;
+                }
+                if (!first && record.type === "user")
+                    first = firstUser(record);
             }
-            if (!first && record.type === "user")
-                first = firstUser(record);
-        }
-        const sid = name.replace(/\.jsonl$/, "");
-        const subagents = (() => { try {
-            return fs.readdirSync(path.join(projectDir, sid, "subagents")).filter((entry) => entry.endsWith(".jsonl")).length;
+            const localSid = name.replace(/\.jsonl$/, "");
+            const sid = `${path.basename(path.dirname(projectDir))}/${localSid}`;
+            const subagents = (() => { try {
+                return fs.readdirSync(path.join(projectDir, localSid, "subagents")).filter((entry) => entry.endsWith(".jsonl")).length;
+            }
+            catch {
+                return 0;
+            } })();
+            const day = (firstTs || lastTs || "").slice(0, 10) || mtime;
+            if (day < cutoff)
+                continue;
+            const current = days.get(day) ?? { sessions: new Set(), inp: 0, out: 0, cc: 0, cr: 0 };
+            current.sessions.add(sid);
+            current.inp += inp;
+            current.out += out;
+            current.cc += cc;
+            current.cr += cr;
+            days.set(day, current);
+            sessions.set(sid, { day, inp, out, cc, cr, eff: Math.trunc(inp + 5 * out + 1.25 * cc + .1 * cr), subagents, first_user: first.replaceAll("\n", " ") });
         }
-        catch {
-            return 0;
-        } })();
-        const day = (firstTs || lastTs || "").slice(0, 10) || mtime;
-        if (day < cutoff)
-            continue;
-        const current = days.get(day) ?? { sessions: new Set(), inp: 0, out: 0, cc: 0, cr: 0 };
-        current.sessions.add(sid);
-        current.inp += inp;
-        current.out += out;
-        current.cc += cc;
-        current.cr += cr;
-        days.set(day, current);
-        sessions.set(sid, { day, inp, out, cc, cr, eff: Math.trunc(inp + 5 * out + 1.25 * cc + .1 * cr), subagents, first_user: first.replaceAll("\n", " ") });
-    }
     const sorted = [...days.keys()].sort();
     const dayRows = sorted.map((day) => { const value = days.get(day); return { date: day, sessions: value.sessions.size, input: value.inp, output: value.out, cache_create: value.cc, cache_read: value.cr, effective: Math.trunc(value.inp + 5 * value.out + 1.25 * value.cc + .1 * value.cr) }; });
     const recent = sorted.at(-1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.105.0",
+  "version": "5.105.1",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {
@@ -30,7 +30,7 @@
   "dependencies": {
     "@aws-sdk/client-iot-data-plane": "^3.1096.0",
     "@aws-sdk/client-s3": "^3.1049.0",
-    "@indigoai-us/hq-cloud": "~6.16.0",
+    "@indigoai-us/hq-cloud": "~6.16.1",
     "@indigoai-us/hq-onboarding": "^0.1.0",
     "@sentry/node": "^10.49.0",
     "@tobilu/qmd": "2.5.3",