run402 1.6.0 → 1.8.0

package/cli.mjs

@@ -13,8 +13,10 @@ Usage:
   run402 <command> [subcommand] [options]
 
 Commands:
+  init        Set up wallet, funding, and check tier status
   wallet      Manage your x402 wallet (create, fund, balance, status)
-  projects    Manage projects (provision, list, query, inspect, renew, delete)
+  tier        Manage tier subscription (status, set)
+  projects    Manage projects (provision, list, query, inspect, delete)
   deploy      Deploy a full-stack app or static site (Postgres + hosting)
   functions   Manage serverless functions (deploy, invoke, logs, list, delete)
   secrets     Manage project secrets (set, list, delete)
@@ -39,9 +41,9 @@ Examples:
   run402 image generate "a startup mascot, pixel art" --output logo.png
 
 Getting started:
-  1. run402 wallet create    Create a local wallet
-  2. run402 wallet fund      Fund it with test USDC (Base Sepolia faucet)
-  3. run402 deploy ...       Deploy your app — payments handled automatically
+  run402 init               Set up everything in one command
+  run402 tier set prototype  Subscribe to a tier
+  run402 deploy ...          Deploy your app
 `;
 
 if (!cmd || cmd === '--help' || cmd === '-h') {
@@ -50,11 +52,21 @@ if (!cmd || cmd === '--help' || cmd === '-h') {
 }
 
 switch (cmd) {
+  case "init": {
+    const { run } = await import("./lib/init.mjs");
+    await run();
+    break;
+  }
   case "wallet": {
     const { run } = await import("./lib/wallet.mjs");
     await run(sub, rest);
     break;
   }
+  case "tier": {
+    const { run } = await import("./lib/tier.mjs");
+    await run(sub, rest);
+    break;
+  }
   case "projects": {
     const { run } = await import("./lib/projects.mjs");
     await run(sub, rest);

package/lib/init.mjs

@@ -0,0 +1,105 @@
+import { readWallet, saveWallet, loadProjects, CONFIG_DIR, WALLET_FILE, API } from "./config.mjs";
+import { mkdirSync } from "fs";
+
+const USDC_ABI = [{ name: "balanceOf", type: "function", stateMutability: "view", inputs: [{ name: "account", type: "address" }], outputs: [{ name: "", type: "uint256" }] }];
+const USDC_SEPOLIA = "0x036CbD53842c5426634e7929541eC2318f3dCF7e";
+
+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() {
+  console.log();
+
+  // 1. Config directory
+  mkdirSync(CONFIG_DIR, { recursive: true });
+  line("Config", CONFIG_DIR);
+
+  // 2. Wallet
+  let wallet = readWallet();
+  if (!wallet) {
+    const { generatePrivateKey, privateKeyToAccount } = await import("viem/accounts");
+    const privateKey = generatePrivateKey();
+    const account = privateKeyToAccount(privateKey);
+    wallet = { address: account.address, privateKey, created: new Date().toISOString(), funded: false };
+    saveWallet(wallet);
+    line("Wallet", `${short(wallet.address)} (created)`);
+  } else {
+    line("Wallet", short(wallet.address));
+  }
+
+  // 3. Balance — check on-chain, faucet if zero
+  const { createPublicClient, http } = await import("viem");
+  const { baseSepolia } = await import("viem/chains");
+  const client = createPublicClient({ chain: baseSepolia, transport: http() });
+
+  let balance = 0;
+  try {
+    const raw = await client.readContract({ address: USDC_SEPOLIA, abi: USDC_ABI, functionName: "balanceOf", args: [wallet.address] });
+    balance = Number(raw);
+  } catch {}
+
+  if (balance === 0) {
+    line("Balance", "0 USDC — requesting faucet...");
+    const res = await fetch(`${API}/faucet/v1`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ address: wallet.address }),
+    });
+    if (res.ok) {
+      // Poll for up to 30s
+      for (let i = 0; i < 30; i++) {
+        await new Promise(r => setTimeout(r, 1000));
+        try {
+          const raw = await client.readContract({ address: USDC_SEPOLIA, abi: USDC_ABI, functionName: "balanceOf", args: [wallet.address] });
+          balance = Number(raw);
+          if (balance > 0) break;
+        } catch {}
+      }
+      saveWallet({ ...wallet, funded: true, lastFaucet: new Date().toISOString() });
+      if (balance > 0) {
+        line("Balance", `${(balance / 1e6).toFixed(2)} USDC (funded)`);
+      } else {
+        line("Balance", "faucet sent — not yet confirmed on-chain");
+      }
+    } else {
+      const data = await res.json().catch(() => ({}));
+      const msg = data.error || data.message || `HTTP ${res.status}`;
+      line("Balance", `faucet failed: ${msg}`);
+    }
+  } else {
+    line("Balance", `${(balance / 1e6).toFixed(2)} USDC`);
+  }
+
+  // 4. Tier status
+  let tierInfo = null;
+  try {
+    const { privateKeyToAccount } = await import("viem/accounts");
+    const account = privateKeyToAccount(wallet.privateKey);
+    const timestamp = Math.floor(Date.now() / 1000).toString();
+    const signature = await account.signMessage({ message: `run402:${timestamp}` });
+    const res = await fetch(`${API}/tiers/v1/status`, {
+      headers: { "X-Run402-Wallet": account.address, "X-Run402-Signature": signature, "X-Run402-Timestamp": timestamp },
+    });
+    if (res.ok) tierInfo = await res.json();
+  } catch {}
+
+  if (tierInfo && tierInfo.tier && tierInfo.status === "active") {
+    const expiry = tierInfo.lease_expires_at ? tierInfo.lease_expires_at.split("T")[0] : "unknown";
+    line("Tier", `${tierInfo.tier} (expires ${expiry})`);
+  } else {
+    line("Tier", "(none)");
+  }
+
+  // 5. Projects
+  const projects = loadProjects();
+  line("Projects", `${projects.length} active`);
+
+  // 6. Next step
+  console.log();
+  if (!tierInfo || !tierInfo.tier || tierInfo.status !== "active") {
+    console.log("  Next: run402 tier set prototype");
+  } else {
+    console.log("  Ready to deploy. Run: run402 deploy --tier prototype --manifest app.json");
+  }
+  console.log();
+}

package/lib/projects.mjs

@@ -15,7 +15,6 @@ Subcommands:
   usage <id>                              Show compute/storage usage for a project
   schema <id>                             Inspect the database schema
   rls   <id> <template> <tables_json>     Apply Row-Level Security policies
-  renew <id>                              Extend the project lease (pays via x402)
   delete <id>                             Delete a project and remove it from local state
 
 Examples:
@@ -28,13 +27,12 @@ Examples:
   run402 projects usage abc123
   run402 projects schema abc123
   run402 projects rls abc123 public_read '[{"table":"posts"}]'
-  run402 projects renew abc123
   run402 projects delete abc123
 
 Notes:
   - <id> is the project_id shown in 'run402 projects list'
   - 'rest' uses PostgREST query syntax (table name + optional query string)
-  - 'renew' and 'provision' require a funded wallet — payment is automatic via x402
+  - 'provision' requires a funded wallet — payment is automatic via x402
   - RLS templates: user_owns_rows, public_read, public_read_write
 `;
 
@@ -142,19 +140,6 @@ async function schema(projectId) {
   console.log(JSON.stringify(data, null, 2));
 }
 
-async function renew(projectId) {
-  const p = findProject(projectId);
-  const tier = p.tier || "prototype";
-  const fetchPaid = await setupPaidFetch();
-  const res = await fetchPaid(`${API}/tiers/v1/renew/${tier}`, { method: "POST", headers: { "Content-Type": "application/json" } });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  const projects = loadProjects();
-  const idx = projects.findIndex(pr => pr.project_id === projectId);
-  if (idx >= 0 && data.lease_expires_at) { projects[idx].lease_expires_at = data.lease_expires_at; saveProjects(projects); }
-  console.log(JSON.stringify(data, null, 2));
-}
-
 async function deleteProject(projectId) {
   const p = findProject(projectId);
   const res = await fetch(`${API}/projects/v1/${projectId}`, { method: "DELETE", headers: { "Authorization": `Bearer ${p.service_key}` } });
@@ -181,7 +166,6 @@ export async function run(sub, args) {
     case "usage":     await usage(args[0]); break;
     case "schema":    await schema(args[0]); break;
     case "rls":       await rls(args[0], args[1], args[2]); break;
-    case "renew":     await renew(args[0]); break;
     case "delete":    await deleteProject(args[0]); break;
     default:
       console.error(`Unknown subcommand: ${sub}\n`);

package/lib/tier.mjs

@@ -0,0 +1,84 @@
+import { readWallet, WALLET_FILE, API } from "./config.mjs";
+import { existsSync } from "fs";
+
+const HELP = `run402 tier — Manage your Run402 tier subscription
+
+Usage:
+  run402 tier <subcommand> [args...]
+
+Subcommands:
+  status                Show current tier (tier name, status, expiry)
+  set <tier>            Subscribe, renew, or upgrade (pays via x402)
+
+Tiers: prototype ($0.10/7d), hobby ($5/30d), team ($20/30d)
+
+The server auto-detects the action based on your wallet state:
+  - No tier or expired  → subscribe
+  - Same tier, active   → renew (extends from expiry)
+  - Higher tier         → upgrade (prorated refund to allowance)
+  - Lower tier, active  → rejected (wait for expiry)
+
+Examples:
+  run402 tier status
+  run402 tier set prototype
+  run402 tier set hobby
+`;
+
+async function setupPaidFetch() {
+  if (!existsSync(WALLET_FILE)) {
+    console.error(JSON.stringify({ status: "error", message: "No wallet found. Run: run402 wallet create && run402 wallet fund" }));
+    process.exit(1);
+  }
+  const wallet = readWallet();
+  const { privateKeyToAccount } = await import("viem/accounts");
+  const { createPublicClient, http } = await import("viem");
+  const { baseSepolia } = await import("viem/chains");
+  const { x402Client, wrapFetchWithPayment } = await import("@x402/fetch");
+  const { ExactEvmScheme } = await import("@x402/evm/exact/client");
+  const { toClientEvmSigner } = await import("@x402/evm");
+  const account = privateKeyToAccount(wallet.privateKey);
+  const publicClient = createPublicClient({ chain: baseSepolia, transport: http() });
+  const signer = toClientEvmSigner(account, publicClient);
+  const client = new x402Client();
+  client.register("eip155:84532", new ExactEvmScheme(signer));
+  return wrapFetchWithPayment(fetch, client);
+}
+
+async function status() {
+  const w = readWallet();
+  if (!w) { console.log(JSON.stringify({ status: "error", message: "No wallet. Run: run402 wallet create" })); process.exit(1); }
+  const { privateKeyToAccount } = await import("viem/accounts");
+  const account = privateKeyToAccount(w.privateKey);
+  const timestamp = Math.floor(Date.now() / 1000).toString();
+  const signature = await account.signMessage({ message: `run402:${timestamp}` });
+  const res = await fetch(`${API}/tiers/v1/status`, {
+    headers: { "X-Run402-Wallet": account.address, "X-Run402-Signature": signature, "X-Run402-Timestamp": timestamp },
+  });
+  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 set(tierName) {
+  if (!tierName) { console.error(JSON.stringify({ status: "error", message: "Usage: run402 tier set <prototype|hobby|team>" })); process.exit(1); }
+  const fetchPaid = await setupPaidFetch();
+  const res = await fetchPaid(`${API}/tiers/v1/${tierName}`, { method: "POST", headers: { "Content-Type": "application/json" } });
+  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));
+}
+
+export async function run(sub, args) {
+  if (!sub || sub === '--help' || sub === '-h') {
+    console.log(HELP);
+    process.exit(0);
+  }
+  switch (sub) {
+    case "status": await status(); break;
+    case "set":    await set(args[0]); break;
+    default:
+      console.error(`Unknown subcommand: ${sub}\n`);
+      console.log(HELP);
+      process.exit(1);
+  }
+}

package/package.json

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