routstrd 0.2.13 → 0.2.14

package/bun.lock

@@ -1,5 +1,6 @@
 {
-  "lockfileVersion": 0,
+  "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "dependencies": {
@@ -8,6 +9,7 @@
         "applesauce-core": "^5.1.0",
         "applesauce-relay": "^5.1.0",
         "commander": "^14.0.2",
+        "nostr-tools": "^2.12.0",
         "qrcode": "^1.5.4",
         "rxjs": "^7.8.1",
         "zustand": "^5.0.5",

package/dist/daemon/index.js

@@ -35401,12 +35401,6 @@ async function sha256Hex(data) {
 function base64EncodeUtf8(value) {
   return btoa(String.fromCharCode(...new TextEncoder().encode(value)));
 }
-function npubFromPubkey(pubkey) {
-  return nip19_exports.npubEncode(pubkey.toLowerCase());
-}
-function npubFromSecretKey(secretKey) {
-  return npubFromPubkey(getPublicKey2(secretKey));
-}
 async function createNIP98Authorization(secretKey, url2, method, body) {
   const tags3 = [
     ["u", url2],
@@ -35745,24 +35739,6 @@ async function runIntegrationsForClients(clientIds, config) {
 }
 
 // src/utils/clients.ts
-function getNpubSuffix(config) {
-  if (!config.daemonUrl || !config.nsec)
-    return null;
-  try {
-    const secretKey = parseSecretKey(config.nsec);
-    const npub = npubFromSecretKey(secretKey);
-    return npub.slice(-7);
-  } catch {
-    return null;
-  }
-}
-function removeSuffixFromId(id, suffix) {
-  const suffixStr = `-${suffix}`;
-  if (id.endsWith(suffixStr)) {
-    return id.slice(0, -suffixStr.length);
-  }
-  return id;
-}
 function getClientsFromStore(store) {
   const state = store.getState();
   const clientIds = state.clientIds || [];
@@ -35771,23 +35747,23 @@ function getClientsFromStore(store) {
     name: c.name,
     apiKey: c.apiKey,
     createdAt: c.createdAt,
-    lastUsed: c.lastUsed
+    lastUsed: c.lastUsed,
+    ownerNpub: c.ownerNpub
   }));
 }
 async function getClientsList() {
-  const config = await loadConfig();
   const result = await callDaemon("/clients");
   const clients = result.output?.clients;
   if (!clients) {
     return [];
   }
-  const suffix = config.daemonUrl ? getNpubSuffix(config) : null;
-  return clients.filter((c) => !suffix || c.id.endsWith(`-${suffix}`)).map((c) => ({
-    clientId: suffix ? removeSuffixFromId(c.id, suffix) : c.id,
+  return clients.map((c) => ({
+    clientId: c.id,
     name: c.name,
     apiKey: c.apiKey,
     createdAt: c.createdAt,
-    lastUsed: c.lastUsed
+    lastUsed: c.lastUsed,
+    ownerNpub: c.ownerNpub
   }));
 }
 
@@ -36277,7 +36253,8 @@ function createDaemonRequestHandler(deps) {
           name: c.name,
           apiKey: c.apiKey,
           createdAt: c.createdAt,
-          lastUsed: c.lastUsed
+          lastUsed: c.lastUsed,
+          ownerNpub: c.ownerNpub
         }));
         res.writeHead(200, { "Content-Type": "application/json" });
         res.end(JSON.stringify({
@@ -36298,6 +36275,7 @@ function createDaemonRequestHandler(deps) {
         const body = bodyText ? JSON.parse(bodyText) : {};
         const name = body.name;
         const explicitId = body.id;
+        const ownerNpub = body.ownerNpub;
         if (!name || typeof name !== "string" || name.trim() === "") {
           res.writeHead(400, { "Content-Type": "application/json" });
           res.end(JSON.stringify({
@@ -36335,7 +36313,8 @@ function createDaemonRequestHandler(deps) {
           clientId,
           name: name.trim(),
           apiKey,
-          createdAt: Date.now()
+          createdAt: Date.now(),
+          ...ownerNpub && typeof ownerNpub === "string" ? { ownerNpub } : {}
         };
         deps.store.getState().setClientIds((prev) => [
           ...prev || [],
@@ -36350,7 +36329,8 @@ function createDaemonRequestHandler(deps) {
               id: clientId,
               name: name.trim(),
               apiKey,
-              createdAt: newClient.createdAt
+              createdAt: newClient.createdAt,
+              ownerNpub: newClient.ownerNpub
             }
           }
         }));

package/dist/index.js

@@ -9570,12 +9570,6 @@ function getUserNpub(config) {
     return null;
   }
 }
-function getNpubSuffix(config) {
-  const npub = getUserNpub(config);
-  if (!npub)
-    return null;
-  return npub.slice(-7);
-}
 async function startDaemonProcess() {
   const config = await loadConfig();
   await startDaemon({
@@ -13897,13 +13891,7 @@ async function fetchUsage(limit2 = 1e4) {
     if (result.error)
       return null;
     const entries = result.output;
-    const entriesArray = Array.isArray(entries) ? entries : [];
-    const suffix = getNpubSuffix(await loadConfig());
-    const suffixStr = suffix ? `-${suffix}` : null;
-    const visibleEntries = suffixStr ? entriesArray.filter((entry) => entry.client?.endsWith(suffixStr)).map((entry) => ({
-      ...entry,
-      client: entry.client?.slice(0, -suffixStr.length)
-    })) : entriesArray;
+    const visibleEntries = Array.isArray(entries) ? entries : [];
     const totals = visibleEntries.reduce((acc, entry) => ({
       promptTokens: acc.promptTokens + entry.promptTokens,
       completionTokens: acc.completionTokens + entry.completionTokens,
@@ -14914,7 +14902,6 @@ init_daemon_client();
 
 // src/utils/clients.ts
 init_daemon_client();
-init_nip98();
 init_logger();
 
 // src/integrations/registry.ts
@@ -15203,41 +15190,19 @@ async function runIntegrationsForClients(clientIds, config) {
 }
 
 // src/utils/clients.ts
-function getNpubSuffix2(config) {
-  if (!config.daemonUrl || !config.nsec)
-    return null;
-  try {
-    const secretKey = parseSecretKey(config.nsec);
-    const npub = npubFromSecretKey(secretKey);
-    return npub.slice(-7);
-  } catch {
-    return null;
-  }
-}
-function addSuffixToId(id, suffix) {
-  return `${id}-${suffix}`;
-}
-function removeSuffixFromId(id, suffix) {
-  const suffixStr = `-${suffix}`;
-  if (id.endsWith(suffixStr)) {
-    return id.slice(0, -suffixStr.length);
-  }
-  return id;
-}
 async function getClientsList() {
-  const config = await loadConfig();
   const result = await callDaemon("/clients");
   const clients = result.output?.clients;
   if (!clients) {
     return [];
   }
-  const suffix = config.daemonUrl ? getNpubSuffix2(config) : null;
-  return clients.filter((c) => !suffix || c.id.endsWith(`-${suffix}`)).map((c) => ({
-    clientId: suffix ? removeSuffixFromId(c.id, suffix) : c.id,
+  return clients.map((c) => ({
+    clientId: c.id,
     name: c.name,
     apiKey: c.apiKey,
     createdAt: c.createdAt,
-    lastUsed: c.lastUsed
+    lastUsed: c.lastUsed,
+    ownerNpub: c.ownerNpub
   }));
 }
 async function addDaemonClient(name) {
@@ -15250,16 +15215,14 @@ async function addDaemonClient(name) {
       name: existing.name,
       apiKey: existing.apiKey,
       createdAt: existing.createdAt,
-      lastUsed: existing.lastUsed
+      lastUsed: existing.lastUsed,
+      ownerNpub: existing.ownerNpub
     };
     return { client, created: false };
   }
-  const config = await loadConfig();
-  const suffix = getNpubSuffix2(config);
-  const clientId = suffix ? addSuffixToId(derivedId, suffix) : derivedId;
   const result = await callDaemon("/clients/add", {
     method: "POST",
-    body: { name, id: clientId }
+    body: { name, id: derivedId }
   });
   const output4 = result.output;
   if (!output4?.client?.apiKey) {
@@ -15295,12 +15258,9 @@ async function listClientsAction() {
 }
 async function deleteClientAction(id) {
   await ensureDaemonRunning();
-  const config = await loadConfig();
-  const suffix = getNpubSuffix2(config);
-  const resolvedId = suffix ? addSuffixToId(id, suffix) : id;
   const result = await callDaemon("/clients/delete", {
     method: "POST",
-    body: { id: resolvedId }
+    body: { id }
   });
   if (result.error) {
     console.log(result.error);
@@ -15314,7 +15274,6 @@ async function deleteClientAction(id) {
 async function addClientAction(options) {
   await ensureDaemonRunning();
   const config = await loadConfig();
-  const suffix = getNpubSuffix2(config);
   const integrationKeys = [];
   if (options.opencode)
     integrationKeys.push("opencode");
@@ -15340,7 +15299,7 @@ async function addClientAction(options) {
         await integrationFn(config, client.apiKey, integrationConfig);
         console.log(`
   ${integrationConfig.name}:`);
-        console.log(`    Client ID: ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+        console.log(`    Client ID: ${client.id}`);
         console.log(`    API Key:   ${client.apiKey}`);
       } catch (error) {
         logger.error(`Failed to set up ${integrationConfig.name} integration:`, error);
@@ -15360,7 +15319,7 @@ async function addClientAction(options) {
     if (!created) {
       console.log(`Client '${options.name}' already exists.`);
       console.log(`
-  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+  ID:     ${client.id}`);
       console.log(`  Name:   ${client.name}`);
       console.log(`  API Key: ${client.apiKey}`);
       return;
@@ -15369,7 +15328,7 @@ async function addClientAction(options) {
       console.log(message);
     }
     console.log(`
-  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+  ID:     ${client.id}`);
     console.log(`  Name:   ${client.name}`);
     console.log(`  API Key: ${client.apiKey}`);
     console.log(`
@@ -15558,7 +15517,7 @@ async function isCocodInstalled(cocodPath) {
 // package.json
 var package_default = {
   name: "routstrd",
-  version: "0.2.13",
+  version: "0.2.14",
   module: "src/index.ts",
   type: "module",
   private: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routstrd",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "module": "src/index.ts",
   "type": "module",
   "private": false,

package/src/cli.ts

@@ -7,7 +7,6 @@ import {
   isDaemonRunning,
   loadConfig,
   getDaemonBaseUrl,
-  getNpubSuffix,
   getUserNpub,
 } from "./utils/daemon-client";
 import {

package/src/tui/usage/data.ts

@@ -1,5 +1,5 @@
 import type { UsageTrackingEntry } from "../../daemon/types.ts";
-import { callDaemon, getNpubSuffix, isDaemonRunning, loadConfig } from "../../utils/daemon-client.ts";
+import { callDaemon, isDaemonRunning } from "../../utils/daemon-client.ts";
 import type { ClientStats, DayStats, ModelStats, ProviderStats, UsageStats } from "./types.ts";
 
 export interface BalanceKey {
@@ -82,21 +82,10 @@ export async function fetchUsage(limit = 10000): Promise<UsageStats | null> {
     const result = await callDaemon(`/usage?limit=${limit}`);
     if (result.error) return null;
 
-    // The daemon returns { output: [...] } where output is the entries array directly.
-    // In remote daemon mode, client IDs are suffixed with the last 7 chars of our npub.
-    // Fetch the full daemon result, but only display/aggregate entries for our clients.
+    // The auth proxy filters usage to the authenticated npub's clients and
+    // returns client IDs without the owner suffix.
     const entries = result.output as UsageTrackingEntry[] | undefined;
-    const entriesArray = Array.isArray(entries) ? entries : [];
-    const suffix = getNpubSuffix(await loadConfig());
-    const suffixStr = suffix ? `-${suffix}` : null;
-    const visibleEntries = suffixStr
-      ? entriesArray
-        .filter((entry) => entry.client?.endsWith(suffixStr))
-        .map((entry) => ({
-          ...entry,
-          client: entry.client?.slice(0, -suffixStr.length),
-        }))
-      : entriesArray;
+    const visibleEntries = Array.isArray(entries) ? entries : [];
 
     // Calculate totals from visible entries
     const totals = visibleEntries.reduce(

package/src/utils/clients.ts

@@ -4,49 +4,16 @@ import {
   getDaemonBaseUrl,
   ensureDaemonRunning,
 } from "./daemon-client";
-import {
-  parseSecretKey,
-  npubFromSecretKey,
-} from "./nip98";
-import { type RoutstrdConfig } from "./config";
 import { logger } from "./logger";
 import { CLIENT_INTEGRATIONS, CLIENT_CONFIGS } from "../integrations/registry";
 
-export function getNpubSuffix(config: RoutstrdConfig): string | null {
-  if (!config.daemonUrl || !config.nsec) return null;
-  try {
-    const secretKey = parseSecretKey(config.nsec);
-    const npub = npubFromSecretKey(secretKey);
-    return npub.slice(-7);
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Add suffix to a client ID.
- */
-export function addSuffixToId(id: string, suffix: string): string {
-  return `${id}-${suffix}`;
-}
-
-/**
- * Remove suffix from a client ID if present.
- */
-export function removeSuffixFromId(id: string, suffix: string): string {
-  const suffixStr = `-${suffix}`;
-  if (id.endsWith(suffixStr)) {
-    return id.slice(0, -suffixStr.length);
-  }
-  return id;
-}
-
 export interface ClientEntry {
   clientId: string;
   name: string;
   apiKey: string;
   createdAt: number;
   lastUsed?: number | null;
+  ownerNpub?: string;
 }
 
 export interface DaemonClient {
@@ -55,6 +22,7 @@ export interface DaemonClient {
   apiKey: string;
   createdAt: number;
   lastUsed?: number | null;
+  ownerNpub?: string;
 }
 
 /**
@@ -71,12 +39,14 @@ export function getClientsFromStore(store: { getState(): any }): ClientEntry[] {
       apiKey: string;
       createdAt: number;
       lastUsed?: number | null;
+      ownerNpub?: string;
     }) => ({
       clientId: c.clientId,
       name: c.name,
       apiKey: c.apiKey,
       createdAt: c.createdAt,
       lastUsed: c.lastUsed,
+      ownerNpub: c.ownerNpub,
     }),
   );
 }
@@ -86,7 +56,6 @@ export function getClientsFromStore(store: { getState(): any }): ClientEntry[] {
  * Use this when running remotely (CLI in remote mode).
  */
 export async function getClientsList(): Promise<ClientEntry[]> {
-  const config = await loadConfig();
   const result = await callDaemon("/clients");
   const clients = (
     result.output as
@@ -97,6 +66,7 @@ export async function getClientsList(): Promise<ClientEntry[]> {
             apiKey: string;
             createdAt: number;
             lastUsed?: number | null;
+            ownerNpub?: string;
           }>;
         }
       | undefined
@@ -106,17 +76,14 @@ export async function getClientsList(): Promise<ClientEntry[]> {
     return [];
   }
 
-  const suffix = config.daemonUrl ? getNpubSuffix(config) : null;
-
-  return clients
-    .filter((c) => !suffix || c.id.endsWith(`-${suffix}`))
-    .map((c) => ({
-      clientId: suffix ? removeSuffixFromId(c.id, suffix) : c.id,
-      name: c.name,
-      apiKey: c.apiKey,
-      createdAt: c.createdAt,
-      lastUsed: c.lastUsed,
-    }));
+  return clients.map((c) => ({
+    clientId: c.id,
+    name: c.name,
+    apiKey: c.apiKey,
+    createdAt: c.createdAt,
+    lastUsed: c.lastUsed,
+    ownerNpub: c.ownerNpub,
+  }));
 }
 
 export async function addDaemonClient(
@@ -135,18 +102,14 @@ export async function addDaemonClient(
       apiKey: existing.apiKey,
       createdAt: existing.createdAt,
       lastUsed: existing.lastUsed,
+      ownerNpub: existing.ownerNpub,
     };
     return { client, created: false };
   }
 
-  const config = await loadConfig();
-  const suffix = getNpubSuffix(config);
-  const clientId = suffix ? addSuffixToId(derivedId, suffix) : derivedId;
-
-
   const result = await callDaemon("/clients/add", {
     method: "POST",
-    body: { name, id: clientId },
+    body: { name, id: derivedId },
   });
 
 
@@ -196,13 +159,9 @@ export async function listClientsAction(): Promise<void> {
 export async function deleteClientAction(id: string): Promise<void> {
   await ensureDaemonRunning();
 
-  const config = await loadConfig();
-  const suffix = getNpubSuffix(config);
-  const resolvedId = suffix ? addSuffixToId(id, suffix) : id;
-
   const result = await callDaemon("/clients/delete", {
     method: "POST",
-    body: { id: resolvedId },
+    body: { id },
   });
 
   if (result.error) {
@@ -233,7 +192,6 @@ export interface AddClientOptions {
 export async function addClientAction(options: AddClientOptions): Promise<void> {
   await ensureDaemonRunning();
   const config = await loadConfig();
-  const suffix = getNpubSuffix(config);
 
   const integrationKeys: string[] = [];
   if (options.opencode) integrationKeys.push("opencode");
@@ -259,7 +217,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
         await integrationFn(config, client.apiKey, integrationConfig);
 
         console.log(`\n  ${integrationConfig.name}:`);
-        console.log(`    Client ID: ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+        console.log(`    Client ID: ${client.id}`);
         console.log(`    API Key:   ${client.apiKey}`);
       } catch (error) {
         logger.error(
@@ -286,7 +244,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
 
     if (!created) {
       console.log(`Client '${options.name}' already exists.`);
-      console.log(`\n  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+      console.log(`\n  ID:     ${client.id}`);
       console.log(`  Name:   ${client.name}`);
       console.log(`  API Key: ${client.apiKey}`);
       return;
@@ -295,7 +253,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
     if (message) {
       console.log(message);
     }
-    console.log(`\n  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+    console.log(`\n  ID:     ${client.id}`);
     console.log(`  Name:   ${client.name}`);
     console.log(`  API Key: ${client.apiKey}`);
     console.log(`\n  Access Routstr at: ${getDaemonBaseUrl(config)}/v1`);