wendkeep 0.35.0 → 0.36.0

package/CHANGELOG.md

@@ -870,3 +870,9 @@ Initial release — the capture engine, extracted from a system in daily product
 [0.2.7]: https://www.npmjs.com/package/wendkeep/v/0.2.7
 [0.2.0]: https://www.npmjs.com/package/wendkeep/v/0.2.0
 [0.1.0]: https://www.npmjs.com/package/wendkeep/v/0.1.0
+# 0.36.0 — 2026-07-11
+
+- Custos de subagents agora são atribuídos ao modelo que realmente os executou por meio de um ledger por sessão; campos legados continuam compatíveis.
+- Novo `wendkeep cost rebuild`, dry-run por padrão, reconstrói sessões antigas via `SESSION_REGISTRY` e, com `--apply`, grava um manifesto auditável em `.brain/COST_REBUILD.json`.
+- Totais combinados de tokens/custo passam a ser persistidos explicitamente nas notas.
+- Preços API-equivalentes de GPT-5.6 Sol, Terra e Luna adicionados à tabela editável e ao fallback interno.

package/README.md

@@ -118,6 +118,7 @@ No re‑copying, no snapshot to re‑sync — the package is the single source o
 | `wendkeep sensors <sub>` | `list` / `add <id> "<command>"` — view/edit `wendkeep.sensors.json` (JSON Schema shipped). |
 | `wendkeep cost [--since d]` | Aggregate AI-coding spend across the vault's sessions — total, by model, by day (`--json`). |
 | `wendkeep import [opts]` | **Retroactive memory** — backfill past **Claude + Codex** sessions into the vault (deduped by `session_id`). `--source all\|claude\|codex` / `--from <dir>` / `--codex-from <dir>` / `--since d` / `--limit n` / `--dry-run` / `--json`. |
+| `wendkeep cost rebuild [opts]` | Recalcula custos históricos do transcript principal e subagents usando `SESSION_REGISTRY`. Dry-run por padrão; `--apply` atualiza notas e grava `.brain/COST_REBUILD.json`. Aceita `--session`, `--limit` e `--json`. |
 | `wendkeep lesson add "t" "l"` | Record a project-local lesson (injected at the next SessionStart). |
 | `wendkeep sync-defs` | Copy `.brain/agents\|skills` into `.codex/agents`, `.claude/skills`, `.agents/skills`; `--check` detects drift. |
 | `wendkeep validate-memory [path]` | Validate `.brain/CORE.md` (cap 25, 3 sections, no secrets/PII). |

package/README.pt-BR.md

@@ -115,6 +115,7 @@ Sem recopiar, sem snapshot pra re‑sincronizar — o pacote é a única fonte d
 | `wendkeep spec <sub>` | Specs vivos: `list` / `show <capability>`. |
 | `wendkeep sensors <sub>` | `list` / `add <id> "<comando>"` — vê/edita `wendkeep.sensors.json` (JSON Schema incluso). |
 | `wendkeep cost [opts]` | Agrega o gasto de IA nas sessões do cofre — total, por modelo, por dia · `--top [N]` · `--trend [day\|week\|month]` (+ projeção) · `--write` (gera `00-Custo.md`) · `--json`. |
+| `wendkeep cost rebuild [opts]` | Reconstrói custos históricos do transcript principal e subagents via `SESSION_REGISTRY`. Dry-run por padrão; `--apply` grava notas e `.brain/COST_REBUILD.json`. |
 | `wendkeep stats [--vault P]` | Uma linha compartilhável: sessões · prompts · gasto · período · modelos (`--json`). |
 | `wendkeep import [opts]` | **Memória retroativa** — importa sessões passadas de **Claude + Codex** pro cofre (dedup por `session_id`). `--source all\|claude\|codex` / `--from <dir>` / `--codex-from <dir>` / `--stamp-ids` / `--since d` / `--limit n` / `--dry-run` / `--json`. |
 | `wendkeep dashboard [--force]` | (Re)gera os Bases filtrados por pasta + o MOC `00-Dashboard`. |

package/bin/wendkeep.mjs

@@ -51,6 +51,9 @@ Usage:
   wendkeep cost [opts]         Aggregate AI-coding spend across the vault's sessions.
                            --since <date> · --top [N] (priciest) · --trend [day|week|month]
                            (+ run-rate projection) · --write (generate 00-Custo.md) · --json.
+  wendkeep cost rebuild        Recalculate historical parent + subagent costs from SESSION_REGISTRY.
+                           Dry-run by default · --apply writes notes + .brain/COST_REBUILD.json
+                           · --session <id|file> · --limit N · --json.
   wendkeep stats [--vault P]   One shareable line: sessions · prompts · spend · span · models (--json).
   wendkeep import [opts]       Backfill: import this project's past Claude + Codex sessions into
                            the vault (deduped by session_id). --source all|claude|codex (default

package/hooks/pricing.json

@@ -1,7 +1,10 @@
 {
   "_nota": "Preços API por milhão de tokens. cachedInput = cache read. Cache write aplica multiplicador no código: 5m = 1.25x input, 1h = 2x input. Editar aqui quando o provedor mudar preços (sem mexer no .mjs). Se o arquivo sumir ou ficar inválido, o hook usa a tabela embutida em token-usage.mjs.",
-  "_fonte": "Anthropic https://www.anthropic.com/pricing — conferido 2026-06-13 (Opus 4.8: $5 input / $25 output; cache read 0.1x; cache write 1.25x 5m / 2x 1h)",
-  "models": {
+  "_fonte": "OpenAI https://openai.com/index/gpt-5-6/ e https://help.openai.com/en/articles/20001325-a-preview-of-gpt-56-sol-terra-and-luna; Anthropic https://www.anthropic.com/pricing — conferido 2026-07-11",
+  "models": {
+    "gpt-5.6-sol": { "label": "GPT-5.6 Sol API", "provider": "openai", "input": 5, "cachedInput": 0.5, "output": 30 },
+    "gpt-5.6-terra": { "label": "GPT-5.6 Terra API", "provider": "openai", "input": 2.5, "cachedInput": 0.25, "output": 15 },
+    "gpt-5.6-luna": { "label": "GPT-5.6 Luna API", "provider": "openai", "input": 1, "cachedInput": 0.1, "output": 6 },
     "gpt-5.5": {
       "label": "GPT-5.5 API",
       "provider": "openai",

package/hooks/subagent-usage.mjs

@@ -91,6 +91,7 @@ export function collectSubagentUsage(sessionDir) {
   let count = 0;
   let calls = 0;
   let cost = 0;
+  const modelMap = new Map();
 
   for (const f of files) {
     const summary = summarizeTokenUsage(parseTokenUsageFromTranscript(f));
@@ -112,8 +113,18 @@ export function collectSubagentUsage(sessionDir) {
       calls: summary.calls,
       tokens,
       cost: round4(summary.costs.model),
+      modelRows: summary.modelRows,
     });
 
+    for (const row of summary.modelRows || []) {
+      const key = `${row.provider || '?'}\u0000${row.model || '?'}`;
+      const current = modelMap.get(key) || { provider: row.provider || '?', model: row.model || '?', calls: 0, tokens: 0, cost: 0 };
+      current.calls += row.calls || 0;
+      current.tokens += tokensTotal(row.usage);
+      current.cost += row.costs?.model || 0;
+      modelMap.set(key, current);
+    }
+
     count += 1;
     calls += summary.calls;
     cost += summary.costs.model;
@@ -151,7 +162,9 @@ export function collectSubagentUsage(sessionDir) {
   return {
     subagents,
     workflows,
-    aggregate: { count, calls, tokens: tokensTotal(usageAgg), cost: round4(cost), wasted, usage: usageAgg, tools: [...allTools] },
+    aggregate: { count, calls, tokens: tokensTotal(usageAgg), cost: round4(cost), wasted, usage: usageAgg, tools: [...allTools],
+      modelRows: [...modelMap.values()].map((r) => ({ ...r, cost: round4(r.cost), source: 'subagent' })),
+    },
   };
 }
 
@@ -173,19 +186,22 @@ export function renderSubagentSection(c) {
     .map((s) => `| ${s.id} | ${s.agentType || '-'} | ${s.workflow || '-'} | ${s.model} | ${s.tools} | ${fmt(s.tokens)} | ${usd(s.cost)} |`)
     .join('\n');
   const wasteLine = a.wasted ? `\n- **Desperdiçado (runs killed/failed):** ${usd(a.wasted)}` : '';
+  const combinedLine = c.combined ? `\n- **Sessão completa (main + subagents):** ${fmt(c.combined.tokens)} tokens · ${usd(c.combined.cost)}` : '';
+  const modelRows = c.combined?.models?.map((m) => `| ${m.model} | ${m.source} | ${fmt(m.tokens)} | ${usd(m.cost)} |`).join('\n') || '';
+  const models = modelRows ? `\n\n### Por modelo (sessão completa)\n\n| Modelo | Origem | Tokens | Custo |\n|---|---|---:|---:|\n${modelRows}` : '';
   return `## Subagents & Workflows
 
-> Custo de subagents/workflows desta sessão — NÃO incluído no total principal acima.
+> Custo de subagents/workflows desta sessão, seguido do total combinado e da atribuição por modelo.
 
 - **Subagents:** ${a.count} · ${a.calls} chamadas · ${fmt(a.tokens)} tokens · ${usd(a.cost)}
 - **Workflows:** ${wf}
-- **Tools (subagents):** ${tools}${wasteLine}
+- **Tools (subagents):** ${tools}${wasteLine}${combinedLine}
 
 ### Por subagent (${a.count})
 
 | Agent | Tipo | Workflow | Modelo | Tools | Tokens | Custo |
 |---|---|---|---|---:|---:|---:|
-${rows}`;
+${rows}${models}`;
 }
 
 function setFrontmatterField(content, key, value) {
@@ -228,6 +244,26 @@ export function upsertSubagentUsage(sessionPath, transcriptPath) {
   content = setFrontmatterField(content, 'subagents_tools', `"${(a.tools || []).join(', ')}"`);
   content = setFrontmatterField(content, 'subagents_wasted_usd', a.wasted || 0);
   content = setFrontmatterField(content, 'tokens_total_incl_subagents', frontmatterNumber(content, 'tokens_total') + a.tokens);
+  content = setFrontmatterField(content, 'custo_total_incl_subagents_usd', round4(frontmatterNumber(content, 'custo_modelo_usd') + a.cost));
+  let mainRows = [];
+  try {
+    const main = summarizeTokenUsage(parseTokenUsageFromTranscript(transcriptPath));
+    mainRows = (main.modelRows || []).map((r) => ({
+      provider: r.provider || '?', model: r.model || '?', source: 'main', calls: r.calls || 0,
+      tokens: tokensTotal(r.usage), cost: round4(r.costs?.model || 0),
+    }));
+  } catch { /* preserve legacy aggregate fallback */ }
+  if (!mainRows.length) {
+    const mainModel = (content.match(/^custo_modelo_label:\s*["']?([^"'\r\n]+)["']?\s*$/m) || [])[1] || '?';
+    mainRows = [{ model: mainModel, source: 'main', cost: round4(frontmatterNumber(content, 'custo_modelo_usd')), tokens: frontmatterNumber(content, 'tokens_total') }];
+  }
+  const ledger = [...mainRows, ...(a.modelRows || [])];
+  collected.combined = {
+    tokens: frontmatterNumber(content, 'tokens_total') + a.tokens,
+    cost: round4(frontmatterNumber(content, 'custo_modelo_usd') + a.cost),
+    models: ledger,
+  };
+  content = setFrontmatterField(content, 'custo_por_modelo_json', `'${JSON.stringify(ledger).replaceAll("'", "''")}'`);
   content = upsertSection(content, '## Subagents & Workflows', renderSubagentSection(collected));
   writeFileSync(sessionPath, content, 'utf8');
   return true;

package/hooks/token-usage.mjs

@@ -12,7 +12,10 @@ import {
 // Cache write: 5m = 1.25x input, 1h = 2x input (multiplicadores em calculateCost).
 // Tabela editável em pricing.json (mesma pasta); esta é o fallback embutido
 // usado quando o JSON some ou fica inválido — o hook nunca deve quebrar por isso.
-const DEFAULT_PRICE_REFERENCE = {
+const DEFAULT_PRICE_REFERENCE = {
+  'gpt-5.6-sol': { label: 'GPT-5.6 Sol API', provider: 'openai', input: 5, cachedInput: 0.5, output: 30 },
+  'gpt-5.6-terra': { label: 'GPT-5.6 Terra API', provider: 'openai', input: 2.5, cachedInput: 0.25, output: 15 },
+  'gpt-5.6-luna': { label: 'GPT-5.6 Luna API', provider: 'openai', input: 1, cachedInput: 0.1, output: 6 },
   'gpt-5.5': {
     label: 'GPT-5.5 API',
     provider: 'openai',
@@ -82,7 +85,18 @@ export function loadPriceReference(file = PRICING_FILE) {
 
 const PRICE_REFERENCE = loadPriceReference();
 
-const MODEL_ALIASES = {
+const MODEL_ALIASES = {
+  'gpt-5.6': 'gpt-5.6-sol',
+  'gpt-5.6-sol': 'gpt-5.6-sol',
+  'gpt-5-6-sol': 'gpt-5.6-sol',
+  'openai/gpt-5.6': 'gpt-5.6-sol',
+  'openai/gpt-5.6-sol': 'gpt-5.6-sol',
+  'gpt-5.6-terra': 'gpt-5.6-terra',
+  'gpt-5-6-terra': 'gpt-5.6-terra',
+  'openai/gpt-5.6-terra': 'gpt-5.6-terra',
+  'gpt-5.6-luna': 'gpt-5.6-luna',
+  'gpt-5-6-luna': 'gpt-5.6-luna',
+  'openai/gpt-5.6-luna': 'gpt-5.6-luna',
   'gpt-5.5': 'gpt-5.5',
   'gpt-5_5': 'gpt-5.5',
   'openai/gpt-5.5': 'gpt-5.5',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wendkeep",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "A persistent-memory harness for AI coding agents on your Obsidian vault: turn-by-turn session capture plus a native, zero-dependency spec→change→verify→archive loop (sensor-gated, independent verdict, mutation discrimination). Local-first, agent-agnostic (Claude Code, Codex, Cursor…).",
   "type": "module",
   "bin": {

package/src/cost.mjs

@@ -4,6 +4,7 @@
 import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import { isAbsolute, join, resolve } from 'node:path';
 import { getLocale } from '../hooks/locale.mjs';
+import { rebuildSessionCosts } from './rebuild-costs.mjs';
 
 const round4 = (n) => Math.round((Number(n) || 0) * 10000) / 10000;
 const usd = (n) => `$${(Number(n) || 0).toFixed(4)}`;
@@ -20,6 +21,11 @@ function fmValue(content, key) {
 // Parse the cost-relevant frontmatter of one note; null if it is not a session note.
 export function parseSessionCost(content) {
   if (!/^type:\s*session\s*$/m.test(content)) return null;
+  let ledger = [];
+  try {
+    const raw = fmValue(content, 'custo_por_modelo_json').replaceAll("''", "'");
+    if (raw) ledger = JSON.parse(raw);
+  } catch { /* legacy/malformed note: use safe fallback below */ }
   return {
     date: (fmValue(content, 'date') || '').slice(0, 10),
     model: fmValue(content, 'custo_modelo_label') || fmValue(content, 'modelo') || '?',
@@ -29,6 +35,7 @@ export function parseSessionCost(content) {
     tokens: Number(fmValue(content, 'tokens_total')) || 0,
     subTokens: Number(fmValue(content, 'subagents_tokens_total')) || 0,
     prompts: Number(fmValue(content, 'prompts')) || 0,
+    ledger,
   };
 }
 
@@ -46,8 +53,16 @@ export function aggregateCosts(entries) {
     const d = e.date || '?';
     (byDay[d] = byDay[d] || { cost: 0, count: 0 }).cost += e.mainCost + e.subCost;
     byDay[d].count += 1;
-    (byModel[e.model] = byModel[e.model] || { cost: 0, count: 0 }).cost += e.mainCost + e.subCost;
-    byModel[e.model].count += 1;
+    const rows = e.ledger?.length ? e.ledger : [
+      { model: e.model, cost: e.mainCost },
+      ...(e.subCost ? [{ model: 'subagents (legado, modelo desconhecido)', cost: e.subCost }] : []),
+    ];
+    const seen = new Set();
+    for (const row of rows) {
+      const model = row.model || '?';
+      (byModel[model] = byModel[model] || { cost: 0, count: 0 }).cost += Number(row.cost) || 0;
+      if (!seen.has(model)) { byModel[model].count += 1; seen.add(model); }
+    }
   }
   const total = main + sub;
   return {
@@ -186,6 +201,16 @@ export function runCost(argv) {
   if (!vaultRaw) { process.stderr.write('wendkeep cost: no vault (--vault or OBSIDIAN_VAULT_PATH).\n'); process.exit(2); }
   const vaultBase = isAbsolute(vaultRaw) ? vaultRaw : resolve(process.cwd(), vaultRaw);
   if (!existsSync(vaultBase)) { process.stderr.write(`wendkeep cost: vault not found: ${vaultBase}\n`); process.exit(2); }
+  if (argv[0] === 'rebuild') {
+    const report = rebuildSessionCosts(vaultBase, {
+      apply: argv.includes('--apply'),
+      session: opt(argv, '--session') || '',
+      limit: Number(opt(argv, '--limit')) || 0,
+    });
+    if (argv.includes('--json')) process.stdout.write(`${JSON.stringify(report, null, 2)}\n`);
+    else process.stdout.write(`cost rebuild (${report.mode}): ${report.scanned} lidas · ${report.changed} alteradas · ${report.unchanged} iguais · ${report.missing.length} sem fonte · ${report.errors.length} erros\n${report.mode === 'apply' ? 'Relatório: .brain/COST_REBUILD.json\n' : 'Nenhum arquivo foi alterado; use --apply para gravar.\n'}`);
+    process.exit(report.ok ? 0 : 1);
+  }
   const agg = collectVaultCost(vaultBase, { since: opt(argv, '--since') });
 
   if (argv.includes('--json')) { process.stdout.write(`${JSON.stringify(agg, null, 2)}\n`); process.exit(0); }

package/src/rebuild-costs.mjs

@@ -0,0 +1,40 @@
+// Deterministic cost reconstruction for historical sessions.
+// Registry is authoritative: session_file <-> transcript_path. Dry-run restores every note.
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { readSessionRegistry } from '../hooks/obsidian-common.mjs';
+import { updateSessionUsage } from '../hooks/token-usage.mjs';
+import { upsertSubagentUsage } from '../hooks/subagent-usage.mjs';
+
+export function rebuildSessionCosts(vaultBase, { apply = false, session = '', limit = 0 } = {}) {
+  const registry = readSessionRegistry(vaultBase);
+  const report = { version: 1, generatedAt: new Date().toISOString(), mode: apply ? 'apply' : 'dry-run', scanned: 0, changed: 0, unchanged: 0, missing: [], errors: [], sessions: [] };
+  const entries = Object.entries(registry.sessions || {}).map(([sessionId, value]) => ({ sessionId, ...value }))
+    .filter((e) => e.session_file && e.transcript_path)
+    .filter((e) => !session || e.sessionId === session || e.session_file === session);
+  for (const entry of entries) {
+    if (limit && report.scanned >= limit) break;
+    report.scanned += 1;
+    const note = join(vaultBase, entry.session_file);
+    if (!existsSync(note) || !existsSync(entry.transcript_path)) {
+      report.missing.push({ sessionId: entry.sessionId, session: entry.session_file, note: existsSync(note), transcript: existsSync(entry.transcript_path) });
+      continue;
+    }
+    const before = readFileSync(note, 'utf8');
+    try {
+      updateSessionUsage({ vaultBase, sessionRel: entry.session_file, sessionPath: note, transcriptPath: entry.transcript_path });
+      upsertSubagentUsage(note, entry.transcript_path);
+      const after = readFileSync(note, 'utf8');
+      const changed = before !== after;
+      if (changed) report.changed += 1; else report.unchanged += 1;
+      report.sessions.push({ sessionId: entry.sessionId, session: entry.session_file, transcript: entry.transcript_path, changed });
+      if (!apply && changed) writeFileSync(note, before, 'utf8');
+    } catch (error) {
+      if (!apply) writeFileSync(note, before, 'utf8');
+      report.errors.push({ sessionId: entry.sessionId, session: entry.session_file, error: error.message });
+    }
+  }
+  report.ok = report.errors.length === 0;
+  if (apply) writeFileSync(join(vaultBase, '.brain', 'COST_REBUILD.json'), `${JSON.stringify(report, null, 2)}\n`, 'utf8');
+  return report;
+}

package/src/stats.mjs

@@ -14,7 +14,7 @@ export function statsFrom(agg) {
     sessions: agg.count,
     prompts: agg.prompts || 0,
     cost: agg.total,
-    models: (agg.byModel || []).length,
+    models: (agg.byModel || []).filter((m) => m.model !== 'subagents (legado, modelo desconhecido)').length,
     firstDay: days[0] || '',
     lastDay: days[days.length - 1] || '',
     spanDays: days.length,