routstrd 0.4.4 → 0.4.6

package/dist/index.js

@@ -23017,7 +23017,47 @@ function parseChoice(input) {
   }
   return 1;
 }
-async function setupIntegration(config) {
+async function installIntegrationByKey(config, key) {
+  const integrationConfig = CLIENT_CONFIGS[key];
+  if (!integrationConfig) {
+    console.log(`Unknown integration: ${key}`);
+    return;
+  }
+  const { client, created } = await addDaemonClient(integrationConfig.name);
+  if (created) {
+    console.log(`Created new API key for ${integrationConfig.name}`);
+  } else {
+    console.log(`Using existing API key for ${integrationConfig.name}`);
+  }
+  switch (key) {
+    case "opencode":
+      await installOpencodeIntegration(config, client.apiKey, integrationConfig);
+      return;
+    case "openclaw":
+      await installOpenClawIntegration(config, client.apiKey, integrationConfig);
+      return;
+    case "pi-agent":
+      await installPiIntegration(config, client.apiKey, integrationConfig);
+      return;
+    case "claude-code":
+      await installClaudeCodeIntegration(config, client.apiKey, integrationConfig);
+      return;
+    case "hermes":
+      await installHermesIntegration(config, client.apiKey, integrationConfig);
+      return;
+    default:
+      console.log(`Unknown integration: ${key}`);
+  }
+}
+async function setupIntegration(config, integrationKey) {
+  if (integrationKey === "skip") {
+    console.log("Skipping integration setup.");
+    return;
+  }
+  if (integrationKey !== undefined) {
+    await installIntegrationByKey(config, integrationKey);
+    return;
+  }
   console.log(`
 Choose an integration to set up:`);
   console.log("1. OpenCode (default)");
@@ -23040,33 +23080,7 @@ Choose an integration to set up:`);
     console.log("Skipping integration setup.");
     return;
   }
-  const integrationConfig = CLIENT_CONFIGS[key];
-  const { client, created } = await addDaemonClient(integrationConfig.name);
-  if (created) {
-    console.log(`Created new API key for ${integrationConfig.name}`);
-  } else {
-    console.log(`Using existing API key for ${integrationConfig.name}`);
-  }
-  if (key === "opencode") {
-    await installOpencodeIntegration(config, client.apiKey, integrationConfig);
-    return;
-  }
-  if (key === "openclaw") {
-    await installOpenClawIntegration(config, client.apiKey, integrationConfig);
-    return;
-  }
-  if (key === "pi-agent") {
-    await installPiIntegration(config, client.apiKey, integrationConfig);
-    return;
-  }
-  if (key === "claude-code") {
-    await installClaudeCodeIntegration(config, client.apiKey, integrationConfig);
-    return;
-  }
-  if (key === "hermes") {
-    await installHermesIntegration(config, client.apiKey, integrationConfig);
-    return;
-  }
+  await installIntegrationByKey(config, key);
 }
 
 // node_modules/@noble/hashes/utils.js
@@ -27170,15 +27184,22 @@ zoo`.split(`
 // package.json
 var package_default = {
   name: "routstrd",
-  version: "0.4.4",
+  version: "0.4.6",
   module: "src/index.ts",
   type: "module",
   private: false,
   bin: {
     routstrd: "./dist/index.js"
   },
+  files: [
+    "dist",
+    "src",
+    "README.md",
+    "SECURITY.md"
+  ],
   scripts: {
     start: "bun src/index.ts start",
+    stop: "bun src/index.ts stop",
     monitor: "bun src/index.ts monitor",
     lint: "tsc --noEmit",
     test: "bun test",
@@ -27196,7 +27217,7 @@ var package_default = {
     "@cashu/cashu-ts": "^4.3.0",
     "@cashu/coco-core": "^1.0.1",
     "@cashu/coco-sqlite-bun": "^1.0.1",
-    "@routstr/sdk": "^0.4.1",
+    "@routstr/sdk": "^0.4.2",
     "@scure/bip39": "^2.2.0",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
@@ -27320,7 +27341,7 @@ async function requireLocalDaemon() {
     process.exit(1);
   }
 }
-async function initDaemon() {
+async function initDaemon(integrationKey) {
   console.log("Initializing routstrd...");
   if (!existsSync14(CONFIG_DIR)) {
     console.log(`Created config directory: ${CONFIG_DIR}`);
@@ -27370,7 +27391,7 @@ A new Nostr identity has been generated for authentication.`);
   }
   initializeWallet();
   await startDaemon({ port: String(config.port || 8008), host: config.host || undefined });
-  await setupIntegration(config);
+  await setupIntegration(config, integrationKey);
   console.log(`
 Initialization complete!`);
   console.log(`
@@ -27569,10 +27590,32 @@ program.command("local").description("Switch back to local daemon mode (removes
 Use 'routstrd onboard' for first time using local mode or 'routstrd start' to start the local daemon if you already are using it.`);
   console.log(`You can view the config file at: ${CONFIG_FILE}`);
 });
-program.command("onboard").description("Initialize routstrd (creates config directory and initializes wallet)").action(async () => {
+program.command("onboard").description("Initialize routstrd (creates config directory and initializes wallet)").option("--opencode", "Set up OpenCode integration (non-interactive)").option("--openclaw", "Set up OpenClaw integration (non-interactive)").option("--pi-agent", "Set up Pi Agent integration (non-interactive)").option("--claude-code", "Set up Claude Code integration (non-interactive)").option("--hermes", "Set up Hermes integration (non-interactive)").option("--skip-integration", "Skip integration setup").action(async (options) => {
   await requireLocalDaemon();
+  const integrationFlags = {
+    opencode: options.opencode,
+    openclaw: options.openclaw,
+    "pi-agent": options.piAgent,
+    "claude-code": options.claudeCode,
+    hermes: options.hermes
+  };
+  const selectedIntegrations = Object.keys(integrationFlags).filter((key) => integrationFlags[key]);
+  if (selectedIntegrations.length > 1) {
+    console.error("Error: use only one integration flag, or use 'routstrd clients add' for multiple clients.");
+    process.exit(1);
+  }
+  if (options.skipIntegration && selectedIntegrations.length > 0) {
+    console.error("Error: --skip-integration cannot be combined with an integration flag.");
+    process.exit(1);
+  }
+  let integrationKey;
+  if (options.skipIntegration) {
+    integrationKey = "skip";
+  } else if (selectedIntegrations.length === 1) {
+    integrationKey = selectedIntegrations[0];
+  }
   try {
-    await initDaemon();
+    await initDaemon(integrationKey);
   } catch (error) {
     if (error instanceof WalletMigrationConflictError) {
       console.error(error.message);
@@ -28588,14 +28631,17 @@ function getLogFileForDate2(logsDir, date = new Date) {
   const day = String(date.getDate()).padStart(2, "0");
   return `${logsDir}/${year}-${month}-${day}.log`;
 }
-function readLastLines(file, lines) {
+function readAllLines(file) {
   const content = readFileSync5(file, "utf8");
   const allLines = content.replace(/\r\n/g, `
 `).split(`
 `);
   if (allLines.at(-1) === "")
     allLines.pop();
-  return allLines.slice(-lines).join(`
+  return allLines;
+}
+function readLastLines(file, lines) {
+  return readAllLines(file).slice(-lines).join(`
 `);
 }
 async function followLogFile(file, lines) {
@@ -28621,8 +28667,102 @@ async function followLogFile(file, lines) {
     position = size;
   }
 }
-program.command("logs").description("View daemon logs").option("-f, --follow", "Follow log output", false).option("-c, --coco", "Show Cashu wallet-engine (coco) logs instead of daemon logs", false).option("-n, --lines <number>", "Number of lines to show", "50").action(async (options) => {
+function parseStructuredLogLine(line) {
+  const out = { isRouting: false };
+  const head = line.match(/^\[([^\]]+)\]\s+\[([^\]]+)\]/);
+  if (head) {
+    out.timestamp = head[1];
+    out.level = head[2];
+  }
+  const req = line.match(/\[req:([^\]\:]+)/);
+  if (req) {
+    out.requestId = req[1].trim();
+  }
+  const model = line.match(/\[model:([^\]\:]+)\]/);
+  if (model) {
+    out.modelId = model[1].trim();
+  } else {
+    const jsonModel = line.match(/"modelId"\s*:\s*"([^"]+)"/);
+    if (jsonModel) {
+      out.modelId = jsonModel[1];
+    }
+  }
+  out.isRouting = !!out.requestId && line.includes("Routing request with path");
+  return out;
+}
+function collectRecentRequestsFromLines(lines, limit) {
+  const result = [];
+  const seen = new Set;
+  for (let i2 = lines.length - 1;i2 >= 0; i2--) {
+    const parsed = parseStructuredLogLine(lines[i2]);
+    if (!parsed.isRouting || !parsed.requestId)
+      continue;
+    if (seen.has(parsed.requestId))
+      continue;
+    seen.add(parsed.requestId);
+    result.push({
+      requestId: parsed.requestId,
+      modelId: parsed.modelId ?? "unknown",
+      timestamp: parsed.timestamp
+    });
+    if (result.length >= limit)
+      break;
+  }
+  const byRequestId = new Map(result.map((r) => [r.requestId, r]));
+  for (const line of lines) {
+    const parsed = parseStructuredLogLine(line);
+    if (!parsed.requestId || !parsed.modelId)
+      continue;
+    const record = byRequestId.get(parsed.requestId);
+    if (record && record.modelId === "unknown") {
+      record.modelId = parsed.modelId;
+    }
+  }
+  return result;
+}
+function collectRecentRequests(files, limit) {
+  const result = [];
+  const seen = new Set;
+  for (const file of [...files].reverse()) {
+    if (!existsSync14(file))
+      continue;
+    const remaining = limit - result.length;
+    if (remaining <= 0)
+      break;
+    for (const request of collectRecentRequestsFromLines(readAllLines(file), remaining)) {
+      if (seen.has(request.requestId))
+        continue;
+      seen.add(request.requestId);
+      result.push(request);
+      if (result.length >= limit)
+        return result;
+    }
+  }
+  return result;
+}
+function filterLinesByRequestId(files, requestId) {
+  const matches = [];
+  for (const file of files) {
+    if (!existsSync14(file))
+      continue;
+    for (const line of readAllLines(file)) {
+      if (parseStructuredLogLine(line).requestId === requestId) {
+        matches.push(line);
+      }
+    }
+  }
+  return matches;
+}
+function parseLinesOption(value) {
+  const parsed = Number.parseInt(value, 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 50;
+}
+program.command("logs").description("View daemon logs").option("-f, --follow", "Follow log output", false).option("-c, --coco", "Show Cashu wallet-engine (coco) logs instead of daemon logs", false).option("-n, --lines <number>", "Number of lines to show", "50").option("-r, --recent", "List recent request ids with their model", false).option("-i, --request-id <id>", "Only show log lines for a specific request id").action(async (options) => {
   await requireLocalDaemon();
+  if (options.recent && options.requestId) {
+    console.error("Cannot combine --recent (-r) with --request-id (-i).");
+    process.exit(1);
+  }
   const logsDir = options.coco ? COCO_LOGS_DIR : LOGS_DIR2;
   const todayFile = getLogFileForDate2(logsDir);
   const yesterday = new Date;
@@ -28633,10 +28773,32 @@ program.command("logs").description("View daemon logs").option("-f, --follow", "
     console.log(`Logs directory: ${logsDir}`);
     process.exit(1);
   }
-  const lines = parseInt(options.lines, 10);
-  const logFiles = [yesterdayFile, todayFile].filter((file, index, files) => {
-    return existsSync14(file) && files.indexOf(file) === index;
-  });
+  const lines = parseLinesOption(options.lines);
+  const logFiles = [yesterdayFile, todayFile].filter((file, index, files) => existsSync14(file) && files.indexOf(file) === index);
+  if (options.recent) {
+    const requests = collectRecentRequests(logFiles, lines);
+    if (requests.length === 0) {
+      console.log("No requests found in recent logs.");
+      return;
+    }
+    console.log("Recent requests (newest first):");
+    for (const request of requests) {
+      const when = request.timestamp ? `  ${request.timestamp}` : "";
+      console.log(`  ${request.requestId}  ${request.modelId}${when}`);
+    }
+    return;
+  }
+  if (options.requestId) {
+    const matches = filterLinesByRequestId(logFiles, options.requestId);
+    if (matches.length === 0) {
+      console.log(`No log lines found for request '${options.requestId}'.`);
+      return;
+    }
+    for (const line of matches) {
+      console.log(line);
+    }
+    return;
+  }
   if (options.follow) {
     if (existsSync14(todayFile)) {
       await followLogFile(todayFile, lines);

package/package.json

@@ -1,14 +1,21 @@
 {
   "name": "routstrd",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "module": "src/index.ts",
   "type": "module",
   "private": false,
   "bin": {
     "routstrd": "./dist/index.js"
   },
+  "files": [
+    "dist",
+    "src",
+    "README.md",
+    "SECURITY.md"
+  ],
   "scripts": {
     "start": "bun src/index.ts start",
+    "stop": "bun src/index.ts stop",
     "monitor": "bun src/index.ts monitor",
     "lint": "tsc --noEmit",
     "test": "bun test",
@@ -26,7 +33,7 @@
     "@cashu/cashu-ts": "^4.3.0",
     "@cashu/coco-core": "^1.0.1",
     "@cashu/coco-sqlite-bun": "^1.0.1",
-    "@routstr/sdk": "^0.4.1",
+    "@routstr/sdk": "^0.4.2",
     "@scure/bip39": "^2.2.0",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",

package/src/cli.test.ts

@@ -2,7 +2,11 @@ import { afterEach, describe, expect, test } from "bun:test";
 import { mkdtempSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
-import { initializeWallet } from "./cli";
+import {
+  collectRecentRequestsFromLines,
+  initializeWallet,
+  parseStructuredLogLine,
+} from "./cli";
 
 const tempDirs: string[] = [];
 
@@ -22,6 +26,139 @@ afterEach(() => {
   }
 });
 
+describe("parseStructuredLogLine", () => {
+  test("extracts timestamp, level, request id, model, and routing flag", () => {
+    const line =
+      "[2026-08-27T13:00:00.000Z] [INFO] [req:a1b2c3d4] [model:gpt-5] Routing request with path: /v1/chat/completions";
+
+    expect(parseStructuredLogLine(line)).toEqual({
+      timestamp: "2026-08-27T13:00:00.000Z",
+      level: "INFO",
+      requestId: "a1b2c3d4",
+      modelId: "gpt-5",
+      isRouting: true,
+    });
+  });
+
+  test("parses SDK child lines without marking them as routing lines", () => {
+    const line =
+      "[2026-08-27T13:00:01.000Z] [DEBUG] [req:a1b2c3d4] [model:gpt-5] [BalanceManager] token stuff";
+
+    expect(parseStructuredLogLine(line)).toEqual({
+      timestamp: "2026-08-27T13:00:01.000Z",
+      level: "DEBUG",
+      requestId: "a1b2c3d4",
+      modelId: "gpt-5",
+      isRouting: false,
+    });
+  });
+
+  test("handles legacy lines that have a request id but no model tag", () => {
+    const line =
+      "[2026-08-27T13:00:02.000Z] [INFO] [req:deadbeef] Routing request with path: /v1/responses";
+
+    expect(parseStructuredLogLine(line)).toEqual({
+      timestamp: "2026-08-27T13:00:02.000Z",
+      level: "INFO",
+      requestId: "deadbeef",
+      modelId: undefined,
+      isRouting: true,
+    });
+  });
+
+  test("extracts the bare request id from colon-joined legacy child tags", () => {
+    const line =
+      "[2026-08-27T13:00:04.000Z] [INFO] [req:deadbeef:RoutstrClient] [RoutstrClient] generic request pricing input {\"modelId\":\"deepseek-v4-flash-0731\"}";
+
+    const parsed = parseStructuredLogLine(line);
+    expect(parsed.requestId).toBe("deadbeef");
+    expect(parsed.modelId).toBe("deepseek-v4-flash-0731");
+    expect(parsed.isRouting).toBe(false);
+  });
+
+  test("falls back to the JSON modelId when no model tag is present", () => {
+    const line =
+      "[2026-08-27T13:00:05.000Z] [INFO] [req:deadbeef:RoutstrClient] [RoutstrClient] generic request pricing input {\"modelId\":\"deepseek-v4-pro-0813\",\"messageCount\":121}";
+
+    expect(parseStructuredLogLine(line).modelId).toBe("deepseek-v4-pro-0813");
+  });
+
+  test("returns an empty record for plain non-request lines", () => {
+    const line = "[2026-08-27T13:00:03.000Z] [WARN] Some startup message";
+
+    expect(parseStructuredLogLine(line)).toEqual({
+      timestamp: "2026-08-27T13:00:03.000Z",
+      level: "WARN",
+      requestId: undefined,
+      modelId: undefined,
+      isRouting: false,
+    });
+  });
+});
+
+describe("collectRecentRequestsFromLines", () => {
+  const lines = [
+    "[2026-08-27T13:00:00.000Z] [INFO] [req:11111111] [model:gpt-5] Routing request with path: /a",
+    "[2026-08-27T13:00:01.000Z] [DEBUG] [req:11111111] [model:gpt-5] [BalanceManager] token",
+    "[2026-08-27T13:00:02.000Z] [INFO] [req:22222222] [model:claude-sonnet-4.5] Routing request with path: /b",
+    "[2026-08-27T13:00:03.000Z] [DEBUG] [req:22222222] [model:claude-sonnet-4.5] [ModelManager] refresh",
+  ];
+
+  test("returns one record per request, newest first", () => {
+    expect(collectRecentRequestsFromLines(lines, 10)).toEqual([
+      {
+        requestId: "22222222",
+        modelId: "claude-sonnet-4.5",
+        timestamp: "2026-08-27T13:00:02.000Z",
+      },
+      {
+        requestId: "11111111",
+        modelId: "gpt-5",
+        timestamp: "2026-08-27T13:00:00.000Z",
+      },
+    ]);
+  });
+
+  test("respects the limit", () => {
+    expect(collectRecentRequestsFromLines(lines, 1)).toEqual([
+      {
+        requestId: "22222222",
+        modelId: "claude-sonnet-4.5",
+        timestamp: "2026-08-27T13:00:02.000Z",
+      },
+    ]);
+  });
+
+  test("defaults the model to unknown for legacy routing lines", () => {
+    const legacy = [
+      "[2026-08-27T13:00:00.000Z] [INFO] [req:deadbeef] Routing request with path: /a",
+    ];
+
+    expect(collectRecentRequestsFromLines(legacy, 10)).toEqual([
+      {
+        requestId: "deadbeef",
+        modelId: "unknown",
+        timestamp: "2026-08-27T13:00:00.000Z",
+      },
+    ]);
+  });
+
+  test("enriches the model from a sibling pricing line in legacy logs", () => {
+    const legacy = [
+      "[2026-08-27T13:00:00.000Z] [INFO] [req:deadbeef] Routing request with path: /a",
+      "[2026-08-27T13:00:01.000Z] [INFO] [req:deadbeef:RoutstrClient] [RoutstrClient] generic request pricing input {\"modelId\":\"deepseek-v4-flash-0731\"}",
+    ];
+
+    expect(collectRecentRequestsFromLines(legacy, 10)).toEqual([
+      {
+        requestId: "deadbeef",
+        modelId: "deepseek-v4-flash-0731",
+        timestamp: "2026-08-27T13:00:00.000Z",
+      },
+    ]);
+  });
+});
+
 describe("initializeWallet", () => {
   test("creates the wallet directory and config with restrictive permissions", () => {
     const walletDir = join(makeTempDir(), "wallet");