run402 1.35.0 → 1.35.1

package/lib/init.mjs

@@ -12,6 +12,8 @@ const HELP = `run402 init — Set up allowance, funding, and check tier status
 Usage:
   run402 init          Set up with x402 (Base Sepolia) — default
   run402 init mpp      Set up with MPP (Tempo Moderato)
+  run402 init --json   Same as init, but emit a JSON summary on stdout
+                       (human lines go to stderr — for agent automation)
 
 Steps (idempotent — safe to re-run):
   1. Creates config directory (~/.config/run402)
@@ -25,12 +27,28 @@ Run this once to get started, or again to check your setup.
 `;
 
 function short(addr) { return addr.slice(0, 6) + "..." + addr.slice(-4); }
-function line(label, value) { console.log(`  ${label.padEnd(10)} ${value}`); }
 
 export async function run(args = []) {
   if (args.includes("--help") || args.includes("-h")) { console.log(HELP); process.exit(0); }
+  const jsonMode = args.includes("--json");
   const isMpp = args[0] === "mpp";
-  console.log();
+
+  // In --json mode, human-readable lines go to stderr so stdout stays clean for
+  // agents. We also collect structured data for the final JSON emit.
+  const write = jsonMode ? (s) => console.error(s) : (s) => console.log(s);
+  const line = (label, value) => write(`  ${label.padEnd(10)} ${value}`);
+  const summary = {
+    config_dir: CONFIG_DIR,
+    allowance: null,
+    rail: null,
+    network: null,
+    balance: null,
+    tier: null,
+    projects_saved: 0,
+    next_step: null,
+  };
+
+  write("");
 
   // 1. Config directory
   mkdirSync(CONFIG_DIR, { recursive: true });
@@ -58,6 +76,10 @@ export async function run(args = []) {
     line("Allowance", short(allowance.address));
   }
 
+  summary.allowance = { address: allowance.address, funded: allowance.funded || false };
+  summary.network = isMpp ? "tempo-moderato" : "base-sepolia";
+  summary.rail = isMpp ? "mpp" : "x402";
+
   line("Network", isMpp ? "Tempo Moderato (testnet)" : "Base Sepolia (testnet)");
   line("Rail", isMpp ? "mpp" : "x402");
 
@@ -110,6 +132,7 @@ export async function run(args = []) {
     } else {
       line("Balance", `${(balance / 1e6).toFixed(2)} pathUSD`);
     }
+    summary.balance = { symbol: "pathUSD", usd_micros: balance };
   } else {
     // Base Sepolia: read USDC balance (existing behavior)
     const { createPublicClient, http } = await import("viem");
@@ -152,6 +175,7 @@ export async function run(args = []) {
     } else {
       line("Balance", `${(balance / 1e6).toFixed(2)} USDC`);
     }
+    summary.balance = { symbol: "USDC", usd_micros: balance };
   }
 
   // Show note if switching rails
@@ -176,19 +200,32 @@ export async function run(args = []) {
   if (tierInfo && tierInfo.tier && tierInfo.active) {
     const expiry = tierInfo.lease_expires_at ? tierInfo.lease_expires_at.split("T")[0] : "unknown";
     line("Tier", `${tierInfo.tier} (expires ${expiry})`);
+    summary.tier = { name: tierInfo.tier, expires: tierInfo.lease_expires_at || null };
   } else {
     line("Tier", "(none)");
+    summary.tier = null;
   }
 
-  // 5. Projects
-  line("Projects", `${Object.keys(store.projects).length} active`);
+  // 5. Projects — count locally saved project entries. Note: "saved" (not
+  // "active") — these are all projects in the keystore, regardless of whether
+  // the server considers them active.
+  summary.projects_saved = Object.keys(store.projects).length;
+  line("Projects", `${summary.projects_saved} saved`);
 
   // 6. Next step
-  console.log();
+  write("");
+  const nextStep = (!tierInfo || !tierInfo.tier || !tierInfo.active)
+    ? "run402 tier set prototype"
+    : "run402 deploy --manifest app.json";
   if (!tierInfo || !tierInfo.tier || !tierInfo.active) {
-    console.log("  Next: run402 tier set prototype");
+    write("  Next: run402 tier set prototype");
   } else {
-    console.log("  Ready to deploy. Run: run402 deploy --manifest app.json");
+    write("  Ready to deploy. Run: run402 deploy --manifest app.json");
+  }
+  write("");
+  summary.next_step = nextStep;
+
+  if (jsonMode) {
+    console.log(JSON.stringify(summary, null, 2));
   }
-  console.log();
 }

package/lib/projects.mjs

@@ -141,13 +141,17 @@ async function sqlCmd(projectId, args = []) {
   const headers = { "Authorization": `Bearer ${p.service_key}`, "Content-Type": useParams ? "application/json" : "text/plain" };
   const body = useParams ? JSON.stringify({ sql, params }) : sql;
   const res = await fetch(`${API}/projects/v1/admin/${projectId}/sql`, { method: "POST", headers, body });
-  console.log(JSON.stringify(await res.json(), null, 2));
+  const data = await res.json();
+  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
+  console.log(JSON.stringify(data, null, 2));
 }
 
 async function rest(projectId, table, queryParams) {
   const p = findProject(projectId);
   const res = await fetch(`${API}/rest/v1/${table}${queryParams ? '?' + queryParams : ''}`, { headers: { "apikey": p.anon_key } });
-  console.log(JSON.stringify(await res.json(), null, 2));
+  const data = await res.json();
+  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
+  console.log(JSON.stringify(data, null, 2));
 }
 
 async function usage(projectId) {

package/lib/status.mjs

@@ -8,6 +8,7 @@ Usage:
 
 Displays:
   - Allowance address and funding status
+  - Wallet on-chain USDC/pathUSD balance (wallet_balance_usd_micros)
   - Billing balance (available + held)
   - Tier subscription (name, status, expiry)
   - Projects (from server, with fallback to local keystore)
@@ -16,6 +17,63 @@ Displays:
 Output is JSON. Requires an existing allowance (run 'run402 init' first).
 `;
 
+// USDC / pathUSD constants (match allowance.mjs)
+const USDC_ABI = [{ name: "balanceOf", type: "function", stateMutability: "view", inputs: [{ name: "account", type: "address" }], outputs: [{ name: "", type: "uint256" }] }];
+const USDC_MAINNET = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
+const USDC_SEPOLIA = "0x036CbD53842c5426634e7929541eC2318f3dCF7e";
+const PATH_USD = "0x20c0000000000000000000000000000000000000";
+const TEMPO_RPC = "https://rpc.moderato.tempo.xyz/";
+
+/**
+ * Read the on-chain wallet balance in USD micros for the current rail.
+ * For x402: read Base mainnet + Base Sepolia USDC and sum funded networks.
+ * For mpp:  read pathUSD on Tempo Moderato.
+ * Returns null if every read fails (e.g. offline or RPC down).
+ */
+async function readWalletBalanceUsdMicros(rail, address) {
+  try {
+    const { createPublicClient, http, defineChain } = await import("viem");
+    if (rail === "mpp") {
+      const tempoModerato = defineChain({
+        id: 42431,
+        name: "Tempo Moderato",
+        nativeCurrency: { name: "pathUSD", symbol: "pathUSD", decimals: 6 },
+        rpcUrls: { default: { http: [TEMPO_RPC] } },
+      });
+      const client = createPublicClient({ chain: tempoModerato, transport: http() });
+      try {
+        const raw = await client.readContract({ address: PATH_USD, abi: USDC_ABI, functionName: "balanceOf", args: [address] });
+        return Number(raw);
+      } catch { return null; }
+    }
+    // x402 rail — read Base mainnet + Base Sepolia in parallel; sum any that succeed.
+    const { base, baseSepolia } = await import("viem/chains");
+    const mainnetClient = createPublicClient({ chain: base, transport: http() });
+    const sepoliaClient = createPublicClient({ chain: baseSepolia, transport: http() });
+    const [mainnet, sepolia] = await Promise.all([
+      mainnetClient.readContract({ address: USDC_MAINNET, abi: USDC_ABI, functionName: "balanceOf", args: [address] }).then(Number).catch(() => null),
+      sepoliaClient.readContract({ address: USDC_SEPOLIA, abi: USDC_ABI, functionName: "balanceOf", args: [address] }).then(Number).catch(() => null),
+    ]);
+    if (mainnet === null && sepolia === null) return null;
+    return (mainnet || 0) + (sepolia || 0);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Normalize a project entry to the agreed-on shape: always expose `project_id`
+ * (matching `projects list`). The remote /wallets/v1/:wallet/projects endpoint
+ * returns entries keyed as `id`, so we map them here and drop the raw `id`
+ * field to avoid having two aliases for the same identity.
+ */
+function normalizeProject(raw) {
+  if (!raw || typeof raw !== "object") return raw;
+  const projectId = raw.project_id || raw.id;
+  const { id: _dropId, project_id: _dropPid, ...rest } = raw;
+  return { project_id: projectId, ...rest };
+}
+
 export async function run(args = []) {
   if (args.includes("--help") || args.includes("-h")) { console.log(HELP); process.exit(0); }
   const allowance = readAllowance();
@@ -26,14 +84,16 @@ export async function run(args = []) {
 
   const wallet = allowance.address.toLowerCase();
   const authHeaders = getAllowanceAuthHeaders("/tiers/v1/status");
+  const rail = allowance.rail || "x402";
 
-  // Parallel API calls: tier + billing balance + server-side projects
-  const [tierRes, balanceRes, projectsRes] = await Promise.all([
+  // Parallel API calls: tier + billing balance + server-side projects + on-chain wallet balance
+  const [tierRes, balanceRes, projectsRes, walletBalance] = await Promise.all([
     authHeaders
       ? fetch(`${API}/tiers/v1/status`, { headers: { ...authHeaders } }).catch(() => null)
       : null,
     fetch(`${API}/billing/v1/accounts/${wallet}`).catch(() => null),
     fetch(`${API}/wallets/v1/${wallet}/projects`).catch(() => null),
+    readWalletBalanceUsdMicros(rail, allowance.address),
   ]);
 
   const tier = tierRes?.ok ? await tierRes.json() : null;
@@ -44,18 +104,29 @@ export async function run(args = []) {
   const store = loadKeyStore();
   const activeId = getActiveProjectId();
 
+  const projects = remote?.projects
+    ? remote.projects.map(normalizeProject)
+    : Object.keys(store.projects).map(id => ({ project_id: id }));
+
   const result = {
     allowance: {
       address: allowance.address,
       funded: allowance.funded || false,
     },
+    rail,
     tier: tier && tier.tier
       ? { name: tier.tier, status: tier.status, expires: tier.lease_expires_at }
       : null,
-    balance: billing && billing.exists
+    // GH-32: `balance` used to mean the billing-account balance, which
+    // confused people who expected their on-chain wallet balance. Split into
+    // two unambiguous fields:
+    //   - billing: credits held by Run402 (available + held), null if no account
+    //   - wallet_balance_usd_micros: on-chain USDC/pathUSD, null if RPC fails
+    billing: billing && billing.exists
       ? { available_usd_micros: billing.available_usd_micros, held_usd_micros: billing.held_usd_micros }
       : null,
-    projects: remote?.projects || Object.keys(store.projects).map(id => ({ id })),
+    wallet_balance_usd_micros: walletBalance,
+    projects,
     active_project: activeId || null,
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "run402",
-  "version": "1.35.0",
+  "version": "1.35.1",
   "description": "CLI for Run402 — provision Postgres databases, deploy static sites, generate images, and manage wallets via x402 and MPP micropayments.",
   "type": "module",
   "bin": {