run402 2.23.0 → 2.24.0

package/lib/cache.mjs

@@ -56,15 +56,18 @@ Subcommands:
   invalidate --all --host <h>          Invalidate all rows for a host
 
 Common flags:
-  --json                       Machine-readable output
   --locale <code>              (inspect only) Inspect a specific locale's row
                                (default: project's default locale)
   --release-id <id>            (inspect only) Inspect a specific release id
                                (default: project's active release)
 
+Output:
+  Stdout is JSON. inspect emits the cache row object; invalidate emits
+  { deleted, host?, path?, generation }.
+
 Examples:
   run402 cache inspect https://eagles.kychon.com/the-guys
-  run402 cache inspect https://eagles.kychon.com/the-guys --locale es --json
+  run402 cache inspect https://eagles.kychon.com/the-guys --locale es
   run402 cache invalidate https://eagles.kychon.com/the-guys
   run402 cache invalidate --prefix /blog/ --host eagles.kychon.com
   run402 cache invalidate --all --host eagles.kychon.com
@@ -105,7 +108,7 @@ export async function run(sub, args) {
 
 async function inspect(args) {
   const parsed = normalizeArgv(args);
-  assertKnownFlags(parsed, ["--json", "--locale", "--release-id", "--help", "-h"]);
+  assertKnownFlags(parsed, ["--locale", "--release-id", "--help", "-h"]);
   if (hasFlag(parsed, ["--help", "-h"])) {
     console.log(HELP);
     return;
@@ -130,19 +133,11 @@ async function inspect(args) {
 
   const locale = flagValue(parsed, "--locale");
   const releaseId = flagValue(parsed, "--release-id");
-  const json = hasFlag(parsed, ["--json"]);
 
   try {
     const sdk = getSdk();
-    // SDK shape — the gateway's cache inspect endpoint isn't yet wired
-    // (separate task). For now the CLI POSTs to the same /cache/v1/
-    // namespace with kind=inspect.
     const result = await sdk.cache.inspect(url, { locale, releaseId });
-    if (json) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      console.log(formatInspectResult(result));
-    }
+    console.log(JSON.stringify(result, null, 2));
   } catch (err) {
     reportSdkError(err);
   }
@@ -150,14 +145,13 @@ async function inspect(args) {
 
 async function invalidate(args) {
   const parsed = normalizeArgv(args);
-  assertKnownFlags(parsed, ["--json", "--prefix", "--host", "--all", "--help", "-h"]);
+  assertKnownFlags(parsed, ["--prefix", "--host", "--all", "--help", "-h"]);
   if (hasFlag(parsed, ["--help", "-h"])) {
     console.log(HELP);
     return;
   }
 
   const positionals = positionalArgs(parsed);
-  const json = hasFlag(parsed, ["--json"]);
   const prefix = flagValue(parsed, "--prefix");
   const host = flagValue(parsed, "--host");
   const all = hasFlag(parsed, ["--all"]);
@@ -175,7 +169,7 @@ async function invalidate(args) {
     }
     try {
       const result = await sdk.cache.invalidateAll({ host });
-      emit(result, json);
+      console.log(JSON.stringify(result, null, 2));
     } catch (err) {
       reportSdkError(err);
     }
@@ -198,7 +192,7 @@ async function invalidate(args) {
     }
     try {
       const result = await sdk.cache.invalidatePrefix({ host, prefix });
-      emit(result, json);
+      console.log(JSON.stringify(result, null, 2));
     } catch (err) {
       reportSdkError(err);
     }
@@ -227,38 +221,8 @@ async function invalidate(args) {
   }
   try {
     const result = await sdk.cache.invalidate(url);
-    emit(result, json);
+    console.log(JSON.stringify(result, null, 2));
   } catch (err) {
     reportSdkError(err);
   }
 }
-
-function emit(result, json) {
-  if (json) {
-    console.log(JSON.stringify(result, null, 2));
-  } else {
-    const parts = [`Invalidated ${result.deleted} cache row(s)`];
-    if (result.host) parts.push(`on ${result.host}`);
-    if (result.path) parts.push(`for ${result.path}`);
-    parts.push(`(generation: ${result.generation})`);
-    console.log(parts.join(" "));
-  }
-}
-
-function formatInspectResult(result) {
-  if (result.status === "MISS") {
-    return `MISS — no cache row for ${result.url || "this URL"}.`;
-  }
-  const lines = [
-    `${result.status} — ${result.host}${result.path}`,
-    `  locale:           ${result.locale}`,
-    `  releaseId:        ${result.releaseId}`,
-    `  cachedAt:         ${result.cachedAt}`,
-    `  expiresAt:        ${result.expiresAt}`,
-    `  contentSha256:    ${result.contentSha256}`,
-  ];
-  if (result.writtenUnderGeneration) {
-    lines.push(`  writtenUnderGen:  ${result.writtenUnderGeneration}`);
-  }
-  return lines.join("\n");
-}

package/lib/doctor.mjs

@@ -23,10 +23,12 @@ import {
 const HELP = `run402 doctor — Health and config diagnostics
 
 Usage:
-  run402 doctor [--json] [--verbose]
+  run402 doctor [--verbose] [--no-scan] [--scan-dir <D>]
+
+Output:
+  Stdout is a JSON report { ok, checks: [{ name, status, value?, hint?, message? }] }.
 
 Options:
-  --json         Emit a structured JSON report on stdout
   --verbose      Include extra detail (timing, error messages)
   --no-scan      Skip the source-tree scan (config / health checks only)
   --scan-dir D   Scan a custom directory instead of \`<cwd>/src\`
@@ -54,7 +56,6 @@ export async function run(sub, args = []) {
     console.log(HELP);
     return;
   }
-  const json = all.includes("--json");
   const verbose = all.includes("--verbose");
   const skipScan = all.includes("--no-scan");
   const scanDirArgIdx = all.indexOf("--scan-dir");
@@ -280,38 +281,6 @@ export async function run(sub, args = []) {
   // 'empty' fail.
   const allOk = checks.every((c) => c.status === "ok" || c.status === "warning" || c.status === "skipped");
 
-  if (json) {
-    console.log(JSON.stringify({ ok: allOk, checks }, null, 2));
-  } else {
-    console.log(`Run402 doctor — ${allOk ? "all checks passed" : "issues found"}`);
-    console.log("");
-    for (const c of checks) {
-      const icon =
-        c.status === "ok" ? "✓"
-        : c.status === "warning" ? "⚠"
-        : c.status === "skipped" ? "·"
-        : c.status === "missing" || c.status === "empty" ? "⚠"
-        : "✗";
-      const status = c.status === "ok" ? "ok" : c.status;
-      console.log(`  ${icon} ${c.name.padEnd(16)} ${status}`);
-      if (c.hint) console.log(`     → ${c.hint}`);
-      if (c.message) console.log(`     ${c.message}`);
-      if (c.value && c.value.gaps && Array.isArray(c.value.gaps)) {
-        for (const gap of c.value.gaps) console.log(`     • ${gap}`);
-      }
-      // Source-scan details — print every finding with file:line + canonical fix-it.
-      if (c.name === "source_scan" && c.value && Array.isArray(c.value.details)) {
-        for (const f of c.value.details) {
-          const sev = f.severity === "error" ? "✗" : "⚠";
-          const location = f.line ? `${f.file}:${f.line}` : f.file;
-          console.log(`     ${sev} ${f.code} ${location}`);
-          console.log(`         ${f.message}`);
-          if (f.canonical_name) console.log(`         fix: ${f.canonical_name}`);
-          if (f.docs) console.log(`         docs: ${f.docs}`);
-        }
-      }
-    }
-  }
-
+  console.log(JSON.stringify({ ok: allOk, checks }, null, 2));
   process.exit(allOk ? 0 : 1);
 }

package/lib/init-astro.mjs

@@ -21,14 +21,19 @@ import { fail } from "./sdk-errors.mjs";
 const HELP = `run402 init astro — Scaffold a deployable Astro project
 
 Usage:
-  run402 init astro [<dir>] [--force] [--json]
+  run402 init astro [<dir>] [--force]
 
 Arguments:
   <dir>        Target directory (default: current directory)
 
 Options:
   --force      Overwrite a non-empty directory
-  --json       Emit a structured JSON summary on stdout
+
+Output:
+  Stdout is a JSON summary { dir, files_created, created, next_steps }.
+  Progress lines ("Scaffolded ...", "Files created:", "Next steps:") go to
+  stderr so a human re-running interactively sees what's happening while
+  a script piping stdout to jq stays clean.
 
 The scaffolded project includes:
   - package.json (with 'dev' / 'deploy' scripts)
@@ -53,7 +58,6 @@ export async function runInitAstro(args = []) {
     return;
   }
   const force = args.includes("--force");
-  const json = args.includes("--json");
   const positionals = args.filter((a) => !a.startsWith("--"));
   const targetDir = resolve(positionals[0] ?? ".");
 
@@ -155,7 +159,7 @@ import Layout from "../layouts/Layout.astro";
 // SSR time. The first request renders + caches; subsequent requests
 // HIT the cache. When an admin edits the row, call cache.invalidate()
 // from your save handler for sub-second freshness.
-import { db, getUser, cache } from "@run402/functions";
+import { db } from "@run402/functions";
 import Layout from "../layouts/Layout.astro";
 
 const { slug } = Astro.params;
@@ -335,32 +339,31 @@ For error-code reference: https://run402.com/errors/#R402_AUTH_REQUIRED
     writeFileSync(fullPath, file.content, "utf-8");
   }
 
-  if (json) {
-    console.log(
-      JSON.stringify(
-        {
-          dir: targetDir,
-          files_created: files.map((f) => f.path),
-          created: true,
-          next_steps: [
-            `cd ${positionals[0] ?? "."}`,
-            "npm install",
-            "run402 deploy",
-          ],
-        },
-        null,
-        2,
-      ),
-    );
-  } else {
-    console.log(`Scaffolded Astro project at ${targetDir}`);
-    console.log("");
-    console.log("Files created:");
-    for (const f of files) console.log(`  - ${f.path}`);
-    console.log("");
-    console.log("Next steps:");
-    if (positionals[0]) console.log(`  cd ${positionals[0]}`);
-    console.log("  npm install");
-    console.log("  run402 deploy");
-  }
+  // Human-readable progress goes to stderr; stdout stays JSON-clean.
+  console.error(`Scaffolded Astro project at ${targetDir}`);
+  console.error("");
+  console.error("Files created:");
+  for (const f of files) console.error(`  - ${f.path}`);
+  console.error("");
+  console.error("Next steps:");
+  if (positionals[0]) console.error(`  cd ${positionals[0]}`);
+  console.error("  npm install");
+  console.error("  run402 deploy");
+
+  console.log(
+    JSON.stringify(
+      {
+        dir: targetDir,
+        files_created: files.map((f) => f.path),
+        created: true,
+        next_steps: [
+          `cd ${positionals[0] ?? "."}`,
+          "npm install",
+          "run402 deploy",
+        ],
+      },
+      null,
+      2,
+    ),
+  );
 }

package/lib/init.mjs

@@ -18,14 +18,17 @@ Usage:
                              Required when an allowance already exists on
                              the other rail; protects scripted re-runs from
                              silently flipping billing networks.
-  run402 init --json         Same as init, but emit a JSON summary on stdout
-                             (human lines go to stderr — for agent automation)
 
 Options:
   --switch-rail   Confirm switching the persisted payment rail. Re-running
                   init with the SAME rail as the existing allowance is always
                   idempotent and does not need this flag.
-  --json          Emit a structured JSON summary on stdout.
+
+Output:
+  Stdout is a JSON summary { config_dir, allowance, rail, network, balance,
+  tier, projects_saved, next_step }. Progress lines (Config / Allowance /
+  Balance / Tier / Next) go to stderr so a human re-running interactively
+  sees what's happening while a script piping stdout to jq stays clean.
 
 Steps (idempotent when re-run with the same rail; pass --switch-rail to change rails):
   1. Creates config directory (~/.config/run402)
@@ -61,7 +64,6 @@ 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";
   const requestedRail = isMpp ? "mpp" : "x402";
   const switchRailConfirmed = args.includes("--switch-rail");
@@ -75,9 +77,9 @@ export async function run(args = []) {
     });
   }
 
-  // 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);
+  // Human-readable progress lines go to stderr so stdout stays JSON-clean for
+  // agents. Final structured summary emits to stdout at the end.
+  const write = (s) => console.error(s);
   const line = (label, value) => write(`  ${label.padEnd(10)} ${value}`);
   const summary = {
     config_dir: CONFIG_DIR,
@@ -265,7 +267,5 @@ export async function run(args = []) {
   write("");
   summary.next_step = nextStep;
 
-  if (jsonMode) {
-    console.log(JSON.stringify(summary, null, 2));
-  }
+  console.log(JSON.stringify(summary, null, 2));
 }

package/lib/logs.mjs

@@ -21,7 +21,7 @@ import { reportSdkError, fail } from "./sdk-errors.mjs";
 const HELP = `run402 logs — Fetch function logs by request id
 
 Usage:
-  run402 logs --request-id <req_id> [--function <name>] [--project <id>] [--json] [--tail <n>]
+  run402 logs --request-id <req_id> [--function <name>] [--project <id>] [--tail <n>]
 
 Required:
   --request-id <req_id>   The req_... id (from x-run402-request-id header)
@@ -30,12 +30,14 @@ Optional:
   --function <name>       Limit to one function (default: scan all functions in the project)
   --project <id>          Project id (default: \$RUN402_PROJECT_ID)
   --tail <n>              Max entries per function (default 100)
-  --json                  Machine-readable output
+
+Output:
+  Stdout is JSON { ok, request_id, project_id, scanned, entries, errors? }.
 
 Examples:
   run402 logs --request-id req_abc123
   run402 logs --request-id req_abc123 --function ssr
-  run402 logs --request-id req_abc123 --project prj_xyz --json
+  run402 logs --request-id req_abc123 --project prj_xyz
 
 Tip: the request id appears in:
   - The 'x-run402-request-id' response header on every SSR response
@@ -50,7 +52,6 @@ export async function run(sub, args = []) {
     return;
   }
 
-  const json = all.includes("--json");
   const requestId = pickFlagValue(all, "--request-id");
   const fnName = pickFlagValue(all, "--function");
   const projectIdArg = pickFlagValue(all, "--project");
@@ -98,18 +99,19 @@ export async function run(sub, args = []) {
       const list = await sdk.functions.list(projectId);
       fnNames = (list?.functions ?? []).map((f) => f.name);
       if (fnNames.length === 0) {
-        if (json) console.log(JSON.stringify({ ok: true, entries: [], scanned: [] }));
-        else console.log("No functions in project " + projectId);
+        console.log(JSON.stringify({ ok: true, request_id: requestId, project_id: projectId, entries: [], scanned: [] }, null, 2));
         return;
       }
     }
 
-    // Query each function in parallel; aggregate entries.
+    // Query each function in parallel; aggregate entries. SDK returns
+    // FunctionLogsResult = { logs: FunctionLogEntry[] }; unwrap to the array
+    // so the aggregated JSON has a flat entries[] field.
     const results = await Promise.allSettled(
       fnNames.map((name) =>
         sdk.functions
           .logs(projectId, name, { requestId, tail })
-          .then((entries) => ({ name, entries: entries ?? [] })),
+          .then((result) => ({ name, entries: result?.logs ?? [] })),
       ),
     );
 
@@ -127,35 +129,28 @@ export async function run(sub, args = []) {
       }
     }
 
-    // Sort by timestamp ascending.
-    allEntries.sort((a, b) => (a.ts ?? 0) - (b.ts ?? 0));
-
-    if (json) {
-      console.log(
-        JSON.stringify(
-          {
-            ok: errors.length === 0,
-            request_id: requestId,
-            project_id: projectId,
-            scanned,
-            entries: allEntries,
-            ...(errors.length > 0 && { errors }),
-          },
-          null,
-          2,
-        ),
-      );
-    } else {
-      if (allEntries.length === 0) {
-        console.log(`No log entries found for ${requestId} across ${scanned.length} function(s).`);
-      } else {
-        for (const e of allEntries) {
-          const t = e.ts ? new Date(e.ts).toISOString() : "";
-          console.log(`[${t}] [${e.function}] ${e.message ?? ""}`);
-        }
-        console.log(`\n${allEntries.length} entries across ${scanned.length} function(s) for ${requestId}.`);
-      }
-    }
+    // Sort by timestamp ascending. FunctionLogEntry.timestamp is an ISO 8601
+    // string; convert to epoch ms for comparison.
+    allEntries.sort((a, b) => {
+      const ta = a.timestamp ? Date.parse(a.timestamp) : 0;
+      const tb = b.timestamp ? Date.parse(b.timestamp) : 0;
+      return ta - tb;
+    });
+
+    console.log(
+      JSON.stringify(
+        {
+          ok: errors.length === 0,
+          request_id: requestId,
+          project_id: projectId,
+          scanned,
+          entries: allEntries,
+          ...(errors.length > 0 && { errors }),
+        },
+        null,
+        2,
+      ),
+    );
   } catch (err) {
     reportSdkError(err);
   }

package/package.json

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