@gabrihhh/jarvis 2.5.0 → 2.6.1

package/README.md

@@ -22,7 +22,7 @@ Reinicie o Claude Code após o setup.
 | Comando | Descrição |
 |---|---|
 | `jarvis` | Mostra a versão |
-| `jarvis --usage` | Dashboard completo de uso (tokens, custo, contexto) |
+| `jarvis --usage` | Dashboard completo de uso (tokens e custo) |
 | `jarvis --watch` | Dashboard com auto-refresh a cada 30s |
 | `jarvis --setup` | Configura status bar, instala slash commands e define trigger padrão |
 | `jarvis --graph` | Abre o Neo4j Browser em localhost:7474 |
@@ -30,6 +30,14 @@ Reinicie o Claude Code após o setup.
 | `jarvis --trigger session` | Hook de memória roda uma vez por sessão *(padrão)* |
 | `jarvis --trigger prompt` | Hook de memória roda a cada prompt |
 | `jarvis --trigger off` | Desativa o carregamento automático de memória |
+| `jarvis --theme` | Mostra o tema atual da status bar |
+| `jarvis --theme <name>:<#hex>` | Define a cor de um box (`context`, `trigger`, `memory`, `tokens`) |
+| `jarvis --theme <name>:reset` | Reseta a cor de um box para o padrão |
+| `jarvis --theme reset` | Reseta todas as cores para o padrão |
+| `jarvis --token` | Mostra o modo de exibição de tokens atual |
+| `jarvis --token on` | Ativa box com total de tokens do último turno (`◈`) |
+| `jarvis --token complete` | Ativa box `◈` + linha de breakdown abaixo da status bar |
+| `jarvis --token off` | Desativa exibição de tokens |
 | `jarvis --line` | Saída de uma linha usada internamente pela status bar |
 | `jarvis --help` | Lista todos os comandos |
 
@@ -62,13 +70,6 @@ Reinicie o Claude Code após o setup.
 │                                                              │
 ├──────────────────────────────────────────────────────────────┤
 │                                                              │
-│   ⬡  Context Window  (current session)                       │
-│                                                              │
-│   ████████████░░░░░░░░░░░░  52%  103.6K / 200.0K             │
-│   146 turns  ·  model: sonnet-4-6                            │
-│                                                              │
-├──────────────────────────────────────────────────────────────┤
-│                                                              │
 │   Monthly breakdown                                          │
 │   Input: 62.5K   Output: 1.53M                               │
 │   Cache read: 232.48M   Cache write: 11.25M                  │
@@ -82,3 +83,18 @@ Reinicie o Claude Code após o setup.
 │ CONTEXT ████░░░░ 52% │
 ╰──────────────────────╯
 ```
+
+**Status bar com `--token on`** (box com total de tokens do último turno):
+```
+╭──────────────────────╮╭──────────╮
+│ CONTEXT ████░░░░ 52% ││ ◈ 50.0K  │
+╰──────────────────────╯╰──────────╯
+```
+
+**Status bar com `--token complete`** (box + breakdown detalhado):
+```
+╭──────────────────────╮╭──────────╮
+│ CONTEXT ████░░░░ 52% ││ ◈ 50.0K  │
+╰──────────────────────╯╰──────────╯
+INPUT 800 │ HISTORY 45.0K │ CACHE 1.2K │ RESPONSE 3.2K
+```

package/bin/jarvis.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { run } from '../src/index.js';
 import { renderLine } from '../src/statusline.js';
+import { readTheme, writeTheme, isValidHex, DEFAULT_COLORS, VALID_NAMES, THEME_PATH } from '../src/theme.js';
 import { readFileSync, writeFileSync, existsSync, mkdirSync, copyFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { homedir } from 'os';
@@ -76,6 +77,14 @@ if (args.includes('--help') || args.includes('-h')) {
     jarvis --trigger session     Hook runs once per session (default)
     jarvis --trigger prompt      Hook runs on every prompt
     jarvis --trigger off         Disable automatic memory loading
+    jarvis --theme               Show current statusline theme
+    jarvis --theme <name>:<hex>  Set a box color (context, trigger, memory, tokens)
+    jarvis --theme <name>:reset  Reset a single box to default color
+    jarvis --theme reset         Reset all colors to default
+    jarvis --token               Show current token display mode
+    jarvis --token on            Show total tokens box (◈)
+    jarvis --token complete      Show token box + INPUT/HISTORY/CACHE/RESPONSE breakdown
+    jarvis --token off           Disable token display
     jarvis --help                Show this help
 
   Slash commands (inside Claude Code):
@@ -189,6 +198,84 @@ if (args.includes('--graph')) {
   if (mode !== 'off') console.log(`  Hook configured in ~/.claude/settings.json`);
   else console.log(`  Hook removed from ~/.claude/settings.json`);
   console.log(`\n  Restart Claude Code to activate.\n`);
+} else if (args.includes('--theme')) {
+  const { Chalk } = await import('chalk');
+  const chalk = new Chalk({ level: 3 });
+  const value = args[args.indexOf('--theme') + 1];
+
+  // jarvis --theme  →  mostra tema atual
+  if (!value || value.startsWith('--')) {
+    const theme = readTheme();
+    console.log('\n  Current theme:\n');
+    for (const name of VALID_NAMES) {
+      const hex = theme[name];
+      const isDefault = hex === DEFAULT_COLORS[name];
+      const tag = isDefault ? chalk.dim('  (default)') : '';
+      console.log(`    ${chalk.bold(name.padEnd(8))}  ${chalk.hex(hex).bold('██')}  ${hex}${tag}`);
+    }
+    console.log(`\n  Config: ${THEME_PATH}\n`);
+    process.exit(0);
+  }
+
+  // jarvis --theme reset  →  reseta tudo
+  if (value === 'reset') {
+    writeTheme({ ...DEFAULT_COLORS });
+    console.log('\n  ✓ Theme reset to defaults\n');
+    process.exit(0);
+  }
+
+  // jarvis --theme name:value
+  const sep = value.indexOf(':');
+  if (sep === -1) {
+    console.error(`\n  ✗ Invalid format. Use: jarvis --theme <context|trigger|memory>:<#hexcolor|reset>\n`);
+    process.exit(1);
+  }
+
+  const name = value.slice(0, sep);
+  const color = value.slice(sep + 1);
+
+  if (!VALID_NAMES.includes(name)) {
+    console.error(`\n  ✗ Unknown name "${name}". Valid names: ${VALID_NAMES.join(', ')}\n`);
+    process.exit(1);
+  }
+
+  const theme = readTheme();
+
+  if (color === 'reset') {
+    theme[name] = DEFAULT_COLORS[name];
+    writeTheme(theme);
+    console.log(`\n  ✓ ${name} reset to default (${DEFAULT_COLORS[name]})\n`);
+    process.exit(0);
+  }
+
+  if (!isValidHex(color)) {
+    console.error(`\n  ✗ Invalid hex color "${color}". Use format: #rgb or #rrggbb\n`);
+    process.exit(1);
+  }
+
+  theme[name] = color;
+  writeTheme(theme);
+  console.log(`\n  ✓ ${name} set to ${chalk.hex(color).bold(color)}\n`);
+  process.exit(0);
+} else if (args.includes('--token')) {
+  const value = args[args.indexOf('--token') + 1];
+  const validValues = ['on', 'off', 'complete'];
+
+  if (!value || !validValues.includes(value)) {
+    const cfg = loadMemoryConfig();
+    const current = cfg.tokenDisplay || 'off';
+    console.log(`\n  Token display: ${current}\n`);
+    console.log(`  Usage: jarvis --token <on|complete|off>\n`);
+    process.exit(0);
+  }
+
+  const cfg = loadMemoryConfig();
+  cfg.tokenDisplay = value === 'on' ? 'simple' : value;
+  saveMemoryConfig(cfg);
+
+  const labels = { simple: 'on (◈ total tokens)', off: 'off', complete: 'complete (breakdown)' };
+  console.log(`\n  ✓ Token display set to: ${labels[cfg.tokenDisplay]}\n`);
+  process.exit(0);
 } else if (args.includes('--query')) {
   try {
     const { queryByPath } = await import('../src/memory/query-by-path.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gabrihhh/jarvis",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "Claude Code terminal dashboard + semantic memory graph via Neo4j",
   "bin": {
     "jarvis": "bin/jarvis.js",

package/src/calculator.js

@@ -109,6 +109,18 @@ export function formatTokens(n) {
   return `${n}`;
 }
 
+export function getLastTurnTokens(entries) {
+  if (!entries.length) return null;
+  const last = entries[entries.length - 1];
+  return {
+    input:    last.inputTokens,
+    history:  last.cacheReadTokens,
+    cache:    last.cacheWriteTokens,
+    response: last.outputTokens,
+    total:    last.inputTokens + last.outputTokens + last.cacheReadTokens + last.cacheWriteTokens,
+  };
+}
+
 export function formatCost(n) {
   if (n >= 1) return `$${n.toFixed(2)}`;
   if (n >= 0.01) return `$${n.toFixed(3)}`;

package/src/statusline.js

@@ -3,14 +3,11 @@ import { readFileSync, existsSync, unlinkSync } from 'fs';
 import { join } from 'path';
 import { homedir, tmpdir } from 'os';
 import { readAllUsage, getCurrentSessionFile, readCurrentSessionUsage } from './reader.js';
-import { aggregateStats, aggregateSession } from './calculator.js';
+import { aggregateStats, aggregateSession, getLastTurnTokens, formatTokens } from './calculator.js';
+import { readTheme } from './theme.js';
 
 const chalk = new Chalk({ level: 3 });
 
-const PINK = '#f472b6';
-const CYAN = '#22d3ee';
-const GREEN = '#4ade80';
-
 function bar(percent, width = 8) {
   const filled = Math.round((percent / 100) * width);
   const empty  = width - filled;
@@ -24,6 +21,13 @@ function readTriggerMode() {
   } catch { return 'off'; }
 }
 
+function readTokenMode() {
+  try {
+    const cfg = JSON.parse(readFileSync(join(homedir(), '.claude-memory.json'), 'utf8'));
+    return cfg.tokenDisplay || 'off';
+  } catch { return 'off'; }
+}
+
 function buildBox(inner, color, width = inner.length) {
   return [
     chalk.hex(color).bold(`╭${'─'.repeat(width)}╮`),
@@ -57,36 +61,54 @@ function isMemoryLoaded(sessionId) {
 
 export function renderLine() {
   const mode = readTriggerMode();
+  const tokenMode = readTokenMode();
+  const theme = readTheme();
 
   const sessionMeta = getCurrentSessionFile();
   const sessionId = sessionMeta?.sessionId;
   const loaded = isMemoryLoaded(sessionId);
-  const loadedBox = loaded ? buildBox(' ⬡  ', GREEN, 4) : null;
+  const loadedBox = loaded ? buildBox(' ⬡  ', theme.memory, 4) : null;
 
   const allEntries = readAllUsage();
 
-  const boxes = (contextBox) => {
+  const buildOutput = (contextBox, turnTokens) => {
     const toJoin = [contextBox];
-    if (mode !== 'off') toJoin.push(buildBox(` TRIGGER ${mode.toUpperCase()} `, PINK));
+    if (mode !== 'off') toJoin.push(buildBox(` TRIGGER ${mode.toUpperCase()} `, theme.trigger));
     if (loadedBox) toJoin.push(loadedBox);
-    return joinBoxes(...toJoin);
+    if (turnTokens) toJoin.push(buildBox(` ◈ ${formatTokens(turnTokens.total)} `, theme.tokens));
+
+    let out = joinBoxes(...toJoin);
+
+    if (tokenMode === 'complete' && turnTokens) {
+      const col = (s) => chalk.hex(theme.tokens).bold(s);
+      const parts = [
+        `INPUT ${formatTokens(turnTokens.input)}`,
+        `HISTORY ${formatTokens(turnTokens.history)}`,
+        `CACHE ${formatTokens(turnTokens.cache)}`,
+        `RESPONSE ${formatTokens(turnTokens.response)}`,
+      ];
+      out += '\n' + parts.map(col).join(col(' │ '));
+    }
+
+    return out;
   };
 
   if (!allEntries.length) {
-    const contextBox = buildBox(` CONTEXT ${'░'.repeat(8)} 0% `, CYAN);
-    process.stdout.write(boxes(contextBox));
+    const contextBox = buildBox(` CONTEXT ${'░'.repeat(8)} 0% `, theme.context);
+    process.stdout.write(buildOutput(contextBox, null));
     return;
   }
 
   const sessionEntries = sessionId ? readCurrentSessionUsage(sessionId) : [];
   const session = aggregateSession(sessionEntries);
+  const turnTokens = tokenMode !== 'off' ? getLastTurnTokens(sessionEntries) : null;
 
   if (!session) {
-    const contextBox = buildBox(` CONTEXT ${'░'.repeat(8)} 0% `, CYAN);
-    process.stdout.write(boxes(contextBox));
+    const contextBox = buildBox(` CONTEXT ${'░'.repeat(8)} 0% `, theme.context);
+    process.stdout.write(buildOutput(contextBox, turnTokens));
     return;
   }
 
-  const contextBox = buildBox(` CONTEXT ${bar(session.percent)} ${session.percent}% `, CYAN);
-  process.stdout.write(boxes(contextBox));
+  const contextBox = buildBox(` CONTEXT ${bar(session.percent)} ${session.percent}% `, theme.context);
+  process.stdout.write(buildOutput(contextBox, turnTokens));
 }

package/src/theme.js

@@ -0,0 +1,31 @@
+import { readFileSync, writeFileSync, existsSync } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
+
+export const THEME_PATH = join(homedir(), '.claude', 'jarvis-theme.json');
+
+export const DEFAULT_COLORS = {
+  context: '#22d3ee',
+  trigger: '#f472b6',
+  memory:  '#4ade80',
+  tokens:  '#ef4444',
+};
+
+export const VALID_NAMES = Object.keys(DEFAULT_COLORS);
+
+export function readTheme() {
+  try {
+    const raw = JSON.parse(readFileSync(THEME_PATH, 'utf8'));
+    return { ...DEFAULT_COLORS, ...raw };
+  } catch {
+    return { ...DEFAULT_COLORS };
+  }
+}
+
+export function writeTheme(theme) {
+  writeFileSync(THEME_PATH, JSON.stringify(theme, null, 2));
+}
+
+export function isValidHex(value) {
+  return /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/.test(value);
+}