sigrank 0.0.191 → 0.0.193

package/README.md

@@ -339,7 +339,7 @@ All adapters are token-only (no message content, no cost fields, no credentials)
 | ------------------ | ---------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
 | Claude Code        | ✅ `~/.claude/projects` (recursive, incl. `subagents/`) | Native 4-pillar; dedup by `(session_id, message_id)` — final snapshot wins                                  |
 | Codex              | ✅ `~/.codex/sessions` (+ `archived_sessions`) | `input_tokens` incl. cached → `input` + `cacheCreate` split window-level via `io_ratio`; `cacheRead` native (`cached_input_tokens`); `reasoning_output`→output; verified vs ccusage (~1%) |
-| Devin CLI          | ✅ `~/.local/share/devin/cli/sessions.db`      | SQLite; same `io_ratio` split as Codex (Alpha 2.0 default); `cacheRead` native                                   |
+| Devin CLI          | ✅ `~/.local/share/devin/cli/sessions.db`      | SQLite; native 4-pillar from `metadata.metrics` (`input_tokens`, `output_tokens`, `cache_read_tokens`, `cache_creation_tokens`); `input_tokens` is fresh (excludes cache)                                   |
 | Amp                | ✅ `~/.local/share/amp/threads`                | Native 4-pillar; per-message                                                                                      |
 | Kimi               | ✅ `~/.kimi/sessions`                          | Native 4-pillar; `StatusUpdate` lines only                                                                        |
 | pi-agent           | ✅ `~/.pi/agent/sessions`                      | Native 4-pillar; per-message JSONL                                                                                |

package/adapters/index.mjs

@@ -744,16 +744,15 @@ export const hermesAdapter = {
 
 // ── 14. Devin CLI ────────────────────────────────────────────────────────────
 // SQLite: ~/.local/share/devin/cli/sessions.db
-// Same combined-input problem as Codex: input_tokens INCLUDES cache write, so we
-// yield { ts, output, cacheRead, uncached } and let tokenpullCodex() do the
-// ioRatio split (input = output × ioRatio, cacheCreate = uncached − input).
-// ioRatio comes from Claude (Beta = operator's Claude input/output ratio) or
-// the Alpha 2.0 default (matches Codex; the "7:1:2 average → 0.5" note in a
-// prior revision was wrong — tokenpullAny defaults ioRatio to 2.0 for both).
+// Native 4-pillar: metrics.input_tokens is FRESH input (does NOT include cache
+// read or cache creation — verified against live data where input=3 alongside
+// cache_creation_tokens=23500). cache_read_tokens and cache_creation_tokens are
+// separate fields (nullable → treat null as 0). output_tokens includes any
+// reasoning tokens (no separate reasoning field in metrics). No estimation needed.
 export const devinAdapter = {
   platform: "devin",
   defaultRoot: () => join(homedir(), ".local", "share", "devin", "cli"),
-  async *records(root) {
+  async *messages(root) {
     for (const r of roots("DEVIN_HOME", root)) {
       const dbPath = join(r, "sessions.db");
       const rows = await sqliteJson(
@@ -762,6 +761,7 @@ export const devinAdapter = {
                 json_extract(chat_message, '$.metadata.metrics.input_tokens') as input_tokens,
                 json_extract(chat_message, '$.metadata.metrics.output_tokens') as output_tokens,
                 json_extract(chat_message, '$.metadata.metrics.cache_read_tokens') as cache_read_tokens,
+                json_extract(chat_message, '$.metadata.metrics.cache_creation_tokens') as cache_creation_tokens,
                 json_extract(chat_message, '$.metadata.created_at') as created_at
          FROM message_nodes
          WHERE json_extract(chat_message, '$.role') = 'assistant'
@@ -770,15 +770,19 @@ export const devinAdapter = {
         60_000,
       );
       for (const row of rows) {
-        const inputIncl = Number(row.input_tokens || 0);
-        const cached = Number(row.cache_read_tokens || 0);
+        const input = Number(row.input_tokens || 0);
         const output = Number(row.output_tokens || 0);
-        if (inputIncl + output + cached === 0) continue;
+        const cacheRead = Number(row.cache_read_tokens || 0);
+        const cacheCreate = Number(row.cache_creation_tokens || 0);
+        if (input + output + cacheRead + cacheCreate === 0) continue;
         yield {
+          id: `devin:${row.row_id}`,
+          sid: row.session_id || null,
           ts: row.created_at || null,
+          input,
           output,
-          cacheRead: cached,
-          uncached: Math.max(0, inputIncl - cached),
+          cacheCreate,
+          cacheRead,
           file: dbPath,
         };
       }

package/adapters/tokenpull.mjs

@@ -359,9 +359,12 @@ export async function tokenpullCodex({
 export async function tokenpullAny(platform, opts = {}) {
   if (!platform || platform === "claude")
     return tokenpull({ adapter: claudeAdapter, ...opts });
-  // Codex + Devin: both combine input + cache write in input_tokens, so both go
-  // through tokenpullCodex() which splits via ioRatio (Beta from Claude, Alpha 2.0).
-  if (platform === "codex" || platform === "devin") {
+  // Codex: input_tokens includes cache write, so it goes through tokenpullCodex()
+  // which splits via ioRatio (Beta from Claude, Alpha 2.0). Devin was previously
+  // routed here too, but its metrics object carries native cache_creation_tokens
+  // and cache_read_tokens as separate fields with input_tokens as fresh input —
+  // no estimation needed. Devin now goes through the standard tokenpull() path.
+  if (platform === "codex") {
     let ioRatio = opts.ioRatio || 2.0;
     if (!opts.ioRatio) {
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sigrank",
-  "version": "0.0.191",
+  "version": "0.0.193",
   "author": "SunrisesIllNeverSee (https://github.com/SunrisesIllNeverSee)",
   "description": "SigRank MCP server — the yield cascade + live leaderboard as MCP tools any agent can call",
   "mcpName": "io.github.SunrisesIllNeverSee/sigrank-mcp",