routstrd 0.3.1 → 0.3.2

package/dist/index.js

@@ -13943,10 +13943,14 @@ function getTodayStart() {
   return new Date(now2.getFullYear(), now2.getMonth(), now2.getDate()).getTime();
 }
 function formatDate(timestamp) {
-  return new Date(timestamp).toISOString().split("T")[0] ?? "";
+  const d = new Date(timestamp);
+  const p = (n) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
 function formatTime(timestamp) {
-  return new Date(timestamp).toISOString().split("T")[1]?.slice(0, 8) ?? "";
+  const d = new Date(timestamp);
+  const p = (n) => String(n).padStart(2, "0");
+  return `${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
 }
 function formatNumber(n) {
   if (n >= 1e6)
@@ -14737,19 +14741,34 @@ function renderRecent(stats, width) {
   if (recentEntries.length === 0)
     return renderBox(["No recent entries"], width, "Recent Requests");
   const clientCol = 14;
+  const tokensCol = 18;
+  const costCol = 18;
+  const providerCol = Math.max(16, width - 4 - 10 - 18 - tokensCol - costCol - clientCol - 5);
+  const msatsToSats = (msats) => typeof msats === "number" ? msats / 1000 : 0;
   const lines = [];
-  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.bold}${"TIME".padEnd(10)} ${"MODEL".padEnd(18)} ${"I/CR/CW/O".padEnd(tokensCol)} ${"I/O/T in sats".padEnd(costCol)} ${"BASE:PROVIDER".padEnd(providerCol)} ${"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, 16).padEnd(16);
+    const tokens = [
+      entry.promptTokens,
+      entry.cacheReadInputTokens || 0,
+      entry.cacheCreationInputTokens || 0,
+      entry.completionTokens
+    ].map(formatNumber).join("/");
+    const totalSats = typeof entry.totalMsats === "number" ? entry.totalMsats / 1000 : entry.satsCost;
+    const cost = [
+      formatCost(msatsToSats(entry.inputMsats)),
+      formatCost(msatsToSats(entry.outputMsats)),
+      formatCost(totalSats)
+    ].join("/");
+    const baseUrl = (entry.baseUrl || "unknown").replace("https://", "").replace("http://", "");
+    const provider = `${baseUrl}:${entry.provider || "unknown"}`.slice(0, providerCol).padEnd(providerCol);
     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}`);
+    lines.push(`${COLORS.dim}${time}${COLORS.reset} ${modelColor}${model}${COLORS.reset} ${tokens.padEnd(tokensCol)} ${COLORS.green}${cost.padEnd(costCol)}${COLORS.reset} ${COLORS.dim}${provider}${COLORS.reset} ${clientColor}${clientName}${COLORS.reset}`);
   }
   return renderBox(lines, width, `Recent Requests (${stats.entries.length} shown)`);
 }
@@ -15440,7 +15459,7 @@ async function runIntegrationsForClients(clientIds, config) {
 
 // src/utils/clients.ts
 async function getClientsList() {
-  const result = await callAuth("/clients");
+  const result = await callDaemon("/clients");
   const clients = result.output?.clients;
   if (!clients) {
     return [];
@@ -15469,7 +15488,7 @@ async function addDaemonClient(name) {
     };
     return { client, created: false };
   }
-  const result = await callAuth("/clients/add", {
+  const result = await callDaemon("/clients/add", {
     method: "POST",
     body: { name, id: derivedId }
   });
@@ -15507,7 +15526,7 @@ async function listClientsAction() {
 }
 async function deleteClientAction(id) {
   await ensureDaemonRunning();
-  const result = await callAuth("/clients/delete", {
+  const result = await callDaemon("/clients/delete", {
     method: "POST",
     body: { id }
   });
@@ -15783,7 +15802,7 @@ async function isCocodInstalled(cocodPath) {
 // package.json
 var package_default = {
   name: "routstrd",
-  version: "0.3.1",
+  version: "0.3.2",
   module: "src/index.ts",
   type: "module",
   private: false,
@@ -15807,7 +15826,7 @@ var package_default = {
   },
   dependencies: {
     "@cashu/cashu-ts": "^4.3.0",
-    "@routstr/sdk": "^0.3.9",
+    "@routstr/sdk": "^0.3.10",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
     "applesauce-wallet-connect": "^6.0.0",
@@ -15876,6 +15895,18 @@ async function initDaemon() {
     console.log(`Created config file: ${CONFIG_FILE}`);
   }
   const config = await loadConfig();
+  if (!config.nsec) {
+    const secretKey = generateSecretKey();
+    const nsec = nip19_exports.nsecEncode(secretKey);
+    const npub = npubFromSecretKey(secretKey);
+    config.nsec = nsec;
+    await Bun.write(CONFIG_FILE, JSON.stringify(config, null, 2));
+    console.log(`
+A new Nostr identity has been generated for authentication.`);
+    console.log(`Your npub: ${npub}`);
+    console.log(`You can view it in the config file at: ${CONFIG_FILE}
+`);
+  }
   if (!await isCocodInstalled(config.cocodPath)) {
     if (config.cocodPath) {
       logger.error(`Configured cocod executable was not found: ${config.cocodPath}`);
@@ -16249,9 +16280,10 @@ program.command("usage").description("Show recent usage logs and total sats cost
   });
 });
 var providersCmd = program.command("providers").description("List and manage providers");
-providersCmd.command("list").description("List all providers with their enabled/disabled status").action(async () => {
+providersCmd.command("list").description("List all providers with their enabled/disabled status").option("--refresh", "Force re-fetch all Nostr events and refresh models from all enabled providers", false).action(async (options) => {
   await ensureDaemonRunning();
-  const result = await callDaemon("/providers");
+  const query = options.refresh ? "/providers?refresh=true" : "/providers";
+  const result = await callDaemon(query);
   if (result.error) {
     console.log(result.error);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routstrd",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "module": "src/index.ts",
   "type": "module",
   "private": false,
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@cashu/cashu-ts": "^4.3.0",
-    "@routstr/sdk": "^0.3.9",
+    "@routstr/sdk": "^0.3.10",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
     "applesauce-wallet-connect": "^6.0.0",

package/say_hi.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+LANGUAGES=(
+  "Mandarin Chinese"
+  "Spanish"
+  "English"
+  "Hindi"
+  "Arabic"
+  "Portuguese"
+  "Bengali"
+  "Russian"
+  "Japanese"
+  "German"
+  "French"
+  "Italian"
+  "Korean"
+  "Turkish"
+  "Vietnamese"
+  "Tamil"
+  "Polish"
+  "Dutch"
+  "Swahili"
+  "Thai"
+  "Greek"
+)
+
+for lang in "${LANGUAGES[@]}"; do
+  echo "=== $lang ==="
+  pi -p -c "in $lang"
+  echo
+done

package/src/cli.ts

@@ -134,6 +134,17 @@ async function initDaemon(): Promise<void> {
 
   const config = await loadConfig();
 
+  if (!config.nsec) {
+    const secretKey = generateSecretKey();
+    const nsec = nip19.nsecEncode(secretKey);
+    const npub = npubFromSecretKey(secretKey);
+    config.nsec = nsec;
+    await Bun.write(CONFIG_FILE, JSON.stringify(config, null, 2));
+    console.log("\nA new Nostr identity has been generated for authentication.");
+    console.log(`Your npub: ${npub}`);
+    console.log(`You can view it in the config file at: ${CONFIG_FILE}\n`);
+  }
+
   if (!(await isCocodInstalled(config.cocodPath))) {
     if (config.cocodPath) {
       logger.error(
@@ -732,10 +743,12 @@ const providersCmd = program
 providersCmd
   .command("list")
   .description("List all providers with their enabled/disabled status")
-  .action(async () => {
+  .option("--refresh", "Force re-fetch all Nostr events and refresh models from all enabled providers", false)
+  .action(async (options: { refresh: boolean }) => {
     await ensureDaemonRunning();
 
-    const result = await callDaemon("/providers");
+    const query = options.refresh ? "/providers?refresh=true" : "/providers";
+    const result = await callDaemon(query);
     if (result.error) {
       console.log(result.error);
       process.exit(1);

package/src/daemon/models.ts

@@ -120,9 +120,64 @@ export function createModelService(modelManager: ModelManager, store: SdkStore)
     };
   };
 
+  /**
+   * Force-refresh everything: re-fetch Nostr provider discovery events,
+   * routstr21 model list, Nostr review events, and models from all enabled
+   * providers. Syncs the discovered provider list into the store.
+   */
+  const refreshProvidersAndModels = async (): Promise<void> => {
+    // Reset the bootstrap promise so we don't reuse cached results
+    providerBootstrapPromise = null;
+
+    console.log("Force-refreshing providers from Nostr...");
+
+    // Force-refresh provider discovery from Nostr (kind 38421)
+    const providers = await modelManager.bootstrapProviders(false, true);
+    console.log(`Discovered ${providers.length} providers from Nostr`);
+
+    // Force-refresh routstr21 models from Nostr (kind 38423)
+    const routstr21ModelIds = await modelManager.fetchRoutstr21Models(true);
+    console.log(`Fetched ${routstr21ModelIds.length} routstr21 model IDs from Nostr`);
+
+    // Force-refresh models from all providers
+    const models = await modelManager.fetchModels(providers, true);
+    console.log(`Fetched ${models.length} models from ${providers.length} providers`);
+
+    // Sync review events from Nostr (kind 38425) and apply disabled status
+    const reviewedDisabled = await modelManager.syncReviewedProvidersFromNostr(
+      providers,
+      undefined,
+      true,
+    );
+    if (reviewedDisabled.length > 0) {
+      console.log(
+        `Review sync disabled ${reviewedDisabled.length} provider(s): ${reviewedDisabled.join(", ")}`,
+      );
+    }
+
+    // Sync discovered providers into the store
+    const { baseUrlsList, setBaseUrlsList, disabledProviders, setDisabledProviders } =
+      store.getState() as any;
+
+    // Replace baseUrlsList with the fresh provider list
+    setBaseUrlsList(providers);
+
+    // Merge review-disabled providers into the store's disabled list
+    const existingDisabled = new Set(disabledProviders || []);
+    for (const url of reviewedDisabled) {
+      existingDisabled.add(url);
+    }
+    setDisabledProviders([...existingDisabled]);
+
+    console.log(
+      `Provider refresh complete: ${providers.length} total, ${existingDisabled.size} disabled`,
+    );
+  };
+
   return {
     ensureProvidersBootstrapped,
     getRoutstr21Models,
     getModelProviders,
+    refreshProvidersAndModels,
   };
 }

package/src/daemon/types.ts

@@ -11,6 +11,12 @@ export type UsageData = {
   totalTokens: number;
   cost: number;
   satsCost: number;
+  provider?: string;
+  inputMsats?: number;
+  outputMsats?: number;
+  totalMsats?: number;
+  cacheReadInputTokens?: number;
+  cacheCreationInputTokens?: number;
 };
 
 export type UsageTrackingEntry = UsageData & {

package/src/tui/usage/data.ts

@@ -118,11 +118,15 @@ export function getTodayStart(): number {
 }
 
 export function formatDate(timestamp: number): string {
-  return new Date(timestamp).toISOString().split("T")[0] ?? "";
+  const d = new Date(timestamp);
+  const p = (n: number) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
 
 export function formatTime(timestamp: number): string {
-  return new Date(timestamp).toISOString().split("T")[1]?.slice(0, 8) ?? "";
+  const d = new Date(timestamp);
+  const p = (n: number) => String(n).padStart(2, "0");
+  return `${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
 }
 
 export function formatNumber(n: number): string {

package/src/tui/usage/render.ts

@@ -609,20 +609,35 @@ export function renderRecent(stats: UsageStats, width: number): string {
   if (recentEntries.length === 0) return renderBox(["No recent entries"], width, "Recent Requests");
 
   const clientCol = 14;
+  const tokensCol = 18;
+  const costCol = 18;
+  const providerCol = Math.max(16, width - 4 - 10 - 18 - tokensCol - costCol - clientCol - 5);
+  const msatsToSats = (msats?: number) => typeof msats === "number" ? msats / 1000 : 0;
   const lines: string[] = [];
-  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.bold}${"TIME".padEnd(10)} ${"MODEL".padEnd(18)} ${"I/CR/CW/O".padEnd(tokensCol)} ${"I/O/T in sats".padEnd(costCol)} ${"BASE:PROVIDER".padEnd(providerCol)} ${"CLIENT".slice(0, clientCol)}${COLORS.reset}`);
   lines.push(COLORS.dim + "─".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, 16).padEnd(16);
+    const tokens = [
+      entry.promptTokens,
+      entry.cacheReadInputTokens || 0,
+      entry.cacheCreationInputTokens || 0,
+      entry.completionTokens,
+    ].map(formatNumber).join("/");
+    const totalSats = typeof entry.totalMsats === "number" ? entry.totalMsats / 1000 : entry.satsCost;
+    const cost = [
+      formatCost(msatsToSats(entry.inputMsats)),
+      formatCost(msatsToSats(entry.outputMsats)),
+      formatCost(totalSats),
+    ].join("/");
+    const baseUrl = (entry.baseUrl || "unknown").replace("https://", "").replace("http://", "");
+    const provider = `${baseUrl}:${entry.provider || "unknown"}`.slice(0, providerCol).padEnd(providerCol);
     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}`);
+    lines.push(`${COLORS.dim}${time}${COLORS.reset} ${modelColor}${model}${COLORS.reset} ${tokens.padEnd(tokensCol)} ${COLORS.green}${cost.padEnd(costCol)}${COLORS.reset} ${COLORS.dim}${provider}${COLORS.reset} ${clientColor}${clientName}${COLORS.reset}`);
   }
 
   return renderBox(lines, width, `Recent Requests (${stats.entries.length} shown)`);

package/src/utils/clients.ts

@@ -1,5 +1,4 @@
 import {
-  callAuth,
   callDaemon,
   loadConfig,
   getDaemonBaseUrl,
@@ -57,7 +56,7 @@ export function getClientsFromStore(store: { getState(): any }): ClientEntry[] {
  * Use this when running remotely (CLI in remote mode).
  */
 export async function getClientsList(): Promise<ClientEntry[]> {
-  const result = await callAuth("/clients");
+  const result = await callDaemon("/clients");
   const clients = (
     result.output as
       | {
@@ -108,7 +107,7 @@ export async function addDaemonClient(
     return { client, created: false };
   }
 
-  const result = await callAuth("/clients/add", {
+  const result = await callDaemon("/clients/add", {
     method: "POST",
     body: { name, id: derivedId },
   });
@@ -160,7 +159,7 @@ export async function listClientsAction(): Promise<void> {
 export async function deleteClientAction(id: string): Promise<void> {
   await ensureDaemonRunning();
 
-  const result = await callAuth("/clients/delete", {
+  const result = await callDaemon("/clients/delete", {
     method: "POST",
     body: { id },
   });

package/src/utils/config.ts

@@ -41,6 +41,9 @@ export interface RoutstrdConfig {
   nsec?: string;
   /** Nostr hex pubkey for routstr review/model events (kind 38425/38423). */
   routstrPubkey?: string;
+  /** Nostr relay URLs for provider/model discovery (kinds 38421/38423/38425).
+   * When unset, each method uses its own built-in defaults. */
+  relays?: string[];
   /** NWC integration configuration */
   nwc?: NwcConfig;
 }

package/new-task.md

@@ -1,60 +0,0 @@
-# Hot-reload NWC connection (remove restart requirement)
-
-## Problem
-
-`nwc connect` and `nwc disconnect` require a daemon restart to take effect. The
-CLI writes the new connection string to disk, but the daemon never re-reads it.
-
-## Current flow
-
-1. **Startup** — `createWalletAdapter` reads `options.nwcConnectionString` and
-   creates a `WalletConnect` (relay pool + NWC wallet service) once:
-   ```ts
-   // src/daemon/wallet/index.ts:70-78
-   if (options.nwcConnectionString) {
-     wallet = WalletConnect.fromConnectURI(options.nwcConnectionString, { pool });
-   }
-   ```
-
-2. **CLI `nwc connect`** — HTTP handler at `POST /nwc/connect` only calls
-   `saveDaemonConfig(config)`. The running `WalletConnect` instance is untouched.
-
-3. **Result** — the old connection (or lack thereof) stays active until restart.
-
-## What needs to happen
-
-Provide a way for the daemon to tear down the old `WalletConnect` and create a
-new one from the updated connection string, triggered by the HTTP handler,
-**without restarting the process**.
-
-### Key pieces
-
-- **`src/daemon/wallet/index.ts`** — `createWalletAdapter` needs to expose a
-  `reconnect(connectionString: string)` method that:
-  - Closes the old relay pool / WalletConnect
-  - Creates a new `WalletConnect` from the new connection string
-  - Updates the adapter's internal `wallet` reference
-  - If connection string is empty/undefined, disconnects and sets `wallet` to
-    `undefined`
-  
-- **`src/daemon/http/index.ts`** — `POST /nwc/connect` and `POST /nwc/disconnect`
-  handlers should call `reconnect()` after saving config, and drop the "Restart
-  daemon" message.
-
-- **`src/daemon/index.ts`** — may need to store the `reconnect` function and pass
-  it through `DaemonDeps` to the HTTP handler.
-
-- **`src/cli.ts`** — remove `console.log("\nRun 'routstrd restart' to connect...")`
-  from the connect/disconnect commands.
-
-### Considerations
-
-- The `WalletConnect` instance is referenced in the auto-refill loop (passed to
-  `startAutoRefillLoop`). After a reconnect, the auto-refill loop's captured
-  `wallet` reference would be stale. The loop already reads config from disk
-  each cycle, so it should also reference the latest `wallet` instance.
-  - Could make the auto-refill loop accept a `getWallet: () => WalletConnect |
-    undefined` getter, same pattern as the config getter.
-- Relay pool cleanup — `applesauce-wallet-connect` / `applesauce-relay` may need
-  explicit `pool.close()` or `pool.destroy()` to free connections.
-- Edge case: a refill is in progress when reconnect is triggered.