routstrd 0.2.6 → 0.2.8

package/src/cli.ts

@@ -6,7 +6,15 @@ import {
   ensureDaemonRunning,
   isDaemonRunning,
   loadConfig,
+  getDaemonBaseUrl,
+  getNpubSuffix,
+  getUserNpub,
 } from "./utils/daemon-client";
+import {
+  listClientsAction,
+  deleteClientAction,
+  addClientAction,
+} from "./utils/clients";
 import { existsSync, mkdirSync } from "fs";
 import { execSync } from "child_process";
 import {
@@ -18,18 +26,16 @@ import {
   type RoutstrdConfig,
 } from "./utils/config";
 import { logger } from "./utils/logger";
-import {
-  setupIntegration,
-  CLIENT_CONFIGS,
-  CLIENT_INTEGRATIONS,
-} from "./integrations";
-import { createSdkStore } from "@routstr/sdk";
-import { createBunSqliteDriver } from "@routstr/sdk/storage";
+import { setupIntegration, runIntegrationsForClients } from "./integrations";
+import { getClientsList } from "./utils/clients";
 import * as QRCode from "qrcode";
+import { normalizeNostrPubkey, npubFromPubkey, npubFromSecretKey } from "./utils/nip98";
+import { generateSecretKey, nip19 } from "nostr-tools";
 import {
   isCocodInstalled,
   resolveCocodExecutable,
 } from "./daemon/wallet/cocod-client";
+import packageJson from "../package.json" with { type: "json" };
 
 type RoutstrModel = {
   id: string;
@@ -52,8 +58,6 @@ type UsageEntry = {
   client?: string;
 };
 
-const cliVersion = "0.1.1";
-
 function parsePositiveIntOrExit(value: string, fieldName: string): number {
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
@@ -80,10 +84,13 @@ async function printLightningInvoice(invoice: string): Promise<void> {
 async function installCocodOrExit(): Promise<void> {
   logger.log("cocod not found. Installing globally with bun...");
 
-  const installProc = Bun.spawn(["bun", "install", "--global", "@routstr/cocod"], {
-    stdout: "inherit",
-    stderr: "inherit",
-  });
+  const installProc = Bun.spawn(
+    ["bun", "install", "--global", "@routstr/cocod"],
+    {
+      stdout: "inherit",
+      stderr: "inherit",
+    },
+  );
 
   const installCode = await installProc.exited;
   if (installCode !== 0 || !(await isCocodInstalled())) {
@@ -96,6 +103,16 @@ async function installCocodOrExit(): Promise<void> {
   logger.log("cocod installed successfully.");
 }
 
+async function requireLocalDaemon(): Promise<void> {
+  const config = await loadConfig();
+  if (config.daemonUrl) {
+    console.error(
+      `This command is not available when using a remote daemon (${config.daemonUrl}).`,
+    );
+    process.exit(1);
+  }
+}
+
 async function initDaemon(): Promise<void> {
   logger.log("Initializing routstrd...");
 
@@ -188,11 +205,7 @@ async function initDaemon(): Promise<void> {
 
   await startDaemon({ port: String(config.port || 8008) });
 
-  // Create SDK store for integrations
-  const sqliteDriver = await createBunSqliteDriver(DB_PATH);
-  const { store } = await createSdkStore({ driver: sqliteDriver });
-
-  await setupIntegration(config, store);
+  await setupIntegration(config);
 
   logger.log("\nInitialization complete!");
   logger.log(
@@ -209,28 +222,33 @@ async function initDaemon(): Promise<void> {
 program
   .name("routstrd")
   .description("Routstr daemon - Manage routstr processes")
-  .version(cliVersion, "--version", "output the version number");
+  .version(packageJson.version, "--version", "output the version number");
 
 program
   .command("refund")
   .description("Refund pending tokens and API keys to a specified mint")
-  .option("-m, --mint-url <mintUrl>", "Mint URL to refund to (defaults to first mint in wallet)")
+  .option(
+    "-m, --mint-url <mintUrl>",
+    "Mint URL to refund to (defaults to first mint in wallet)",
+  )
   .option("-y, --yes", "Skip confirmation prompt", false)
   .action(async (options: { mintUrl?: string; yes: boolean }) => {
-    const config = await loadConfig();
+    await ensureDaemonRunning();
 
     let mintUrl = options.mintUrl;
     if (!mintUrl) {
-      const balanceResponse = await fetch(`http://localhost:${config.port}/balance`);
-      const balanceResult = (await balanceResponse.json()) as {
-        output?: { balances?: Record<string, number> };
-        error?: string;
-      };
+      const balanceResult = await callDaemon("/balance");
       if (balanceResult.error) {
         console.log(balanceResult.error);
         process.exit(1);
       }
-      const balances = balanceResult.output?.balances;
+      const balances = (
+        balanceResult.output as
+          | {
+              balances?: Record<string, number>;
+            }
+          | undefined
+      )?.balances;
       if (!balances || Object.keys(balances).length === 0) {
         console.log("No mint URLs found in wallet balance");
         process.exit(1);
@@ -240,44 +258,40 @@ program
     }
 
     try {
-      const response = await fetch(`http://localhost:${config.port}/refund`, {
+      const result = await callDaemon("/refund", {
         method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ mintUrl }),
+        body: { mintUrl },
       });
 
-      if (!response.ok) {
-        const errorData = (await response.json()) as { error?: string };
-        throw new Error(errorData.error || `HTTP ${response.status}`);
-      }
-
-      const result = (await response.json()) as {
-        output?: {
-          message: string;
-          pendingTokens: number;
-          apiKeys: number;
-          results: Array<{ baseUrl: string; success: boolean }>;
-        };
-        error?: string;
-      };
-
       if (result.error) {
         console.log(result.error);
         process.exit(1);
       }
 
-      if (result.output) {
-        console.log(result.output.message);
-        console.log(`\nPending tokens: ${result.output.pendingTokens}`);
-        console.log(`API keys: ${result.output.apiKeys}`);
+      const output = result.output as
+        | {
+            message: string;
+            pendingTokens: number;
+            apiKeys: number;
+            results: Array<{ baseUrl: string; success: boolean }>;
+          }
+        | undefined;
+
+      if (output) {
+        console.log(output.message);
+        console.log(`\nPending tokens: ${output.pendingTokens}`);
+        console.log(`API keys: ${output.apiKeys}`);
         console.log("\nResults:");
-        for (const r of result.output.results) {
+        for (const r of output.results) {
           console.log(`  - ${r.baseUrl}: ${r.success ? "success" : "failed"}`);
         }
       }
     } catch (error) {
       const message = (error as Error).message;
-      if (message?.includes("fetch failed") || message?.includes("Connection refused")) {
+      if (
+        message?.includes("fetch failed") ||
+        message?.includes("Connection refused")
+      ) {
         console.error("Daemon is not running");
         process.exit(1);
       }
@@ -286,6 +300,53 @@ program
     }
   });
 
+// Remote - configure a remote daemon URL
+program
+  .command("remote <url>")
+  .description("Configure a remote daemon URL")
+  .action(async (url: string) => {
+    try {
+      new URL(url);
+    } catch {
+      console.error(`Invalid URL: ${url}`);
+      process.exit(1);
+    }
+
+    if (!existsSync(CONFIG_DIR)) {
+      mkdirSync(CONFIG_DIR, { recursive: true });
+    }
+
+    const config = await loadConfig();
+    const updates: Partial<RoutstrdConfig> = { daemonUrl: url };
+    let generatedNpub: string | undefined;
+
+    if (!config.nsec) {
+      const secretKey = generateSecretKey();
+      const nsec = nip19.nsecEncode(secretKey);
+      const npub = npubFromSecretKey(secretKey);
+      updates.nsec = nsec;
+      generatedNpub = npub;
+    }
+
+    const updatedConfig: RoutstrdConfig = {
+      ...config,
+      ...updates,
+    };
+
+    await Bun.write(CONFIG_FILE, JSON.stringify(updatedConfig, null, 2));
+
+    console.log(`Remote daemon URL set to: ${url}`);
+    if (generatedNpub) {
+      console.log(
+        `\nA new Nostr identity has been generated for remote authentication.`,
+      );
+      console.log(`Your npub: ${generatedNpub}`);
+      console.log(
+        `You can view it in the config file at: ${CONFIG_FILE}`,
+      );
+    }
+  });
+
 // Onboard - initialize the daemon
 program
   .command("onboard")
@@ -293,6 +354,7 @@ program
     "Initialize routstrd (creates config directory and initializes cocod)",
   )
   .action(async () => {
+    await requireLocalDaemon();
     await initDaemon();
   });
 
@@ -303,6 +365,7 @@ program
   .option("--port <port>", "Port to listen on")
   .option("-p, --provider <provider>", "Default provider to use")
   .action(async (options: { port?: string; provider?: string }) => {
+    await requireLocalDaemon();
     const config = await loadConfig();
     if (!(await isCocodInstalled(config.cocodPath))) {
       const installHint = config.cocodPath
@@ -423,6 +486,34 @@ program
     await handleDaemonCommand("/ping");
   });
 
+// Refresh - refresh models and integrations
+program
+  .command("refresh")
+  .description("Refresh routstr21 models and client integrations")
+  .action(async () => {
+    await ensureDaemonRunning();
+    const config = await loadConfig();
+
+    // Refresh models via daemon API
+    console.log("Refreshing routstr21 models...");
+    const result = await callDaemon("/v1/models?refresh=true");
+    if (result.error) {
+      console.log(`Model refresh failed: ${result.error}`);
+      process.exit(1);
+    }
+    console.log("Models refreshed.");
+
+    // Refresh integrations for all clients
+    const clients = await getClientsList();
+    if (clients.length > 0) {
+      console.log(`Refreshing ${clients.length} client integration(s)...`);
+      await runIntegrationsForClients(clients, config);
+      console.log("Client integrations refreshed.");
+    } else {
+      console.log("No clients to refresh.");
+    }
+  });
+
 // Models - list routstr21 models
 program
   .command("models")
@@ -434,27 +525,31 @@ program
 
     if (options.model) {
       // Show providers for specific model
-      const result = await callDaemon(`/models/${encodeURIComponent(options.model)}/providers`);
+      const result = await callDaemon(
+        `/models/${encodeURIComponent(options.model)}/providers`,
+      );
       if (result.error) {
         console.log(result.error);
         process.exit(1);
       }
 
-      const modelData = result.output as {
-        id: string;
-        name?: string;
-        description?: string;
-        context_length?: number;
-        providers: Array<{
-          baseUrl: string;
-          pricing: {
-            prompt: number;
-            completion: number;
-            request: number;
-            max_cost: number;
-          };
-        }>;
-      } | undefined;
+      const modelData = result.output as
+        | {
+            id: string;
+            name?: string;
+            description?: string;
+            context_length?: number;
+            providers: Array<{
+              baseUrl: string;
+              pricing: {
+                prompt: number;
+                completion: number;
+                request: number;
+                max_cost: number;
+              };
+            }>;
+          }
+        | undefined;
 
       if (!modelData) {
         console.log("Model not found");
@@ -466,15 +561,25 @@ program
         console.log(`  ${modelData.description}`);
       }
       if (modelData.context_length) {
-        console.log(`  Context: ${modelData.context_length.toLocaleString()} tokens`);
+        console.log(
+          `  Context: ${modelData.context_length.toLocaleString()} tokens`,
+        );
       }
       console.log(`\n  Providers (${modelData.providers.length}):`);
       for (const provider of modelData.providers) {
         console.log(`\n    ${provider.baseUrl}`);
-        console.log(`      Prompt:     ${(provider.pricing.prompt * 1000000).toFixed(2)} sats/M tokens`);
-        console.log(`      Completion: ${(provider.pricing.completion * 1000000).toFixed(2)} sats/M tokens`);
-        console.log(`      Request:    ${provider.pricing.request.toFixed(2)} sats`);
-        console.log(`      Max cost:   ${provider.pricing.max_cost.toFixed(2)} sats`);
+        console.log(
+          `      Prompt:     ${(provider.pricing.prompt * 1000000).toFixed(2)} sats/M tokens`,
+        );
+        console.log(
+          `      Completion: ${(provider.pricing.completion * 1000000).toFixed(2)} sats/M tokens`,
+        );
+        console.log(
+          `      Request:    ${provider.pricing.request.toFixed(2)} sats`,
+        );
+        console.log(
+          `      Max cost:   ${provider.pricing.max_cost.toFixed(2)} sats`,
+        );
       }
       console.log("");
       return;
@@ -499,7 +604,9 @@ program
         console.log("No routstr21 models found");
       } else {
         console.log(`\nFound ${models.length} routstr21 models:`);
-        console.log("(Use 'routstrd models -m <model_id>' to see providers and pricing)\n");
+        console.log(
+          "(Use 'routstrd models -m <model_id>' to see providers and pricing)\n",
+        );
         models.forEach((model, i) => {
           const details = [
             model.name && model.name !== model.id ? model.name : null,
@@ -507,7 +614,9 @@ program
           ]
             .filter(Boolean)
             .join(" - ");
-          console.log(`  ${String(i + 1).padStart(2)}. ${model.id}${details ? ` (${details})` : ""}`);
+          console.log(
+            `  ${String(i + 1).padStart(2)}. ${model.id}${details ? ` (${details})` : ""}`,
+          );
         });
         console.log("");
       }
@@ -694,72 +803,14 @@ clientsCmd
   .command("list")
   .description("List all clients")
   .action(async () => {
-    await ensureDaemonRunning();
-
-    const result = await callDaemon("/clients");
-    if (result.error) {
-      console.log(result.error);
-      process.exit(1);
-    }
-
-    const output = result.output as
-      | {
-          clients: Array<{
-            id: string;
-            name: string;
-            apiKey: string;
-            createdAt: number;
-            lastUsed?: number | null;
-          }>;
-          totalCount: number;
-        }
-      | undefined;
-
-    if (!output?.clients || output.clients.length === 0) {
-      console.log("No clients found.");
-      return;
-    }
-
-    console.log(`Clients (${output.totalCount} total):\n`);
-    for (const client of output.clients) {
-      const createdAt = new Date(client.createdAt).toISOString();
-      const lastUsed = client.lastUsed
-        ? new Date(client.lastUsed).toISOString()
-        : "never";
-      console.log(`  ${client.id}`);
-      console.log(`    Name:     ${client.name}`);
-      console.log(`    API Key:  ${client.apiKey}`);
-      console.log(`    Created:  ${createdAt}`);
-      console.log("");
-    }
+    await listClientsAction();
   });
 
 clientsCmd
   .command("delete <id>")
   .description("Delete a client by its ID")
   .action(async (id: string) => {
-    await ensureDaemonRunning();
-
-    const result = await callDaemon("/clients/delete", {
-      method: "POST",
-      body: { id },
-    });
-
-    if (result.error) {
-      console.log(result.error);
-      process.exit(1);
-    }
-
-    const output = result.output as
-      | {
-          message: string;
-          id: string;
-        }
-      | undefined;
-
-    if (output) {
-      console.log(output.message);
-    }
+    await deleteClientAction(id);
   });
 
 clientsCmd
@@ -770,98 +821,118 @@ clientsCmd
   .option("--openclaw", "Set up OpenClaw integration")
   .option("--pi-agent", "Set up Pi Agent integration")
   .option("--claude-code", "Set up Claude Code integration")
-  .action(async (options: {
-    name?: string;
-    opencode?: boolean;
-    openclaw?: boolean;
-    piAgent?: boolean;
-    claudeCode?: boolean;
-  }) => {
-    await ensureDaemonRunning();
-    const config = await loadConfig();
-
-    const integrationKeys: string[] = [];
-    if (options.opencode) integrationKeys.push("opencode");
-    if (options.openclaw) integrationKeys.push("openclaw");
-    if (options.piAgent) integrationKeys.push("pi-agent");
-    if (options.claudeCode) integrationKeys.push("claude-code");
-
-    if (integrationKeys.length > 0) {
-      const sqliteDriver = await createBunSqliteDriver(DB_PATH);
-      const { store } = await createSdkStore({ driver: sqliteDriver });
-
-      for (const key of integrationKeys) {
-        const integrationFn = CLIENT_INTEGRATIONS[key];
-        const integrationConfig = CLIENT_CONFIGS[key];
-        if (!integrationFn || !integrationConfig) continue;
-
-        try {
-          await integrationFn(config, store, integrationConfig);
-        } catch (error) {
-          logger.error(
-            `Failed to set up ${integrationConfig.name} integration:`,
-            error,
-          );
-          continue;
-        }
+  .action(
+    async (options: {
+      name?: string;
+      opencode?: boolean;
+      openclaw?: boolean;
+      piAgent?: boolean;
+      claudeCode?: boolean;
+    }) => {
+      await addClientAction(options);
+    },
+  );
 
-        const state = store.getState();
-        const client = (state.clientIds || []).find(
-          (c: { clientId: string }) => c.clientId === key,
-        );
-        if (client) {
-          console.log(`\n  ${integrationConfig.name}:`);
-          console.log(`    Client ID: ${client.clientId}`);
-          console.log(`    API Key:   ${client.apiKey}`);
-        }
-      }
+// Npubs - manage admin npubs
+const npubsCmd = program
+  .command("npubs")
+  .description("Manage admin npubs on the daemon");
 
+npubsCmd
+  .command("list")
+  .description("List configured admin npubs")
+  .action(async () => {
+    await ensureDaemonRunning();
+    const config = await loadConfig();
+    const userNpub = getUserNpub(config);
+    const result = await callDaemon("/npubs");
+    if (result.error) {
+      console.log(result.error);
+      process.exit(1);
+    }
+    // Handle both wrapped { output: { npubs } } and direct { npubs } response formats
+    const data = (result.output as { npubs?: string[] } | undefined)?.npubs
+      ? result.output
+      : result;
+    const npubs = (data as { npubs?: string[] } | undefined)?.npubs ?? [];
+    if (npubs.length === 0) {
+      console.log("No admin npubs configured.");
+      return;
+    }
+    console.log(`Admin npubs (${npubs.length}):`);
+    let found = false;
+    for (const npub of npubs) {
+      const marker = npub === userNpub ? " → you" : "";
+      if (npub === userNpub) found = true;
+      console.log(`- ${npub}${marker}`);
+    }
+    if (userNpub && !found) {
+      console.log("");
       console.log(
-        `\n  Access Routstr at: http://localhost:${config.port || 8008}/v1`,
+        "Your npub is not in the admin list. Ask the admin to add your npub:",
       );
-      return;
+      console.log(`  ${userNpub}`);
     }
+  });
 
-    if (!options.name) {
-      console.error(
-        "error: required option '-n, --name <name>' not specified",
-      );
+npubsCmd
+  .command("add <npub>")
+  .description("Add an admin npub (hex pubkey or npub1...)")
+  .action(async (npubArg: string) => {
+    await ensureDaemonRunning();
+    const normalized = normalizeNostrPubkey(npubArg);
+    if (!normalized) {
+      console.error("Invalid npub value. Use npub1... or 64-char hex pubkey.");
       process.exit(1);
     }
-
-    const result = await callDaemon("/clients/add", {
+    const result = await callDaemon("/npubs", {
       method: "POST",
-      body: { name: options.name },
+      body: { npub: npubFromPubkey(normalized) },
     });
-
     if (result.error) {
       console.log(result.error);
       process.exit(1);
     }
-
     const output = result.output as
-      | {
-          message: string;
-          client: {
-            id: string;
-            name: string;
-            apiKey: string;
-            createdAt: number;
-          };
-        }
+      | { npub?: string; added?: boolean; error?: string }
       | undefined;
-
-    if (output) {
-      console.log(output.message);
-      console.log(`\n  ID:     ${output.client.id}`);
-      console.log(`  Name:   ${output.client.name}`);
-      console.log(`  API Key: ${output.client.apiKey}`);
+    if (output?.npub) {
       console.log(
-        `\n  Access Routstr at: http://localhost:${config.port || 8008}/v1`,
+        `${output.added ? "Added" : "Already configured"} admin npub: ${output.npub}`,
       );
     }
   });
 
+npubsCmd
+  .command("delete <npub>")
+  .description("Delete an admin npub (hex pubkey or npub1...)")
+  .action(async (npubArg: string) => {
+    await ensureDaemonRunning();
+    const normalized = normalizeNostrPubkey(npubArg);
+    if (!normalized) {
+      console.error("Invalid npub value. Use npub1... or 64-char hex pubkey.");
+      process.exit(1);
+    }
+    const result = await callDaemon(
+      `/npubs/${encodeURIComponent(npubFromPubkey(normalized))}`,
+      {
+        method: "DELETE",
+      },
+    );
+    if (result.error) {
+      console.log(result.error);
+      process.exit(1);
+    }
+    const output = result.output as
+      | { removed?: boolean; error?: string }
+      | undefined;
+    console.log(
+      output?.removed
+        ? "Removed admin npub."
+        : "Admin npub was not configured.",
+    );
+  });
+
 // Monitor - interactive TUI
 program
   .command("monitor")
@@ -1104,6 +1175,7 @@ serviceCmd
   .command("install")
   .description("Install and start routstrd using PM2 for persistence")
   .action(async () => {
+    await requireLocalDaemon();
     // 1. Check if PM2 is installed
     try {
       execSync("pm2 -v", { stdio: "ignore" });
@@ -1112,7 +1184,9 @@ serviceCmd
       try {
         execSync("bun install -g pm2", { stdio: "inherit" });
       } catch (err) {
-        console.error("Failed to install PM2. Please install it manually: bun install -g pm2");
+        console.error(
+          "Failed to install PM2. Please install it manually: bun install -g pm2",
+        );
         process.exit(1);
       }
     }
@@ -1126,11 +1200,17 @@ serviceCmd
     } catch (e) {
       // Fallback for some bundling scenarios
       const path = require("path");
-      daemonPath = path.join(path.dirname(import.meta.url).replace("file://", ""), "daemon", "index.js");
+      daemonPath = path.join(
+        path.dirname(import.meta.url).replace("file://", ""),
+        "daemon",
+        "index.js",
+      );
     }
 
     if (!existsSync(daemonPath)) {
-      console.error(`Could not find daemon at ${daemonPath}. Did you run 'bun run build'?`);
+      console.error(
+        `Could not find daemon at ${daemonPath}. Did you run 'bun run build'?`,
+      );
       process.exit(1);
     }
 
@@ -1185,6 +1265,7 @@ program
   .option("--port <port>", "Port to listen on")
   .option("-p, --provider <provider>", "Default provider to use")
   .action(async (options: { port?: string; provider?: string }) => {
+    await requireLocalDaemon();
     const config = await loadConfig();
     const wasRunning = await isDaemonRunning();
 
@@ -1222,6 +1303,7 @@ program
   .command("mode")
   .description("Set the client mode (lazyrefund/apikeys or xcashu)")
   .action(async () => {
+    await requireLocalDaemon();
     const config = await loadConfig();
     const currentMode = config.mode || "apikeys";
 
@@ -1312,6 +1394,7 @@ program
   .option("-f, --follow", "Follow log output", false)
   .option("-n, --lines <number>", "Number of lines to show", "50")
   .action(async (options: { follow: boolean; lines: string }) => {
+    await requireLocalDaemon();
     const todayFile = getLogFileForDate();
     const yesterday = new Date();
     yesterday.setDate(yesterday.getDate() - 1);