npm - run402 - Versions diffs - 1.12.3 → 1.13.1 - Mend

run402 1.12.3 → 1.13.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/cli.mjs CHANGED Viewed

@@ -20,6 +20,7 @@ Usage:
 Commands:
   init        Set up allowance, funding, and check tier status
+  status      Show full account state (allowance, balance, tier, projects)
   allowance   Manage your agent allowance (create, fund, balance, status)
   tier        Manage tier subscription (status, set)
   projects    Manage projects (provision, list, query, inspect, delete)
@@ -65,7 +66,12 @@ if (!cmd || cmd === '--help' || cmd === '-h') {
 switch (cmd) {
   case "init": {
     const { run } = await import("./lib/init.mjs");
-    await run();
+    await run([sub, ...rest].filter(Boolean));
+    break;
+  }
+  case "status": {
+    const { run } = await import("./lib/status.mjs");
+    await run([sub, ...rest].filter(Boolean));
     break;
   }
   case "allowance": {

package/lib/deploy.mjs CHANGED Viewed

@@ -1,7 +1,9 @@
 import { readFileSync } from "fs";
-import { API, allowanceAuthHeaders, saveProject, setActiveProjectId } from "./config.mjs";
+import { dirname, resolve } from "path";
+import { API, allowanceAuthHeaders, findProject } from "./config.mjs";
+import { resolveFilePathsInManifest } from "./manifest.mjs";
-const HELP = `run402 deploy — Deploy a full-stack app or static site on Run402
+const HELP = `run402 deploy — Deploy to an existing project on Run402
 Usage:
   run402 deploy [options]
@@ -9,11 +11,12 @@ Usage:
 Options:
   --manifest <file>    Path to manifest JSON file  (default: read from stdin)
+  --project <id>       Project ID to deploy to     (default: active project)
   --help, -h           Show this help message
 Manifest format (JSON):
   {
-    "name": "my-app",
+    "project_id": "prj_...",
     "migrations": "CREATE TABLE items (id serial PRIMARY KEY, title text NOT NULL, done boolean DEFAULT false)",
     "rls": {
       "template": "public_read_write",
@@ -24,11 +27,21 @@ Manifest format (JSON):
       "name": "my-fn",
       "code": "export default async (req) => new Response('ok')"
     }],
-    "files": [{ "file": "index.html", "data": "<html>...</html>" }],
+    "files": [
+      { "file": "index.html", "data": "<html>...</html>" },
+      { "file": "style.css", "path": "./dist/style.css" }
+    ],
     "subdomain": "my-app"
   }
-  All fields except "name" are optional.
+  project_id is required (provision first with 'run402 provision').
+  All other fields are optional.
+  Files can use either inline "data" or a local "path":
+    { "file": "index.html", "data": "<html>...</html>" }   ← inline content
+    { "file": "style.css",  "path": "./dist/style.css" }   ← read from disk
+  Paths are resolved relative to the manifest file's directory.
+  Binary files (images, fonts, etc.) are auto-detected and base64-encoded.
   RLS templates:
     user_owns_rows   — users see only their rows (requires owner_column per table)
@@ -40,16 +53,18 @@ Manifest format (JSON):
 Examples:
   run402 deploy --manifest app.json
+  run402 deploy --manifest app.json --project prj_123_1
   cat app.json | run402 deploy
 Prerequisites:
   - run402 init                     Set up allowance and funding
   - run402 tier set prototype       Subscribe to a tier
+  - run402 provision                Provision a project first
 Notes:
   - Requires an active tier subscription (run402 tier set <tier>)
-  - Project credentials (project_id, keys, URL) are saved locally after deploy
-  - Use 'run402 projects list' to see all deployed projects
+  - Provision a project first with 'run402 provision', then deploy to it
+  - Use 'run402 projects list' to see all provisioned projects
 `;
 async function readStdin() {
@@ -59,25 +74,32 @@ async function readStdin() {
 }
 export async function run(args) {
-  const opts = { manifest: null };
+  const opts = { manifest: null, project: null };
   for (let i = 0; i < args.length; i++) {
     if (args[i] === "--help" || args[i] === "-h") { console.log(HELP); process.exit(0); }
     if (args[i] === "--manifest" && args[i + 1]) opts.manifest = args[++i];
+    if (args[i] === "--project" && args[i + 1]) opts.project = args[++i];
+  }
+  const raw = opts.manifest ? readFileSync(opts.manifest, "utf-8") : await readStdin();
+  const manifest = JSON.parse(raw);
+  if (opts.manifest) resolveFilePathsInManifest(manifest, dirname(resolve(opts.manifest)));
+  // --project flag overrides manifest's project_id
+  if (opts.project) manifest.project_id = opts.project;
+  // If no project_id in manifest, use active project
+  if (!manifest.project_id) {
+    const { id } = findProject(null);
+    manifest.project_id = id;
   }
-  const manifest = opts.manifest ? JSON.parse(readFileSync(opts.manifest, "utf-8")) : JSON.parse(await readStdin());
+  // Remove legacy 'name' field if present
+  delete manifest.name;
   const authHeaders = allowanceAuthHeaders("/deploy/v1");
   const res = await fetch(`${API}/deploy/v1`, { method: "POST", headers: { "Content-Type": "application/json", ...authHeaders }, body: JSON.stringify(manifest) });
   const result = await res.json();
   if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...result })); process.exit(1); }
-  if (result.project_id) {
-    saveProject(result.project_id, {
-      anon_key: result.anon_key, service_key: result.service_key,
-      site_url: result.site_url || result.subdomain_url,
-      deployed_at: new Date().toISOString(),
-    });
-    setActiveProjectId(result.project_id);
-  }
   console.log(JSON.stringify(result, null, 2));
 }

package/lib/init.mjs CHANGED Viewed

@@ -5,10 +5,27 @@ 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";
+const HELP = `run402 init — Set up allowance, funding, and check tier status
+Usage:
+  run402 init
+Steps (idempotent — safe to re-run):
+  1. Creates config directory (~/.config/run402)
+  2. Creates agent allowance if none exists
+  3. Checks on-chain USDC balance; requests faucet if zero
+  4. Shows current tier subscription status
+  5. Lists local project count
+  6. Suggests next step (tier set or deploy)
+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() {
+export async function run(args = []) {
+  if (args.includes("--help") || args.includes("-h")) { console.log(HELP); process.exit(0); }
   console.log();
   // 1. Config directory

package/lib/manifest.mjs ADDED Viewed

@@ -0,0 +1,45 @@
+import { readFileSync } from "fs";
+import { resolve, extname } from "path";
+const TEXT_EXTS = new Set([
+  ".html", ".htm", ".css", ".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx",
+  ".json", ".svg", ".xml", ".txt", ".md", ".yaml", ".yml", ".toml", ".csv",
+]);
+/**
+ * Resolve `path` fields in a manifest's files array.
+ *
+ * For each entry that has `path` instead of `data`, reads the file from disk
+ * and sets `data` + `encoding`. Paths are resolved relative to `baseDir`.
+ *
+ * Entries with `data` already set are left untouched.
+ *
+ * @param {object} manifest  Parsed manifest JSON (mutated in place)
+ * @param {string} baseDir   Directory to resolve relative paths from
+ * @returns {object}         The same manifest object
+ */
+export function resolveFilePathsInManifest(manifest, baseDir) {
+  if (!Array.isArray(manifest.files)) return manifest;
+  for (const entry of manifest.files) {
+    if (!entry.path || entry.data !== undefined) continue;
+    const abs = resolve(baseDir, entry.path);
+    const ext = extname(abs).toLowerCase();
+    const isText = TEXT_EXTS.has(ext);
+    if (isText) {
+      entry.data = readFileSync(abs, "utf-8");
+    } else {
+      entry.data = readFileSync(abs).toString("base64");
+      entry.encoding = "base64";
+    }
+    // If no explicit file (deploy target name), use the path value
+    if (!entry.file) entry.file = entry.path;
+    delete entry.path;
+  }
+  return manifest;
+}

package/lib/manifest.test.mjs ADDED Viewed

@@ -0,0 +1,90 @@
+import { describe, it, before, after } from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, writeFileSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { resolveFilePathsInManifest } from "./manifest.mjs";
+let tempDir;
+before(() => {
+  tempDir = mkdtempSync(join(tmpdir(), "manifest-test-"));
+  // Create test files
+  writeFileSync(join(tempDir, "index.html"), "<!DOCTYPE html><html><body>Hello</body></html>");
+  writeFileSync(join(tempDir, "style.css"), "body { margin: 0; }");
+  writeFileSync(join(tempDir, "logo.png"), Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])); // PNG header
+});
+after(() => {
+  rmSync(tempDir, { recursive: true, force: true });
+});
+describe("resolveFilePathsInManifest", () => {
+  it("resolves path to inline data for text files", () => {
+    const manifest = {
+      files: [{ file: "index.html", path: "index.html" }],
+    };
+    resolveFilePathsInManifest(manifest, tempDir);
+    assert.equal(manifest.files[0].data, "<!DOCTYPE html><html><body>Hello</body></html>");
+    assert.equal(manifest.files[0].path, undefined, "path field should be removed");
+    assert.equal(manifest.files[0].encoding, undefined, "text files should not set encoding");
+  });
+  it("auto-detects binary files and base64-encodes them", () => {
+    const manifest = {
+      files: [{ file: "logo.png", path: "logo.png" }],
+    };
+    resolveFilePathsInManifest(manifest, tempDir);
+    assert.equal(manifest.files[0].encoding, "base64");
+    // Verify it's valid base64 that decodes to our PNG header
+    const buf = Buffer.from(manifest.files[0].data, "base64");
+    assert.equal(buf[0], 0x89);
+    assert.equal(buf[1], 0x50); // 'P'
+  });
+  it("leaves entries with existing data untouched", () => {
+    const manifest = {
+      files: [{ file: "index.html", data: "<h1>inline</h1>" }],
+    };
+    resolveFilePathsInManifest(manifest, tempDir);
+    assert.equal(manifest.files[0].data, "<h1>inline</h1>");
+  });
+  it("mixes path and data entries", () => {
+    const manifest = {
+      files: [
+        { file: "index.html", data: "<h1>inline</h1>" },
+        { file: "style.css", path: "style.css" },
+      ],
+    };
+    resolveFilePathsInManifest(manifest, tempDir);
+    assert.equal(manifest.files[0].data, "<h1>inline</h1>");
+    assert.equal(manifest.files[1].data, "body { margin: 0; }");
+    assert.equal(manifest.files[1].path, undefined);
+  });
+  it("uses path as file name when file is omitted", () => {
+    const manifest = {
+      files: [{ path: "style.css" }],
+    };
+    resolveFilePathsInManifest(manifest, tempDir);
+    assert.equal(manifest.files[0].file, "style.css");
+    assert.equal(manifest.files[0].data, "body { margin: 0; }");
+  });
+  it("handles manifest with no files array", () => {
+    const manifest = { migrations: "CREATE TABLE t (id int)" };
+    resolveFilePathsInManifest(manifest, tempDir);
+    assert.equal(manifest.files, undefined, "should not add a files array");
+  });
+  it("throws on missing file", () => {
+    const manifest = {
+      files: [{ file: "missing.html", path: "does-not-exist.html" }],
+    };
+    assert.throws(
+      () => resolveFilePathsInManifest(manifest, tempDir),
+      /ENOENT/,
+    );
+  });
+});

package/lib/projects.mjs CHANGED Viewed

@@ -16,7 +16,8 @@ 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
-  delete <id>                             Delete a project and remove it from local state
+  delete <id>                             Delete a project and remove it from local state${process.env.RUN402_ADMIN ? `
+  pin   <id>                              [admin] Pin a project (prevents expiry/GC)` : ""}
 Examples:
   run402 projects quote
@@ -142,6 +143,25 @@ async function use(projectId) {
   console.log(JSON.stringify({ status: "ok", active_project_id: projectId }));
 }
+async function pin(projectId) {
+  if (!projectId) { console.error(JSON.stringify({ status: "error", message: "Usage: run402 projects pin <project_id>" })); process.exit(1); }
+  const authHeaders = allowanceAuthHeaders(`/projects/v1/admin/${projectId}/pin`);
+  const res = await fetch(`${API}/projects/v1/admin/${projectId}/pin`, {
+    method: "POST",
+    headers: { ...authHeaders },
+  });
+  const data = await res.json();
+  if (!res.ok) {
+    if (res.status === 403 && data.admin_required) {
+      console.error(JSON.stringify({ status: "error", message: "This command requires admin access." }));
+    } else {
+      console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
+    }
+    process.exit(1);
+  }
+  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}` } });
@@ -171,6 +191,7 @@ export async function run(sub, args) {
     case "schema":    await schema(args[0]); break;
     case "rls":       await rls(args[0], args[1], args[2]); break;
     case "delete":    await deleteProject(args[0]); break;
+    case "pin":       await pin(args[0]); break;
     default:
       console.error(`Unknown subcommand: ${sub}\n`);
       console.log(HELP);

package/lib/sites.mjs CHANGED Viewed

@@ -1,5 +1,7 @@
 import { readFileSync } from "fs";
+import { dirname, resolve } from "path";
 import { API, allowanceAuthHeaders, resolveProjectId, updateProject } from "./config.mjs";
+import { resolveFilePathsInManifest } from "./manifest.mjs";
 const HELP = `run402 sites — Deploy and manage static sites
@@ -22,10 +24,16 @@ Manifest format (JSON):
   {
     "files": [
       { "file": "index.html", "data": "<html>...</html>" },
-      { "file": "style.css", "data": "body { margin: 0; }" }
+      { "file": "style.css", "path": "./dist/style.css" }
     ]
   }
+  Files can use either inline "data" or a local "path":
+    { "file": "index.html", "data": "<html>...</html>" }   ← inline content
+    { "file": "style.css",  "path": "./dist/style.css" }   ← read from disk
+  Paths are resolved relative to the manifest file's directory.
+  Binary files (images, fonts, etc.) are auto-detected and base64-encoded.
 Examples:
   run402 sites deploy --manifest site.json
   run402 sites status dpl_abc123
@@ -51,7 +59,9 @@ async function deploy(args) {
     if (args[i] === "--target" && args[i + 1]) opts.target = args[++i];
   }
   const projectId = resolveProjectId(opts.project);
-  const manifest = opts.manifest ? JSON.parse(readFileSync(opts.manifest, "utf-8")) : JSON.parse(await readStdin());
+  const raw = opts.manifest ? readFileSync(opts.manifest, "utf-8") : await readStdin();
+  const manifest = JSON.parse(raw);
+  if (opts.manifest) resolveFilePathsInManifest(manifest, dirname(resolve(opts.manifest)));
   const body = { files: manifest.files, project: projectId };
   if (opts.target) body.target = opts.target;

package/lib/status.mjs ADDED Viewed

@@ -0,0 +1,63 @@
+import { readAllowance, loadKeyStore, getActiveProjectId, API } from "./config.mjs";
+import { getAllowanceAuthHeaders } from "../core-dist/allowance-auth.js";
+const HELP = `run402 status — Show full account state in one shot
+Usage:
+  run402 status
+Displays:
+  - Allowance address and funding status
+  - Billing balance (available + held)
+  - Tier subscription (name, status, expiry)
+  - Projects (from server, with fallback to local keystore)
+  - Active project ID
+Output is JSON. Requires an existing allowance (run 'run402 init' first).
+`;
+export async function run(args = []) {
+  if (args.includes("--help") || args.includes("-h")) { console.log(HELP); process.exit(0); }
+  const allowance = readAllowance();
+  if (!allowance) {
+    console.log(JSON.stringify({ status: "no_allowance", message: "No agent allowance found. Run: run402 init" }));
+    return;
+  }
+  const wallet = allowance.address.toLowerCase();
+  const authHeaders = getAllowanceAuthHeaders("/tiers/v1/status");
+  // Parallel API calls: tier + billing balance + server-side projects
+  const [tierRes, balanceRes, projectsRes] = 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),
+  ]);
+  const tier = tierRes?.ok ? await tierRes.json() : null;
+  const billing = balanceRes?.ok ? await balanceRes.json() : null;
+  const remote = projectsRes?.ok ? await projectsRes.json() : null;
+  // Local keystore
+  const store = loadKeyStore();
+  const activeId = getActiveProjectId();
+  const result = {
+    allowance: {
+      address: allowance.address,
+      funded: allowance.funded || false,
+    },
+    tier: tier && tier.tier
+      ? { name: tier.tier, status: tier.status, expires: tier.lease_expires_at }
+      : null,
+    balance: 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 })),
+    active_project: activeId || null,
+  };
+  console.log(JSON.stringify(result, null, 2));
+}

package/package.json CHANGED Viewed

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