Skip to content

armgit / ruflo

Public Imported from GitHub
0

🌊 The original agent harness. Deploy intelligent multi-player swarms, coordinate autonomous workflows, and build conversational AI systems. Features adaptive memory, self-learning intelligence, federation, vector RAG integration, and native Claude Code / Codex / Hermes and many more Integrated

fix(cost-tracker): preserve Codex usage ownership

Devesh Maheshwarif7bbf344e8f0
diff --git a/plugins/ruflo-cost-tracker/scripts/_ledger.mjs b/plugins/ruflo-cost-tracker/scripts/_ledger.mjs
index ed509e98ac..5f51a054dc 100644
--- a/plugins/ruflo-cost-tracker/scripts/_ledger.mjs
+++ b/plugins/ruflo-cost-tracker/scripts/_ledger.mjs
@@ -15,7 +15,9 @@
// skip events whose total did not move, and treat a total that goes
// DOWN (compaction/reset) as a fresh base. Cached input is a SUBSET of
// input_tokens, so uncached = input - cached. A forked rollout replays
-// its parent's events, so events are de-duplicated by timestamp+totals.
+// its parent's events, so events are de-duplicated by owner+timestamp+totals.
+// Copied metadata identifies replayed usage; explicit thread markers
+// restore the helper's ownership without resetting the running total.
// The model comes from the latest `turn_context`, not the token event.
// grok `~/.grok/sessions/<urlencoded-cwd>/<session-id>/usage.json` — one row
// per turn when `turns[]` is present, else one row from `session`
@@ -104,12 +106,26 @@ export function* codexRows({ sinceMs = 0 } = {}) {
let effort = '';
let session = id;
let project = '';
+ let own = null;
let prev = null;
for (const text of lines(file)) {
- if (!text.includes('"turn_context"') && !text.includes('"token_count"') && !text.includes('"session_meta"')) continue;
+ if (!text.includes('"turn_context"') && !text.includes('"token_count"') && !text.includes('"session_meta"') && !text.includes('"thread_id"')) continue;
const line = parse(text);
const payload = line?.payload;
- if (line?.type === 'session_meta') { session = payload?.id ?? session; project = payload?.cwd ?? project; continue; }
+ if (line?.type === 'session_meta') {
+ if ((payload?.id ?? session) !== session) { model = ''; effort = ''; }
+ session = payload?.id ?? session;
+ project = payload?.cwd ?? project;
+ own ??= { session, project };
+ continue;
+ }
+ const marker = line?.type === 'turn_context' || (line?.type === 'event_msg' &&
+ ['task_started', 'thread_settings_applied'].includes(payload?.type));
+ if (marker && typeof payload?.thread_id === 'string' && payload.thread_id && payload.thread_id !== session) {
+ session = payload.thread_id;
+ project = session === own?.session ? own.project : '';
+ model = ''; effort = '';
+ }
if (line?.type === 'turn_context') { model = payload?.model ?? model; effort = payload?.effort ?? effort; project = payload?.cwd ?? project; continue; }
if (payload?.type !== 'token_count' || !payload.info?.total_token_usage) continue;
const total = payload.info.total_token_usage;
@@ -120,7 +136,7 @@ export function* codexRows({ sinceMs = 0 } = {}) {
for (const field of FIELDS) delta[field] = n(total[field]) - (prev === null || reset ? 0 : n(prev[field]));
prev = total;
if (FIELDS.every(field => delta[field] === 0) || ts < sinceMs) continue;
- const key = `${line.timestamp}|${total.input_tokens}|${total.output_tokens}`;
+ const key = JSON.stringify([session, line.timestamp, ...FIELDS.map(field => n(total[field]))]);
if (seenEvents.has(key)) continue;
seenEvents.add(key);
const cached = delta.cached_input_tokens;
diff --git a/plugins/ruflo-cost-tracker/scripts/smoke.sh b/plugins/ruflo-cost-tracker/scripts/smoke.sh
index eefbd47e5c..ed0685a98d 100755
--- a/plugins/ruflo-cost-tracker/scripts/smoke.sh
+++ b/plugins/ruflo-cost-tracker/scripts/smoke.sh
@@ -657,6 +657,7 @@ node -e "JSON.parse(require('fs').readFileSync('$ROOT/.claude-plugin/plugin.json
step "45. multi-provider ledger: runtime counting-rule tests + price book + new skills"
miss=""
node "$ROOT/scripts/test-ledger.mjs" >/dev/null 2>&1 || miss="$miss test-ledger-failed"
+node --test "$ROOT/scripts/test-codex-ledger.mjs" >/dev/null 2>&1 || miss="$miss test-codex-ledger-failed"
node -e "const b=JSON.parse(require('fs').readFileSync('$ROOT/data/prices.json'));if(!b.asOf||!b.models.length||b.models.some(m=>!m.source||!m.unit))process.exit(1)" 2>/dev/null || miss="$miss price-book-invalid"
for s in cost-ledger cost-advise cost-openrouter cost-local; do
f="$ROOT/skills/$s/SKILL.md"
diff --git a/plugins/ruflo-cost-tracker/scripts/test-codex-ledger.mjs b/plugins/ruflo-cost-tracker/scripts/test-codex-ledger.mjs
new file mode 100644
index 0000000000..11f23f6329
--- /dev/null
+++ b/plugins/ruflo-cost-tracker/scripts/test-codex-ledger.mjs
@@ -0,0 +1,112 @@
+import assert from 'node:assert/strict';
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { test } from 'node:test';
+import { codexRows } from './_ledger.mjs';
+
+const meta = id => ({ type: 'session_meta', payload: { id, cwd: `/project/${id}` } });
+const context = id => ({ type: 'turn_context', payload: { thread_id: id, model: `model-${id}`, effort: 'high' } });
+const usage = (second, input, output = 10) => ({
+ timestamp: `2026-10-03T00:00:${String(second).padStart(2, '0')}.000Z`,
+ type: 'event_msg',
+ payload: { type: 'token_count', info: { total_token_usage: {
+ input_tokens: input, cached_input_tokens: 0, output_tokens: output,
+ } } },
+});
+
+function read(files, options) {
+ const home = mkdtempSync(join(tmpdir(), 'codex-ledger-'));
+ const previous = process.env.CODEX_HOME;
+ try {
+ process.env.CODEX_HOME = home;
+ for (const [name, records] of Object.entries(files)) {
+ const file = join(home, name);
+ mkdirSync(dirname(file), { recursive: true });
+ writeFileSync(file, records.map(record => JSON.stringify(record)).join('\n') + '\n');
+ }
+ return [...codexRows(options)].sort((a, b) => a.ts - b.ts || a.session.localeCompare(b.session));
+ } finally {
+ if (previous === undefined) delete process.env.CODEX_HOME;
+ else process.env.CODEX_HOME = previous;
+ rmSync(home, { recursive: true, force: true });
+ }
+}
+
+test('independent sessions retain identical timestamps and totals', () => {
+ const rows = read({
+ 'sessions/rollout-a.jsonl': [meta('a'), context('a'), usage(1, 100)],
+ 'sessions/rollout-b.jsonl': [meta('b'), context('b'), usage(1, 100)],
+ });
+ assert.deepEqual(rows.map(row => row.session), ['a', 'b']);
+ assert.equal(rows.reduce((sum, row) => sum + row.input + row.output, 0), 220);
+});
+
+for (const marker of [context('child'), ...['thread_settings_applied', 'task_started'].map(type => ({ type: 'event_msg', payload: { type, thread_id: 'child' } }))]) {
+ test(`${marker.payload.type ?? marker.type} restores child ownership after copied metadata`, () => {
+ const rows = read({ 'sessions/rollout-child.jsonl': [meta('child'), meta('parent'), context('parent'), marker, usage(2, 100)] });
+ assert.equal(rows.length, 1);
+ assert.equal(rows[0].session, 'child');
+ assert.equal(rows[0].project, '/project/child');
+ assert.equal(rows[0].model, marker.type === 'turn_context' ? 'model-child' : 'unknown');
+ assert.equal(rows[0].effort, marker.type === 'turn_context' ? 'high' : '');
+ });
+}
+
+for (const childFirst of [false, true]) {
+ test(`copied parent usage counts once with child read ${childFirst ? 'first' : 'last'}`, () => {
+ const parent = [meta('parent'), context('parent'), usage(1, 100)];
+ const child = [meta('child'), ...parent, context('child'), usage(2, 150, 20)];
+ const rows = read({
+ 'sessions/rollout-a.jsonl': childFirst ? child : parent,
+ 'sessions/rollout-z.jsonl': childFirst ? parent : child,
+ });
+ assert.deepEqual(rows.map(row => [row.session, row.input, row.output, row.model, row.project]), [
+ ['parent', 100, 10, 'model-parent', '/project/parent'],
+ ['child', 50, 10, 'model-child', '/project/child'],
+ ]);
+ });
+}
+
+test('a replay before the time window still supplies the child delta baseline', () => {
+ const rows = read({ 'sessions/rollout-child.jsonl': [
+ meta('child'), meta('parent'), context('parent'), usage(1, 100), context('child'), usage(2, 150, 20),
+ ] }, { sinceMs: Date.parse('2026-10-03T00:00:02.000Z') });
+ assert.deepEqual(rows.map(row => [row.session, row.input, row.output]), [['child', 50, 10]]);
+});
+
+test('a thread reference in another event does not change usage ownership', () => {
+ const rows = read({ 'sessions/rollout-child.jsonl': [
+ meta('child'), context('child'),
+ { type: 'event_msg', payload: { type: 'collab_agent_spawn_end', thread_id: 'other' } },
+ usage(1, 100),
+ ] });
+ assert.equal(rows[0].session, 'child');
+ assert.equal(rows[0].model, 'model-child');
+});
+
+test('repeated events and archived copies count once', () => {
+ const records = [meta('a'), context('a'), usage(1, 100), usage(1, 100), usage(2, 150, 20)];
+ const rows = read({
+ 'sessions/rollout-a.jsonl': records,
+ 'archived_sessions/rollout-a.jsonl': records,
+ 'sessions/rollout-copy.jsonl': records,
+ });
+ assert.deepEqual(rows.map(row => [row.input, row.output]), [[100, 10], [50, 10]]);
+});
+
+test('same-owner metadata and settings preserve the active model and effort', () => {
+ const rows = read({ 'sessions/rollout-a.jsonl': [
+ meta('a'), context('a'), usage(1, 100), meta('a'),
+ { type: 'event_msg', payload: { type: 'thread_settings_applied', thread_id: 'a' } },
+ usage(2, 150, 20),
+ ] });
+ assert.deepEqual(rows.map(row => [row.model, row.effort]), [['model-a', 'high'], ['model-a', 'high']]);
+});
+
+test('a child counter reset starts a fresh baseline', () => {
+ const rows = read({ 'sessions/rollout-child.jsonl': [
+ meta('child'), meta('parent'), context('parent'), usage(1, 1000, 100), context('child'), usage(2, 50, 5),
+ ] });
+ assert.deepEqual(rows.map(row => [row.session, row.input, row.output]), [['parent', 1000, 100], ['child', 50, 5]]);
+});
diff --git a/plugins/ruflo-cost-tracker/scripts/test-ledger.mjs b/plugins/ruflo-cost-tracker/scripts/test-ledger.mjs
index 2f00f51c45..ac62c8ab51 100644
--- a/plugins/ruflo-cost-tracker/scripts/test-ledger.mjs
+++ b/plugins/ruflo-cost-tracker/scripts/test-ledger.mjs
@@ -49,7 +49,10 @@ const rollout = [
];
jsonl(join(process.env.CODEX_HOME, 'sessions', '2026', '10', '03', 'rollout-a.jsonl'), rollout);
jsonl(join(process.env.CODEX_HOME, 'archived_sessions', 'rollout-a.jsonl'), rollout); // same rollout archived: active copy wins
-jsonl(join(process.env.CODEX_HOME, 'sessions', '2026', '10', '03', 'rollout-fork.jsonl'), [{ type: 'turn_context', payload: { model: 'gpt-5.3-codex' } }, event(10, total(1000, 800, 100)), event(11, total(3000, 2600, 300))]); // replayed parent history
+jsonl(join(process.env.CODEX_HOME, 'sessions', '2026', '10', '03', 'rollout-fork.jsonl'), [
+ { type: 'session_meta', payload: { id: 'fork', cwd: '/y' } },
+ ...rollout.slice(0, 5), // copied parent metadata and usage, before any helper activity
+]);
// ── Grok: usage.json with turns[] → one row per turn; cached ⊂ input; project from encoded folder / summary.
writeFileSync(join(grokSession, 'usage.json'), JSON.stringify({