chore: v2.8.23 — workspace groups, inner repos in Changes (opt-in), sub-agent tokens counted
Workspace groups: named, foldable, ordered sidebar sections kept per account (agenthub.workspace.groups); a workspace joins one from its menu, a drop on the header, a drag under a row, or Alt+Up/Down past a group's edge; headers drag to reorder; a folded header shows its most urgent state; New workspace in this group; fold/unfold all. Inner repos: GET /api/lanes/:id/repos + ?repo= on git/fs routes; the Changes panel shows a parent folder's repos only when Settings -> Git -> Changes panel turns it on (agenthub.changes.innerRepos, off by default). Cost: the hook writer adds a session's sub-agent transcripts to its tokens and hours (server/lib/subagent-usage.js) — a sub-agent on the session's own model was never counted live (~8% of a week here); an imported session is re-raised on every pass, so a claude -p run first seen with an empty transcript no longer stays at $0 (~10%). A one-time raise-only catch-up (user_version 5) re-reads ~/.claude/projects. Also: omp install script may redirect to its exact install.redirect URL (#85, repo-links test exempts it), native paste in the terminal.
This commit is contained in:
@@ -0,0 +1,94 @@
|
||||
/**
|
||||
* @file subagent-usage — the token usage of a Claude session's sub-agents (the
|
||||
* `agent-*.jsonl` transcripts Claude Code writes beside the session's own, in
|
||||
* `<dir>/<session id>/subagents/` or `<dir>/subagents/<session id>/` — the
|
||||
* same places `findSessionSubagents` in scripts/import-history.js looks),
|
||||
* summed per pricing bucket and per UTC hour. The hook writer adds it to the
|
||||
* main transcript's usage, so a session's total and its hours count every
|
||||
* sub-agent, the same total the importer's `combineSessionTokens` writes
|
||||
* (both go through the high-water `replaceTokenUsage`, so neither can inflate
|
||||
* the other). Workflow-tool agents (`subagents/workflows/…`) are left out:
|
||||
* `workflow-ingest.js` books those under their own service tier. Parsing goes
|
||||
* through a TranscriptCache of its own (stat-cached, incremental), so the main
|
||||
* transcripts' cache is never crowded out.
|
||||
* @author Nguyễn Ngọc Trí Vĩ <vinnt@smartgift.vn>
|
||||
*/
|
||||
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
const TranscriptCache = require("./transcript-cache");
|
||||
const { emptyBucket, accumulateBucket } = require("./token-usage");
|
||||
|
||||
const cache = new TranscriptCache(500);
|
||||
|
||||
/** The session's sub-agent transcripts, flat ones only. */
|
||||
function subagentFiles(transcriptPath) {
|
||||
const dir = path.dirname(transcriptPath);
|
||||
const sessionId = path.basename(transcriptPath, ".jsonl");
|
||||
const out = [];
|
||||
for (const d of [
|
||||
path.join(dir, sessionId, "subagents"),
|
||||
path.join(dir, "subagents", sessionId),
|
||||
]) {
|
||||
let names;
|
||||
try {
|
||||
names = fs.readdirSync(d);
|
||||
} catch {
|
||||
continue;
|
||||
}
|
||||
for (const n of names) if (n.endsWith(".jsonl")) out.push(path.join(d, n));
|
||||
}
|
||||
return out.sort();
|
||||
}
|
||||
|
||||
/** `a` plus `b`, bucket by bucket (an hour bucket keeps its `hour`); never mutates. */
|
||||
function addTokens(a, b) {
|
||||
const out = {};
|
||||
for (const src of [a, b]) {
|
||||
for (const [key, t] of Object.entries(src || {})) {
|
||||
if (!out[key]) {
|
||||
out[key] = emptyBucket(t.model, t.speed, t.geo, t.tier);
|
||||
if (t.hour) out[key].hour = t.hour;
|
||||
}
|
||||
accumulateBucket(out[key], t);
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/**
|
||||
* The sub-agents' usage of the session whose transcript is `transcriptPath`:
|
||||
* `{tokensByModel, tokensByHour, parts}` (`parts` = each file's cached parse
|
||||
* result, the same object while that file is unchanged), or null when it has
|
||||
* no sub-agent with usage.
|
||||
*/
|
||||
function subagentUsage(transcriptPath) {
|
||||
if (typeof transcriptPath !== "string" || !transcriptPath.endsWith(".jsonl")) return null;
|
||||
const parts = [];
|
||||
for (const f of subagentFiles(transcriptPath)) {
|
||||
let r = null;
|
||||
try {
|
||||
r = cache.extract(f);
|
||||
} catch {
|
||||
/* unreadable or vanished: skipped this time */
|
||||
}
|
||||
if (r && r.tokensByModel) parts.push(r);
|
||||
}
|
||||
if (!parts.length) return null;
|
||||
let tokensByModel = {};
|
||||
let tokensByHour = {};
|
||||
for (const r of parts) {
|
||||
tokensByModel = addTokens(tokensByModel, r.tokensByModel);
|
||||
tokensByHour = addTokens(tokensByHour, r.tokensByHour);
|
||||
}
|
||||
return { tokensByModel, tokensByHour, parts };
|
||||
}
|
||||
|
||||
/** Whether two `parts` lists are the same parses (nothing grew in between). */
|
||||
function sameParts(a, b) {
|
||||
const x = a || [];
|
||||
const y = b || [];
|
||||
return x.length === y.length && x.every((r, i) => r === y[i]);
|
||||
}
|
||||
|
||||
module.exports = { subagentUsage, subagentFiles, addTokens, sameParts };
|
||||
Reference in New Issue
Block a user