routstrd 0.2.16 → 0.2.18

package/dist/daemon/index.js

@@ -37553,6 +37553,7 @@ var createBunSqliteUsageTrackingDriver2 = (options = {}) => {
 
 // src/daemon/wallet/index.ts
 init_cashu_ts_es();
+init_dist3();
 
 // src/daemon/wallet/cocod-client.ts
 import { createHash } from "crypto";
@@ -37908,6 +37909,9 @@ async function createWalletAdapter(options = {}) {
             await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
             continue;
           }
+          if (errorMessage.includes("Not enough proofs")) {
+            throw new InsufficientBalanceError(amount, 0);
+          }
           logger3.error("Error in walletAdapter sendToken:", error);
           throw error;
         }
@@ -37940,7 +37944,7 @@ async function createWalletAdapter(options = {}) {
 }
 
 // src/daemon/models.ts
-function createModelService(modelManager) {
+function createModelService(modelManager, store) {
   let providerBootstrapPromise = null;
   const ensureProvidersBootstrapped = () => {
     if (!providerBootstrapPromise) {
@@ -37949,6 +37953,16 @@ function createModelService(modelManager) {
         const providers = await modelManager.bootstrapProviders(false);
         logger3.log(`Bootstrapped ${providers.length} providers`);
         await modelManager.fetchModels(providers);
+        const { baseUrlsList, setBaseUrlsList } = store.getState();
+        const existing = new Set(baseUrlsList);
+        const merged = [
+          ...baseUrlsList,
+          ...providers.filter((url2) => !existing.has(url2))
+        ];
+        if (merged.length !== baseUrlsList.length) {
+          setBaseUrlsList(merged);
+          logger3.log(`Synced ${merged.length - baseUrlsList.length} new provider(s) into store`);
+        }
         logger3.log("Provider bootstrap complete.");
       })().catch((error) => {
         logger3.error("Provider bootstrap failed:", error);
@@ -42656,6 +42670,18 @@ async function buildWalletDetails(deps) {
     activeMint: deps.walletAdapter.getActiveMintUrl()
   };
 }
+function makeSdkLogger(prefix) {
+  const tag = prefix ? `[${prefix}]` : undefined;
+  const fmt = (...args) => tag ? [tag, ...args] : args;
+  return {
+    log: (...args) => logger3.log(...fmt(...args)),
+    warn: (...args) => logger3.log(...fmt(...args)),
+    error: (...args) => logger3.error(...fmt(...args)),
+    debug: (...args) => logger3.debug(...fmt(...args)),
+    child: (p) => makeSdkLogger(prefix ? `${prefix}:${p}` : p)
+  };
+}
+var sdkLogger = makeSdkLogger();
 function createDaemonRequestHandler(deps) {
   return async function handler(req, res) {
     const host = req.headers.host || "localhost";
@@ -43228,7 +43254,9 @@ function createDaemonRequestHandler(deps) {
     }
     try {
       await deps.ensureProvidersBootstrapped();
-      logger3.log("Routing request with path: ", url2.pathname);
+      const reqId = randomBytes6(4).toString("hex");
+      const reqLogger = sdkLogger.child(`req:${reqId}`);
+      logger3.log(`[req:${reqId}] Routing request with path: `, url2.pathname);
       const response = await routeRequests({
         modelId,
         requestBody,
@@ -43244,7 +43272,8 @@ function createDaemonRequestHandler(deps) {
         mode: deps.mode,
         usageTrackingDriver: deps.usageTrackingDriver,
         sdkStore: deps.store,
-        providerManager: deps.providerManager
+        providerManager: deps.providerManager,
+        logger: reqLogger
       });
       res.statusCode = response.status;
       response.headers.forEach((value, key) => {
@@ -43327,6 +43356,18 @@ async function refreshModelsAndIntegrations(getRoutstr21Models, config, label =
 
 // src/daemon/index.ts
 init_dist3();
+function makeSdkLogger2(prefix) {
+  const tag = prefix ? `[${prefix}]` : undefined;
+  const fmt = (...args) => tag ? [tag, ...args] : args;
+  return {
+    log: (...args) => logger3.log(...fmt(...args)),
+    warn: (...args) => logger3.log(...fmt(...args)),
+    error: (...args) => logger3.error(...fmt(...args)),
+    debug: (...args) => logger3.debug(...fmt(...args)),
+    child: (p) => makeSdkLogger2(prefix ? `${prefix}:${p}` : p)
+  };
+}
+var daemonSdkLogger = makeSdkLogger2();
 async function main() {
   const args = parseArgs(process.argv);
   const config = await loadDaemonConfig();
@@ -43335,7 +43376,7 @@ async function main() {
   await ensureDirs();
   const updatedConfig = { ...config, port, provider };
   saveDaemonConfig(updatedConfig);
-  const sqliteDriver = await createBunSqliteDriver2(DB_PATH);
+  const sqliteDriver = await createBunSqliteDriver2(DB_PATH, { logger: daemonSdkLogger });
   const { store, hydrate } = createSdkStore({ driver: sqliteDriver });
   await hydrate;
   const { Database } = await import("bun:sqlite");
@@ -43345,11 +43386,11 @@ async function main() {
     legacyStorageDriver: sqliteDriver
   });
   const discoveryAdapter = createDiscoveryAdapterFromStore(store);
-  const providerRegistry = createProviderRegistryFromStore(store);
+  const providerRegistry = createProviderRegistryFromStore(store, daemonSdkLogger);
   const storageAdapter = createStorageAdapterFromStore(store);
-  const modelManager = new ModelManager(discoveryAdapter);
-  const providerManager = new ProviderManager(providerRegistry, store);
-  const { ensureProvidersBootstrapped, getRoutstr21Models, getModelProviders } = createModelService(modelManager);
+  const modelManager = new ModelManager(discoveryAdapter, { logger: daemonSdkLogger });
+  const providerManager = new ProviderManager(providerRegistry, store, daemonSdkLogger);
+  const { ensureProvidersBootstrapped, getRoutstr21Models, getModelProviders } = createModelService(modelManager, store);
   const walletClient = createCocodClient({ cocodPath: config.cocodPath });
   const walletAdapter = await createWalletAdapter({
     cocodPath: config.cocodPath,

package/dist/index.js

@@ -2302,14 +2302,6 @@ var init_process_lock = () => {
 };
 
 // src/start-daemon.ts
-import { existsSync as existsSync2 } from "fs";
-function getTodayLogFile() {
-  const now = new Date;
-  const year = now.getFullYear();
-  const month = String(now.getMonth() + 1).padStart(2, "0");
-  const day = String(now.getDate()).padStart(2, "0");
-  return `${LOGS_DIR2}/${year}-${month}-${day}.log`;
-}
 async function isDaemonHealthy(port) {
   const controller = new AbortController;
   const timeoutId = setTimeout(() => controller.abort(), 2000);
@@ -2339,12 +2331,8 @@ async function startDaemonUnlocked(options) {
   if (options.provider) {
     args.push("--provider", options.provider);
   }
-  if (!existsSync2(LOGS_DIR2)) {
-    await Bun.$`mkdir -p ${LOGS_DIR2}`;
-  }
   const daemonScript = new URL("./daemon/index.js", import.meta.url).pathname;
-  const todayLogFile = getTodayLogFile();
-  const shellCmd = `bun run "${daemonScript}" ${args.map((a) => `'${a}'`).join(" ")} >> "${todayLogFile}" 2>&1`;
+  const shellCmd = `bun run "${daemonScript}" ${args.map((a) => `'${a}'`).join(" ")}`;
   const proc = Bun.spawn(["sh", "-c", shellCmd], {
     stdout: "inherit",
     stderr: "inherit",
@@ -9380,10 +9368,10 @@ var init_nip98 = __esm(() => {
 });
 
 // src/utils/daemon-client.ts
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync2 } from "fs";
 async function loadConfig() {
   try {
-    if (existsSync3(CONFIG_FILE)) {
+    if (existsSync2(CONFIG_FILE)) {
       const content = await Bun.file(CONFIG_FILE).text();
       return { ...DEFAULT_CONFIG, ...JSON.parse(content) };
     }
@@ -13681,17 +13669,23 @@ var require_browser = __commonJS((exports) => {
 });
 
 // src/tui/usage/constants.ts
-var TABS, COLORS, MODEL_COLORS, CLIENT_COLORS;
+function getVisibleTabs(hasNpubs) {
+  const tabs = ALL_TABS.filter((t) => t.id !== "npubs" || hasNpubs);
+  return tabs.map((t, i2) => ({ ...t, key: String(i2 + 1) }));
+}
+var ALL_TABS, TABS, COLORS, MODEL_COLORS, CLIENT_COLORS;
 var init_constants = __esm(() => {
-  TABS = [
+  ALL_TABS = [
     { id: "overview", name: "Overview", key: "1" },
     { id: "today", name: "Today", key: "2" },
     { id: "models", name: "Models", key: "3" },
     { id: "providers", name: "Providers", key: "4" },
     { id: "tokens", name: "Tokens", key: "5" },
     { id: "clients", name: "Clients", key: "6" },
-    { id: "recent", name: "Recent", key: "7" }
+    { id: "npubs", name: "Npubs", key: "7" },
+    { id: "recent", name: "Recent", key: "8" }
   ];
+  TABS = getVisibleTabs(false);
   COLORS = {
     reset: "\x1B[0m",
     bold: "\x1B[1m",
@@ -13915,6 +13909,58 @@ function getClientStats(entries) {
   }
   return Array.from(clients.values()).sort((a, b) => b.satsCost - a.satsCost);
 }
+async function fetchClients() {
+  try {
+    const running = await isDaemonRunning();
+    if (!running)
+      return [];
+    const result = await callDaemon("/clients");
+    if (result.error)
+      return [];
+    const output = result.output;
+    return (output?.clients || []).map((c) => ({
+      clientId: c.id,
+      name: c.name,
+      ownerNpub: c.ownerNpub
+    }));
+  } catch {
+    return [];
+  }
+}
+function hasAnyNpubs(clients) {
+  return clients.some((c) => !!c.ownerNpub);
+}
+function getNpubStats(entries, clients) {
+  const clientNpubMap = new Map;
+  for (const c of clients) {
+    if (c.ownerNpub) {
+      clientNpubMap.set(c.clientId, c.ownerNpub);
+    }
+  }
+  const npubs = new Map;
+  for (const entry of entries) {
+    const npub = clientNpubMap.get(entry.client || "");
+    if (!npub)
+      continue;
+    const existing = npubs.get(npub) || {
+      npub,
+      requests: 0,
+      satsCost: 0,
+      promptTokens: 0,
+      completionTokens: 0,
+      totalTokens: 0
+    };
+    npubs.set(npub, {
+      ...existing,
+      requests: existing.requests + 1,
+      satsCost: existing.satsCost + entry.satsCost,
+      promptTokens: existing.promptTokens + entry.promptTokens,
+      completionTokens: existing.completionTokens + entry.completionTokens,
+      totalTokens: existing.totalTokens + entry.totalTokens
+    });
+  }
+  return Array.from(npubs.values()).sort((a, b) => b.satsCost - a.satsCost);
+}
 function getTotals(entries) {
   if (!entries || !Array.isArray(entries)) {
     return { promptTokens: 0, completionTokens: 0, totalTokens: 0, satsCost: 0 };
@@ -14061,10 +14107,11 @@ function formatReqs(value) {
     return (value / 1000).toFixed(1) + "k";
   return value.toString();
 }
-function renderHeader(activeTab, width) {
+function renderHeader(activeTab, width, visibleTabs) {
   const title = `${COLORS.bold}${COLORS.cyan}ROUTSTRD USAGE MONITOR${COLORS.reset}`;
   const vimIndicator = `${COLORS.yellow}[vim]${COLORS.reset}`;
-  const help = `${COLORS.dim}[Q] Quit  [\u2191\u2193] Scroll  [\u2190\u2192] Tabs  [1-7] Tabs  [R] Refresh${COLORS.reset}`;
+  const maxKey = visibleTabs.length;
+  const help = `${COLORS.dim}[Q] Quit  [\u2191\u2193] Scroll  [\u2190\u2192] Tabs  [1-${maxKey}] Tabs  [R] Refresh${COLORS.reset}`;
   const fill = width - title.length - help.length - vimIndicator.length - 6;
   return `${title}${vimIndicator}${" ".repeat(Math.max(1, fill))}${help}
 `;
@@ -14080,8 +14127,8 @@ function renderSearchBar() {
 ${searchLine}${placeholder}
 `;
 }
-function renderTabs(activeTab) {
-  const tabStr = TABS.map((tab) => tab.id === activeTab ? `${COLORS.bgBlue} ${tab.key}:${tab.name} ${COLORS.reset}` : `${COLORS.dim}[${tab.key}]${COLORS.reset} ${tab.name}`).join("  ");
+function renderTabs(activeTab, visibleTabs) {
+  const tabStr = visibleTabs.map((tab) => tab.id === activeTab ? `${COLORS.bgBlue} ${tab.key}:${tab.name} ${COLORS.reset}` : `${COLORS.dim}[${tab.key}]${COLORS.reset} ${tab.name}`).join("  ");
   return `${" ".repeat(2)}${tabStr}
 `;
 }
@@ -14452,25 +14499,106 @@ function renderClients(stats, width) {
   }
   return output;
 }
+function renderNpubs(stats, clients, width) {
+  const npubStats = getNpubStats(stats.entries, clients);
+  if (npubStats.length === 0)
+    return renderBox(["No npub data available"], width, "Npub Breakdown");
+  const totalCost = stats.totalSatsCost;
+  const maxCost = npubStats[0].satsCost;
+  const lines = [];
+  const col1 = 24;
+  const col2 = 12;
+  const col3 = 24;
+  const col4 = 12;
+  const hNpub = "Npub".padEnd(col1);
+  const hReqs = "Requests".padEnd(col2);
+  const hCost = "Cost".padEnd(col3);
+  const hTok = "Tokens".padEnd(col4);
+  lines.push(`${COLORS.bold}${hNpub}${hReqs}${hCost}${hTok}Avg Cost${COLORS.reset}`);
+  lines.push(COLORS.dim + "\u2500".repeat(Math.max(0, width - 4)) + COLORS.reset);
+  startBarSection("npub-detail", col1);
+  for (const npub of npubStats) {
+    const pct = totalCost > 0 ? (npub.satsCost / totalCost * 100).toFixed(1) : "0.0";
+    const avgCostFormatted = formatCost(npub.requests > 0 ? npub.satsCost / npub.requests : 0);
+    const shortNpub = truncateNpub(npub.npub);
+    const dNpub = shortNpub.padEnd(col1);
+    const dReqs = formatReqs(npub.requests).padEnd(col2);
+    const dCost = `${formatCost(npub.satsCost)} sats (${pct}%)`.padEnd(col3);
+    const dTok = formatNumber(npub.totalTokens).padEnd(col4);
+    const dAvg = `${avgCostFormatted} sats/req`;
+    lines.push(`${COLORS.magenta}${COLORS.bold}${dNpub}${COLORS.reset}` + `${dReqs}` + `${COLORS.green}${dCost}${COLORS.reset}` + `${COLORS.dim}${dTok}${dAvg}${COLORS.reset}`);
+    lines.push(`  ${COLORS.dim}${npub.npub}${COLORS.reset}`);
+    lines.push(`  ${renderBarChart("", npub.satsCost, maxCost, width - 6, COLORS.magenta, Number(pct), "npub-detail")}`);
+    lines.push("");
+  }
+  endBarSection("npub-detail");
+  let output = renderBox(lines, width, "Npub Breakdown");
+  const npubModelMap = new Map;
+  const clientNpubMap = new Map;
+  for (const c of clients) {
+    if (c.ownerNpub)
+      clientNpubMap.set(c.clientId, c.ownerNpub);
+  }
+  for (const entry of stats.entries) {
+    const npub = clientNpubMap.get(entry.client || "");
+    if (!npub)
+      continue;
+    const model = entry.modelId;
+    if (!npubModelMap.has(npub))
+      npubModelMap.set(npub, new Map);
+    const modelMap = npubModelMap.get(npub);
+    const existing = modelMap.get(model) || { requests: 0, satsCost: 0, tokens: 0 };
+    modelMap.set(model, {
+      requests: existing.requests + 1,
+      satsCost: existing.satsCost + entry.satsCost,
+      tokens: existing.tokens + entry.totalTokens
+    });
+  }
+  const npubModelLines = [];
+  for (const topNpub of npubStats.slice(0, 5)) {
+    const modelMap = npubModelMap.get(topNpub.npub);
+    if (!modelMap)
+      continue;
+    const models = Array.from(modelMap.entries()).sort((a, b) => b[1].satsCost - a[1].satsCost).slice(0, 5);
+    npubModelLines.push(`${COLORS.bold}${truncateNpub(topNpub.npub)}${COLORS.reset} (${formatReqs(topNpub.requests)} reqs, ${formatCost(topNpub.satsCost)} sats)`);
+    for (const [model, data] of models) {
+      npubModelLines.push(`  ${MODEL_COLORS[model] || MODEL_COLORS.default}${model.padEnd(18)}${COLORS.reset} ${formatNumber(data.tokens).padEnd(8)} tokens  ${formatCost(data.satsCost)} sats`);
+    }
+    npubModelLines.push("");
+  }
+  if (npubModelLines.length > 0) {
+    output += `
+` + renderBox(npubModelLines, width, "Top Models per Npub");
+  }
+  return output;
+}
+function truncateNpub(npub) {
+  if (npub.length <= 24)
+    return npub;
+  return npub.slice(0, 10) + "\u2026" + npub.slice(-6);
+}
 function renderRecent(stats, width) {
   const recentEntries = stats.entries.slice(0, 50);
   if (recentEntries.length === 0)
     return renderBox(["No recent entries"], width, "Recent Requests");
+  const clientCol = 14;
   const lines = [];
-  lines.push(`${COLORS.bold}${"TIME".padEnd(10)} ${"MODEL".padEnd(18)} ${"TOKENS".padEnd(10)} ${"COST".padEnd(12)} ${"PROVIDER".slice(0, Math.max(0, width - 60))}${COLORS.reset}`);
+  lines.push(`${COLORS.bold}${"TIME".padEnd(10)} ${"MODEL".padEnd(18)} ${"TOKENS".padEnd(10)} ${"COST".padEnd(12)} ${"PROVIDER".padEnd(16)} ${"CLIENT".slice(0, clientCol)}${COLORS.reset}`);
   lines.push(COLORS.dim + "\u2500".repeat(width - 4) + COLORS.reset);
   for (const entry of recentEntries) {
     const time = formatTime(entry.timestamp).slice(0, 8);
     const model = entry.modelId.slice(0, 18).padEnd(18);
     const tokens = `${formatNumber(entry.totalTokens).padEnd(6)} (${formatNumber(entry.promptTokens)}+${formatNumber(entry.completionTokens)})`;
     const cost = `${formatCost(entry.satsCost).padEnd(8)} sats`;
-    const provider = (entry.baseUrl || "unknown").replace("https://", "").replace("http://", "").slice(0, Math.max(0, width - 60));
-    const color = MODEL_COLORS[entry.modelId] || MODEL_COLORS.default;
-    lines.push(`${COLORS.dim}${time}${COLORS.reset} ${color}${model}${COLORS.reset} ${tokens.padEnd(10)} ${COLORS.green}${cost}${COLORS.reset} ${COLORS.dim}${provider}${COLORS.reset}`);
+    const provider = (entry.baseUrl || "unknown").replace("https://", "").replace("http://", "").slice(0, 16).padEnd(16);
+    const clientName = (entry.client || "unknown").slice(0, clientCol - 1);
+    const clientColor = CLIENT_COLORS[entry.client || "unknown"] || CLIENT_COLORS.default || COLORS.white;
+    const modelColor = MODEL_COLORS[entry.modelId] || MODEL_COLORS.default;
+    lines.push(`${COLORS.dim}${time}${COLORS.reset} ${modelColor}${model}${COLORS.reset} ${tokens.padEnd(10)} ${COLORS.green}${cost}${COLORS.reset} ${COLORS.dim}${provider}${COLORS.reset} ${clientColor}${clientName}${COLORS.reset}`);
   }
   return renderBox(lines, width, `Recent Requests (${stats.entries.length} shown)`);
 }
-function renderTabContent(activeTab, stats, balance, status, width) {
+function renderTabContent(activeTab, stats, balance, status, width, clients = []) {
   switch (activeTab) {
     case "overview":
       return renderOverview(stats, balance, status, width);
@@ -14484,6 +14612,8 @@ function renderTabContent(activeTab, stats, balance, status, width) {
       return renderTokens(stats, width);
     case "clients":
       return renderClients(stats, width);
+    case "npubs":
+      return renderNpubs(stats, clients, width);
     case "recent":
       return renderRecent(stats, width);
     default:
@@ -14513,6 +14643,8 @@ async function runUsageTui() {
   let stats = null;
   let balance = null;
   let status = null;
+  let clients = [];
+  let visibleTabs = getVisibleTabs(false);
   let refreshInterval = null;
   let shouldUpdate = true;
   let autoRefresh = true;
@@ -14552,6 +14684,13 @@ async function runUsageTui() {
         stats = await fetchUsage(1e4);
         balance = await fetchBalance();
         status = await fetchStatus();
+        clients = await fetchClients();
+        const npubsVisible = hasAnyNpubs(clients);
+        visibleTabs = getVisibleTabs(npubsVisible);
+        if (currentTab === "npubs" && !npubsVisible) {
+          currentTab = "clients";
+          vimState.scrollPos = 0;
+        }
         shouldUpdate = false;
       }
       if (!stats) {
@@ -14561,9 +14700,9 @@ async function runUsageTui() {
 Press Q to quit.`);
         return;
       }
-      const content = renderTabContent(currentTab, stats, balance, status, width);
+      const content = renderTabContent(currentTab, stats, balance, status, width, clients);
       const footer = `${COLORS.dim}Press [Q] to quit, [R] to refresh, [A] to toggle auto-refresh${autoRefresh ? " (on)" : " (off)"}  scroll:${vimState.scrollPos}${COLORS.reset}${vimState.mode === "normal" ? `  ${COLORS.yellow}vim: hjkl/arrows, / search, g top, gg bottom${COLORS.reset}` : ""}`;
-      const chrome = renderHeader(currentTab, width) + renderTabs(currentTab) + renderSeparator(width) + renderSearchBar();
+      const chrome = renderHeader(currentTab, width, visibleTabs) + renderTabs(currentTab, visibleTabs) + renderSeparator(width) + renderSearchBar();
       const chromeLines = chrome.split(`
 `).length - 1;
       const footerSeparator = renderSeparator(width);
@@ -14637,15 +14776,15 @@ Press Q to quit.`);
       return;
     }
     if (key === "l" || key === "\x1B[C" || key === "\x1BOC") {
-      const currentIdx = TABS.findIndex((t) => t.id === currentTab);
-      currentTab = TABS[(currentIdx + 1) % TABS.length].id;
+      const currentIdx = visibleTabs.findIndex((t) => t.id === currentTab);
+      currentTab = visibleTabs[(currentIdx + 1) % visibleTabs.length].id;
       vimState.scrollPos = 0;
       render2(false);
       return;
     }
     if (key === "h" || key === "\x1B[D" || key === "\x1BOD") {
-      const currentIdx = TABS.findIndex((t) => t.id === currentTab);
-      currentTab = TABS[(currentIdx - 1 + TABS.length) % TABS.length].id;
+      const currentIdx = visibleTabs.findIndex((t) => t.id === currentTab);
+      currentTab = visibleTabs[(currentIdx - 1 + visibleTabs.length) % visibleTabs.length].id;
       vimState.scrollPos = 0;
       render2(false);
       return;
@@ -14724,7 +14863,7 @@ Press Q to quit.`);
       render2(false);
       return;
     }
-    const tab = TABS.find((t) => t.key === key);
+    const tab = visibleTabs.find((t) => t.key === key);
     if (tab) {
       currentTab = tab.id;
       vimState.scrollPos = 0;
@@ -14747,7 +14886,6 @@ var init_app = __esm(() => {
   init_state();
   init_constants();
   init_render();
-  init_daemon_client();
 });
 
 // src/tui/usage/index.ts
@@ -14789,7 +14927,7 @@ import { join as join3 } from "path";
 // src/integrations/opencode.ts
 init_logger();
 init_daemon_client();
-import { existsSync as existsSync4, mkdirSync } from "fs";
+import { existsSync as existsSync3, mkdirSync } from "fs";
 import { readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
 import { dirname as dirname2 } from "path";
 var OPENCODE_SMALL_MODEL = "routstr/minimax-m2.5";
@@ -14801,7 +14939,7 @@ Installing routstr models in opencode.json...`);
   const baseUrl = getDaemonBaseUrl(config);
   let opencodeConfig;
   try {
-    if (existsSync4(configPath)) {
+    if (existsSync3(configPath)) {
       const content = await readFile2(configPath, "utf-8");
       opencodeConfig = JSON.parse(content);
     } else {
@@ -14846,7 +14984,7 @@ Installing routstr models in opencode.json...`);
 // src/integrations/pi.ts
 init_logger();
 init_daemon_client();
-import { existsSync as existsSync5, mkdirSync as mkdirSync2 } from "fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2 } from "fs";
 import { readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
 import { dirname as dirname3 } from "path";
 async function installPiIntegration(config, apiKey, integrationConfig) {
@@ -14857,7 +14995,7 @@ Installing routstr models in pi models.json...`);
   const baseUrl = `${getDaemonBaseUrl(config)}/v1`;
   let piConfig = {};
   try {
-    if (existsSync5(configPath)) {
+    if (existsSync4(configPath)) {
       const content = await readFile3(configPath, "utf-8");
       piConfig = JSON.parse(content);
     }
@@ -14894,7 +15032,7 @@ Installing routstr models in pi models.json...`);
 // src/integrations/openclaw.ts
 init_logger();
 init_daemon_client();
-import { existsSync as existsSync6, mkdirSync as mkdirSync3 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3 } from "fs";
 import { readFile as readFile4, writeFile as writeFile4 } from "fs/promises";
 import { dirname as dirname4 } from "path";
 var OPENCLAW_PROVIDER_ID = "routstr";
@@ -14908,7 +15046,7 @@ Installing routstr models in openclaw.json...`);
   const baseUrl = getDaemonBaseUrl(config);
   let openclawConfig = {};
   try {
-    if (existsSync6(configPath)) {
+    if (existsSync5(configPath)) {
       const content = await readFile4(configPath, "utf-8");
       openclawConfig = JSON.parse(content);
     }
@@ -14970,7 +15108,7 @@ Installing routstr models in openclaw.json...`);
 // src/integrations/claudecode.ts
 init_logger();
 init_daemon_client();
-import { existsSync as existsSync7, mkdirSync as mkdirSync4 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4 } from "fs";
 import { readFile as readFile5, writeFile as writeFile5 } from "fs/promises";
 import { dirname as dirname5 } from "path";
 async function installClaudeCodeIntegration(config, apiKey, integrationConfig) {
@@ -14981,7 +15119,7 @@ Installing routstr configuration in ${configPath}...`);
   const baseUrl = getDaemonBaseUrl(config);
   let settings = {};
   try {
-    if (existsSync7(configPath)) {
+    if (existsSync6(configPath)) {
       const content = await readFile5(configPath, "utf-8");
       settings = JSON.parse(content);
     }
@@ -15028,7 +15166,7 @@ Installing routstr configuration in ${configPath}...`);
 // src/integrations/hermes.ts
 init_logger();
 init_daemon_client();
-import { existsSync as existsSync8, mkdirSync as mkdirSync5 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync5 } from "fs";
 import { readFile as readFile6, writeFile as writeFile6 } from "fs/promises";
 import { dirname as dirname6 } from "path";
 async function installHermesIntegration(config, apiKey, integrationConfig) {
@@ -15057,7 +15195,7 @@ Installing routstr configuration in ${configPath}...`);
   }
   let content = "";
   try {
-    if (existsSync8(configPath)) {
+    if (existsSync7(configPath)) {
       content = await readFile6(configPath, "utf-8");
     }
   } catch (error) {
@@ -15309,7 +15447,7 @@ async function addClientAction(options) {
 // src/cli.ts
 init_config();
 init_logger();
-import { existsSync as existsSync10, mkdirSync as mkdirSync6 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync6 } from "fs";
 import { execSync } from "child_process";
 
 // src/integrations/index.ts
@@ -15463,7 +15601,7 @@ init_nip98();
 init_esm();
 
 // src/daemon/wallet/cocod-client.ts
-import { existsSync as existsSync9 } from "fs";
+import { existsSync as existsSync8 } from "fs";
 init_logger();
 init_process_lock();
 var DEFAULT_CONFIG_DIR = process.env.COCOD_DIR || `${process.env.HOME || process.env.USERPROFILE || ""}/.cocod`;
@@ -15475,7 +15613,7 @@ function resolveCocodExecutable(cocodPath) {
 async function isCocodInstalled(cocodPath) {
   const executable = resolveCocodExecutable(cocodPath);
   if (executable.includes("/")) {
-    return existsSync9(executable);
+    return existsSync8(executable);
   }
   try {
     const proc = Bun.spawn({
@@ -15491,7 +15629,7 @@ async function isCocodInstalled(cocodPath) {
 // package.json
 var package_default = {
   name: "routstrd",
-  version: "0.2.16",
+  version: "0.2.18",
   module: "src/index.ts",
   type: "module",
   private: false,
@@ -15515,7 +15653,7 @@ var package_default = {
   },
   dependencies: {
     "@cashu/cashu-ts": "^3.1.1",
-    "@routstr/sdk": "^0.3.2",
+    "@routstr/sdk": "^0.3.4",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
     commander: "^14.0.2",
@@ -15570,11 +15708,11 @@ async function requireLocalDaemon() {
 }
 async function initDaemon() {
   logger.log("Initializing routstrd...");
-  if (!existsSync10(CONFIG_DIR)) {
+  if (!existsSync9(CONFIG_DIR)) {
     mkdirSync6(CONFIG_DIR, { recursive: true });
     logger.log(`Created config directory: ${CONFIG_DIR}`);
   }
-  if (!existsSync10(CONFIG_FILE)) {
+  if (!existsSync9(CONFIG_FILE)) {
     const config2 = {
       ...DEFAULT_CONFIG,
       cocodPath: null
@@ -15698,7 +15836,7 @@ program.command("remote <url>").description("Configure a remote daemon URL").act
     console.error(`Invalid URL: ${url}`);
     process.exit(1);
   }
-  if (!existsSync10(CONFIG_DIR)) {
+  if (!existsSync9(CONFIG_DIR)) {
     mkdirSync6(CONFIG_DIR, { recursive: true });
   }
   const config = await loadConfig();
@@ -16293,7 +16431,7 @@ serviceCmd.command("install").description("Install and start routstrd using PM2
     const path = import.meta.require("path");
     daemonPath = path.join(path.dirname(import.meta.url).replace("file://", ""), "daemon", "index.js");
   }
-  if (!existsSync10(daemonPath)) {
+  if (!existsSync9(daemonPath)) {
     console.error(`Could not find daemon at ${daemonPath}. Did you run 'bun run build'?`);
     process.exit(1);
   }
@@ -16431,14 +16569,14 @@ program.command("logs").description("View daemon logs").option("-f, --follow", "
   const yesterday = new Date;
   yesterday.setDate(yesterday.getDate() - 1);
   const yesterdayFile = getLogFileForDate2(yesterday);
-  if (!existsSync10(todayFile) && !existsSync10(yesterdayFile)) {
+  if (!existsSync9(todayFile) && !existsSync9(yesterdayFile)) {
     console.log("No log files found. Daemon may not have started yet.");
     console.log(`Logs directory: ${LOGS_DIR2}`);
     process.exit(1);
   }
   const lines = parseInt(options.lines, 10);
   const logFiles = [yesterdayFile, todayFile].filter((file, index, files) => {
-    return existsSync10(file) && files.indexOf(file) === index;
+    return existsSync9(file) && files.indexOf(file) === index;
   });
   if (options.follow) {
     const proc2 = Bun.spawn(["tail", "-n", String(lines), "-f", todayFile], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routstrd",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "module": "src/index.ts",
   "type": "module",
   "private": false,
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@cashu/cashu-ts": "^3.1.1",
-    "@routstr/sdk": "^0.3.2",
+    "@routstr/sdk": "^0.3.4",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
     "commander": "^14.0.2",

package/src/daemon/models.ts

@@ -1,4 +1,4 @@
-import { ModelManager } from "@routstr/sdk";
+import { ModelManager, type SdkStore } from "@routstr/sdk";
 import type { ExposedModel } from "./types";
 import { logger } from "../utils/logger";
 
@@ -16,7 +16,7 @@ export type ModelWithProviders = ExposedModel & {
   providers: ModelProviderInfo[];
 };
 
-export function createModelService(modelManager: ModelManager) {
+export function createModelService(modelManager: ModelManager, store: SdkStore) {
   let providerBootstrapPromise: Promise<void> | null = null;
 
   const ensureProvidersBootstrapped = (): Promise<void> => {
@@ -26,6 +26,22 @@ export function createModelService(modelManager: ModelManager) {
         const providers = await modelManager.bootstrapProviders(false);
         logger.log(`Bootstrapped ${providers.length} providers`);
         await modelManager.fetchModels(providers);
+
+        // Sync discovered providers into the store so `providers list` reflects
+        // the same set that the model manager knows about.
+        const { baseUrlsList, setBaseUrlsList } = store.getState();
+        const existing = new Set(baseUrlsList);
+        const merged = [
+          ...baseUrlsList,
+          ...providers.filter((url) => !existing.has(url)),
+        ];
+        if (merged.length !== baseUrlsList.length) {
+          setBaseUrlsList(merged);
+          logger.log(
+            `Synced ${merged.length - baseUrlsList.length} new provider(s) into store`,
+          );
+        }
+
         logger.log("Provider bootstrap complete.");
       })().catch((error) => {
         logger.error("Provider bootstrap failed:", error);

package/src/start-daemon.ts

@@ -1,18 +1,9 @@
 import { logger } from "./utils/logger";
-import { existsSync } from "fs";
 import { CONFIG_DIR, LOGS_DIR } from "./utils/config";
 import { withCrossProcessLock } from "./utils/process-lock";
 
 const DAEMON_STARTUP_LOCK_PATH = `${CONFIG_DIR}/routstrd-startup.lock`;
 
-function getTodayLogFile(): string {
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = String(now.getMonth() + 1).padStart(2, "0");
-  const day = String(now.getDate()).padStart(2, "0");
-  return `${LOGS_DIR}/${year}-${month}-${day}.log`;
-}
-
 async function isDaemonHealthy(port: string): Promise<boolean> {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), 2000);
@@ -48,14 +39,8 @@ async function startDaemonUnlocked(
     args.push("--provider", options.provider);
   }
 
-  // Ensure logs directory exists (logger handles date-based files)
-  if (!existsSync(LOGS_DIR)) {
-    await Bun.$`mkdir -p ${LOGS_DIR}`;
-  }
-
   const daemonScript = new URL("./daemon/index.js", import.meta.url).pathname;
-  const todayLogFile = getTodayLogFile();
-  const shellCmd = `bun run "${daemonScript}" ${args.map((a) => `'${a}'`).join(" ")} >> "${todayLogFile}" 2>&1`;
+  const shellCmd = `bun run "${daemonScript}" ${args.map((a) => `'${a}'`).join(" ")}`;
 
   const proc = Bun.spawn(["sh", "-c", shellCmd], {
     stdout: "inherit",

package/src/tui/usage/app.ts

@@ -1,5 +1,6 @@
-import { TABS } from "./constants.ts";
-import { fetchBalance, fetchStatus, fetchUsage, type BalanceInfo, type StatusInfo } from "./data.ts";
+import { getVisibleTabs } from "./constants.ts";
+import type { Tab } from "./types.ts";
+import { fetchBalance, fetchClients, fetchStatus, fetchUsage, hasAnyNpubs, isDaemonRunning, type BalanceInfo, type ClientInfo, type StatusInfo } from "./data.ts";
 import {
   applyScrollToContent,
   exitSearchMode,
@@ -28,7 +29,6 @@ import {
 import { COLORS } from "./constants.ts";
 import { renderHeader, renderSearchBar, renderSeparator, renderTabContent, renderTabs } from "./render.ts";
 import type { TabId, UsageStats } from "./types.ts";
-import { isDaemonRunning } from "../../utils/daemon-client.ts";
 
 export async function runUsageTui(): Promise<void> {
   const running = await isDaemonRunning();
@@ -46,6 +46,8 @@ export async function runUsageTui(): Promise<void> {
   let stats: UsageStats | null = null;
   let balance: BalanceInfo | null = null;
   let status: StatusInfo | null = null;
+  let clients: ClientInfo[] = [];
+  let visibleTabs: Tab[] = getVisibleTabs(false);
   let refreshInterval: ReturnType<typeof setInterval> | null = null;
   let shouldUpdate = true;
   let autoRefresh = true;
@@ -90,6 +92,14 @@ export async function runUsageTui(): Promise<void> {
         stats = await fetchUsage(10000);
         balance = await fetchBalance();
         status = await fetchStatus();
+        clients = await fetchClients();
+        const npubsVisible = hasAnyNpubs(clients);
+        visibleTabs = getVisibleTabs(npubsVisible);
+        // If current tab is npubs but it's no longer visible, fall back to clients
+        if (currentTab === "npubs" && !npubsVisible) {
+          currentTab = "clients";
+          vimState.scrollPos = 0;
+        }
         shouldUpdate = false;
       }
 
@@ -104,9 +114,9 @@ export async function runUsageTui(): Promise<void> {
         return;
       }
 
-      const content = renderTabContent(currentTab, stats, balance, status, width);
+      const content = renderTabContent(currentTab, stats, balance, status, width, clients);
       const footer = `${COLORS.dim}Press [Q] to quit, [R] to refresh, [A] to toggle auto-refresh${autoRefresh ? " (on)" : " (off)"}  scroll:${vimState.scrollPos}${COLORS.reset}${vimState.mode === "normal" ? `  ${COLORS.yellow}vim: hjkl/arrows, / search, g top, gg bottom${COLORS.reset}` : ""}`;
-      const chrome = renderHeader(currentTab, width) + renderTabs(currentTab) + renderSeparator(width) + renderSearchBar();
+      const chrome = renderHeader(currentTab, width, visibleTabs) + renderTabs(currentTab, visibleTabs) + renderSeparator(width) + renderSearchBar();
       const chromeLines = chrome.split("\n").length - 1;
       const footerSeparator = renderSeparator(width);
       const footerLines = footerSeparator.split("\n").length - 1;
@@ -176,15 +186,15 @@ export async function runUsageTui(): Promise<void> {
       return;
     }
     if (key === "l" || key === "\x1b[C" || key === "\x1bOC") {
-      const currentIdx = TABS.findIndex((t) => t.id === currentTab);
-      currentTab = TABS[(currentIdx + 1) % TABS.length]!.id;
+      const currentIdx = visibleTabs.findIndex((t) => t.id === currentTab);
+      currentTab = visibleTabs[(currentIdx + 1) % visibleTabs.length]!.id;
       vimState.scrollPos = 0;
       void render(false);
       return;
     }
     if (key === "h" || key === "\x1b[D" || key === "\x1bOD") {
-      const currentIdx = TABS.findIndex((t) => t.id === currentTab);
-      currentTab = TABS[(currentIdx - 1 + TABS.length) % TABS.length]!.id;
+      const currentIdx = visibleTabs.findIndex((t) => t.id === currentTab);
+      currentTab = visibleTabs[(currentIdx - 1 + visibleTabs.length) % visibleTabs.length]!.id;
       vimState.scrollPos = 0;
       void render(false);
       return;
@@ -226,7 +236,7 @@ export async function runUsageTui(): Promise<void> {
     }
     if (key === "\x1b") { scrollToTop(); void render(false); return; }
 
-    const tab = TABS.find((t) => t.key === key);
+    const tab = visibleTabs.find((t) => t.key === key);
     if (tab) {
       currentTab = tab.id;
       vimState.scrollPos = 0;

package/src/tui/usage/constants.ts

@@ -1,15 +1,28 @@
 import type { Tab } from "./types.ts";
 
-export const TABS: Tab[] = [
+export const ALL_TABS: Tab[] = [
   { id: "overview", name: "Overview", key: "1" },
   { id: "today", name: "Today", key: "2" },
   { id: "models", name: "Models", key: "3" },
   { id: "providers", name: "Providers", key: "4" },
   { id: "tokens", name: "Tokens", key: "5" },
   { id: "clients", name: "Clients", key: "6" },
-  { id: "recent", name: "Recent", key: "7" },
+  { id: "npubs", name: "Npubs", key: "7" },
+  { id: "recent", name: "Recent", key: "8" },
 ];
 
+/**
+ * Returns the visible tab list, hiding the Npubs tab when no clients
+ * have an ownerNpub. Keys are re-assigned sequentially (1..N).
+ */
+export function getVisibleTabs(hasNpubs: boolean): Tab[] {
+  const tabs = ALL_TABS.filter((t) => t.id !== "npubs" || hasNpubs);
+  return tabs.map((t, i) => ({ ...t, key: String(i + 1) }));
+}
+
+/** Default tab list (no npub data yet). */
+export const TABS: Tab[] = getVisibleTabs(false);
+
 export const COLORS = {
   reset: "\x1b[0m",
   bold: "\x1b[1m",

package/src/tui/usage/data.ts

@@ -1,6 +1,8 @@
 import type { UsageTrackingEntry } from "../../daemon/types.ts";
 import { callDaemon, isDaemonRunning } from "../../utils/daemon-client.ts";
-import type { ClientStats, DayStats, ModelStats, ProviderStats, UsageStats } from "./types.ts";
+import type { ClientStats, DayStats, ModelStats, NpubStats, ProviderStats, UsageStats } from "./types.ts";
+
+export { isDaemonRunning };
 
 export interface BalanceKey {
   id: string;
@@ -223,6 +225,78 @@ export function getClientStats(entries: UsageTrackingEntry[]): ClientStats[] {
   return Array.from(clients.values()).sort((a, b) => b.satsCost - a.satsCost);
 }
 
+// ─── Client / Npub helpers ────────────────────────────────────────────
+
+export interface ClientInfo {
+  clientId: string;
+  name: string;
+  ownerNpub?: string;
+}
+
+export async function fetchClients(): Promise<ClientInfo[]> {
+  try {
+    const running = await isDaemonRunning();
+    if (!running) return [];
+
+    const result = await callDaemon("/clients");
+    if (result.error) return [];
+
+    const output = result.output as {
+      clients?: Array<{ id: string; name: string; ownerNpub?: string }>;
+    };
+
+    return (output?.clients || []).map((c) => ({
+      clientId: c.id,
+      name: c.name,
+      ownerNpub: c.ownerNpub,
+    }));
+  } catch {
+    return [];
+  }
+}
+
+export function hasAnyNpubs(clients: ClientInfo[]): boolean {
+  return clients.some((c) => !!c.ownerNpub);
+}
+
+export function getNpubStats(entries: UsageTrackingEntry[], clients: ClientInfo[]): NpubStats[] {
+  // Build client-id → ownerNpub lookup
+  const clientNpubMap = new Map<string, string>();
+  for (const c of clients) {
+    if (c.ownerNpub) {
+      clientNpubMap.set(c.clientId, c.ownerNpub);
+    }
+  }
+
+  // Aggregate usage per npub
+  const npubs = new Map<string, NpubStats>();
+  for (const entry of entries) {
+    const npub = clientNpubMap.get(entry.client || "");
+    if (!npub) continue; // skip entries whose client has no ownerNpub
+
+    const existing = npubs.get(npub) || {
+      npub,
+      requests: 0,
+      satsCost: 0,
+      promptTokens: 0,
+      completionTokens: 0,
+      totalTokens: 0,
+    };
+    npubs.set(npub, {
+      ...existing,
+      requests: existing.requests + 1,
+      satsCost: existing.satsCost + entry.satsCost,
+      promptTokens: existing.promptTokens + entry.promptTokens,
+      completionTokens: existing.completionTokens + entry.completionTokens,
+      totalTokens: existing.totalTokens + entry.totalTokens,
+    });
+  }
+
+  return Array.from(npubs.values()).sort((a, b) => b.satsCost - a.satsCost);
+}
+
+// ─── Totals ───────────────────────────────────────────────────────────
+
 export function getTotals(entries: UsageTrackingEntry[] | undefined) {
   if (!entries || !Array.isArray(entries)) {
     return { promptTokens: 0, completionTokens: 0, totalTokens: 0, satsCost: 0 };

package/src/tui/usage/render.ts

@@ -1,4 +1,5 @@
-import { CLIENT_COLORS, COLORS, MODEL_COLORS, TABS } from "./constants.ts";
+import { CLIENT_COLORS, COLORS, MODEL_COLORS } from "./constants.ts";
+import type { Tab } from "./types.ts";
 import {
   formatDate,
   formatNumber,
@@ -7,9 +8,11 @@ import {
   getDayStats,
   getHourlyToday,
   getModelStats,
+  getNpubStats,
   getProviderStats,
   getTodayStart,
   getTotals,
+  type ClientInfo,
 } from "./data.ts";
 import { vimState } from "./state.ts";
 import { stripAnsi } from "./terminal.ts";
@@ -30,10 +33,11 @@ function formatReqs(value: number): string {
   return value.toString();
 }
 
-export function renderHeader(activeTab: TabId, width: number): string {
+export function renderHeader(activeTab: TabId, width: number, visibleTabs: Tab[]): string {
   const title = `${COLORS.bold}${COLORS.cyan}ROUTSTRD USAGE MONITOR${COLORS.reset}`;
   const vimIndicator = `${COLORS.yellow}[vim]${COLORS.reset}`;
-  const help = `${COLORS.dim}[Q] Quit  [↑↓] Scroll  [←→] Tabs  [1-7] Tabs  [R] Refresh${COLORS.reset}`;
+  const maxKey = visibleTabs.length;
+  const help = `${COLORS.dim}[Q] Quit  [↑↓] Scroll  [←→] Tabs  [1-${maxKey}] Tabs  [R] Refresh${COLORS.reset}`;
   const fill = width - title.length - help.length - vimIndicator.length - 6;
   return `${title}${vimIndicator}${" ".repeat(Math.max(1, fill))}${help}\n`;
 }
@@ -49,8 +53,8 @@ export function renderSearchBar(): string {
   return `\n${searchLine}${placeholder}\n`;
 }
 
-export function renderTabs(activeTab: TabId): string {
-  const tabStr = TABS.map((tab) => tab.id === activeTab
+export function renderTabs(activeTab: TabId, visibleTabs: Tab[]): string {
+  const tabStr = visibleTabs.map((tab) => tab.id === activeTab
     ? `${COLORS.bgBlue} ${tab.key}:${tab.name} ${COLORS.reset}`
     : `${COLORS.dim}[${tab.key}]${COLORS.reset} ${tab.name}`).join("  ");
   return `${" ".repeat(2)}${tabStr}\n`;
@@ -507,12 +511,106 @@ export function renderClients(stats: UsageStats, width: number): string {
   return output;
 }
 
+export function renderNpubs(stats: UsageStats, clients: ClientInfo[], width: number): string {
+  const npubStats = getNpubStats(stats.entries, clients);
+  if (npubStats.length === 0) return renderBox(["No npub data available"], width, "Npub Breakdown");
+
+  const totalCost = stats.totalSatsCost;
+  const maxCost = npubStats[0]!.satsCost;
+  const lines: string[] = [];
+
+  const col1 = 24; // Npub (truncated)
+  const col2 = 12; // Requests
+  const col3 = 24; // Cost
+  const col4 = 12; // Tokens
+
+  const hNpub = "Npub".padEnd(col1);
+  const hReqs = "Requests".padEnd(col2);
+  const hCost = "Cost".padEnd(col3);
+  const hTok = "Tokens".padEnd(col4);
+  lines.push(`${COLORS.bold}${hNpub}${hReqs}${hCost}${hTok}Avg Cost${COLORS.reset}`);
+  lines.push(COLORS.dim + "─".repeat(Math.max(0, width - 4)) + COLORS.reset);
+
+  startBarSection("npub-detail", col1);
+  for (const npub of npubStats) {
+    const pct = totalCost > 0 ? ((npub.satsCost / totalCost) * 100).toFixed(1) : "0.0";
+    const avgCostFormatted = formatCost(npub.requests > 0 ? npub.satsCost / npub.requests : 0);
+    const shortNpub = truncateNpub(npub.npub);
+
+    const dNpub = shortNpub.padEnd(col1);
+    const dReqs = formatReqs(npub.requests).padEnd(col2);
+    const dCost = `${formatCost(npub.satsCost)} sats (${pct}%)`.padEnd(col3);
+    const dTok = formatNumber(npub.totalTokens).padEnd(col4);
+    const dAvg = `${avgCostFormatted} sats/req`;
+
+    lines.push(
+      `${COLORS.magenta}${COLORS.bold}${dNpub}${COLORS.reset}` +
+      `${dReqs}` +
+      `${COLORS.green}${dCost}${COLORS.reset}` +
+      `${COLORS.dim}${dTok}${dAvg}${COLORS.reset}`
+    );
+    // Full npub on its own line for copy-ability
+    lines.push(`  ${COLORS.dim}${npub.npub}${COLORS.reset}`);
+    lines.push(`  ${renderBarChart("", npub.satsCost, maxCost, width - 6, COLORS.magenta, Number(pct), "npub-detail")}`);
+    lines.push("");
+  }
+  endBarSection("npub-detail");
+
+  let output = renderBox(lines, width, "Npub Breakdown");
+
+  // Top models per npub (same pattern as clients tab)
+  const npubModelMap = new Map<string, Map<string, { requests: number; satsCost: number; tokens: number }>>();
+  const clientNpubMap = new Map<string, string>();
+  for (const c of clients) {
+    if (c.ownerNpub) clientNpubMap.set(c.clientId, c.ownerNpub);
+  }
+
+  for (const entry of stats.entries) {
+    const npub = clientNpubMap.get(entry.client || "");
+    if (!npub) continue;
+    const model = entry.modelId;
+    if (!npubModelMap.has(npub)) npubModelMap.set(npub, new Map());
+    const modelMap = npubModelMap.get(npub)!;
+    const existing = modelMap.get(model) || { requests: 0, satsCost: 0, tokens: 0 };
+    modelMap.set(model, {
+      requests: existing.requests + 1,
+      satsCost: existing.satsCost + entry.satsCost,
+      tokens: existing.tokens + entry.totalTokens,
+    });
+  }
+
+  const npubModelLines: string[] = [];
+  for (const topNpub of npubStats.slice(0, 5)) {
+    const modelMap = npubModelMap.get(topNpub.npub);
+    if (!modelMap) continue;
+    const models = Array.from(modelMap.entries()).sort((a, b) => b[1].satsCost - a[1].satsCost).slice(0, 5);
+    npubModelLines.push(`${COLORS.bold}${truncateNpub(topNpub.npub)}${COLORS.reset} (${formatReqs(topNpub.requests)} reqs, ${formatCost(topNpub.satsCost)} sats)`);
+    for (const [model, data] of models) {
+      npubModelLines.push(`  ${(MODEL_COLORS[model] || MODEL_COLORS.default)}${model.padEnd(18)}${COLORS.reset} ${formatNumber(data.tokens).padEnd(8)} tokens  ${formatCost(data.satsCost)} sats`);
+    }
+    npubModelLines.push("");
+  }
+
+  if (npubModelLines.length > 0) {
+    output += "\n" + renderBox(npubModelLines, width, "Top Models per Npub");
+  }
+
+  return output;
+}
+
+/** Truncate an npub for display: first 10 chars + … + last 6 chars. */
+function truncateNpub(npub: string): string {
+  if (npub.length <= 24) return npub;
+  return npub.slice(0, 10) + "…" + npub.slice(-6);
+}
+
 export function renderRecent(stats: UsageStats, width: number): string {
   const recentEntries = stats.entries.slice(0, 50);
   if (recentEntries.length === 0) return renderBox(["No recent entries"], width, "Recent Requests");
 
+  const clientCol = 14;
   const lines: string[] = [];
-  lines.push(`${COLORS.bold}${"TIME".padEnd(10)} ${"MODEL".padEnd(18)} ${"TOKENS".padEnd(10)} ${"COST".padEnd(12)} ${"PROVIDER".slice(0, Math.max(0, width - 60))}${COLORS.reset}`);
+  lines.push(`${COLORS.bold}${"TIME".padEnd(10)} ${"MODEL".padEnd(18)} ${"TOKENS".padEnd(10)} ${"COST".padEnd(12)} ${"PROVIDER".padEnd(16)} ${"CLIENT".slice(0, clientCol)}${COLORS.reset}`);
   lines.push(COLORS.dim + "─".repeat(width - 4) + COLORS.reset);
 
   for (const entry of recentEntries) {
@@ -520,15 +618,17 @@ export function renderRecent(stats: UsageStats, width: number): string {
     const model = entry.modelId.slice(0, 18).padEnd(18);
     const tokens = `${formatNumber(entry.totalTokens).padEnd(6)} (${formatNumber(entry.promptTokens)}+${formatNumber(entry.completionTokens)})`;
     const cost = `${formatCost(entry.satsCost).padEnd(8)} sats`;
-    const provider = (entry.baseUrl || "unknown").replace("https://", "").replace("http://", "").slice(0, Math.max(0, width - 60));
-    const color = MODEL_COLORS[entry.modelId] || MODEL_COLORS.default;
-    lines.push(`${COLORS.dim}${time}${COLORS.reset} ${color}${model}${COLORS.reset} ${tokens.padEnd(10)} ${COLORS.green}${cost}${COLORS.reset} ${COLORS.dim}${provider}${COLORS.reset}`);
+    const provider = (entry.baseUrl || "unknown").replace("https://", "").replace("http://", "").slice(0, 16).padEnd(16);
+    const clientName = (entry.client || "unknown").slice(0, clientCol - 1);
+    const clientColor = CLIENT_COLORS[entry.client || "unknown"] || CLIENT_COLORS.default || COLORS.white;
+    const modelColor = MODEL_COLORS[entry.modelId] || MODEL_COLORS.default;
+    lines.push(`${COLORS.dim}${time}${COLORS.reset} ${modelColor}${model}${COLORS.reset} ${tokens.padEnd(10)} ${COLORS.green}${cost}${COLORS.reset} ${COLORS.dim}${provider}${COLORS.reset} ${clientColor}${clientName}${COLORS.reset}`);
   }
 
   return renderBox(lines, width, `Recent Requests (${stats.entries.length} shown)`);
 }
 
-export function renderTabContent(activeTab: TabId, stats: UsageStats, balance: BalanceInfo | null, status: StatusInfo | null, width: number): string {
+export function renderTabContent(activeTab: TabId, stats: UsageStats, balance: BalanceInfo | null, status: StatusInfo | null, width: number, clients: ClientInfo[] = []): string {
   switch (activeTab) {
     case "overview": return renderOverview(stats, balance, status, width);
     case "today": return renderToday(stats, width);
@@ -536,6 +636,7 @@ export function renderTabContent(activeTab: TabId, stats: UsageStats, balance: B
     case "providers": return renderProviders(stats, width);
     case "tokens": return renderTokens(stats, width);
     case "clients": return renderClients(stats, width);
+    case "npubs": return renderNpubs(stats, clients, width);
     case "recent": return renderRecent(stats, width);
     default: return "Unknown tab";
   }

package/src/tui/usage/types.ts

@@ -44,7 +44,7 @@ export interface ClientStats {
   totalTokens: number;
 }
 
-export type TabId = "overview" | "today" | "models" | "providers" | "tokens" | "clients" | "recent";
+export type TabId = "overview" | "today" | "models" | "providers" | "tokens" | "clients" | "npubs" | "recent";
 
 export interface Tab {
   id: TabId;
@@ -52,6 +52,15 @@ export interface Tab {
   key: string;
 }
 
+export interface NpubStats {
+  npub: string;
+  requests: number;
+  satsCost: number;
+  promptTokens: number;
+  completionTokens: number;
+  totalTokens: number;
+}
+
 export interface VimState {
   scrollPos: number;
   searchQuery: string;