spfn 0.3.0-beta.1 → 0.3.0-beta.2

package/README.md

@@ -411,8 +411,14 @@ listSignups  GET /_ops/signups
 Add `--json` for the raw JSON Schema. The server still validates every call — `--describe`
 reports what it will accept, and the app's answer decides.
 
-The app URL comes from `--app` or `SPFN_OPS_APP`. The ops token resolves `--token` →
-`SPFN_OPS_TOKEN` → macOS keychain, and its lifecycle is managed with:
+The app URL comes from `--app` or `SPFN_OPS_APP`, and it must be **https** — every one of
+these commands carries a secret, and `token issue` carries an administrator's password.
+`http` is accepted only against `localhost`, `127.0.0.1` and `::1`, where there is no
+network to listen on. A URL with a base path (`https://example.com/api`) is kept whole:
+both the ops calls and the administrator sign-in go through it.
+
+The ops token resolves `--token` → `SPFN_OPS_TOKEN` → macOS keychain, and its lifecycle is
+managed with:
 
 ```bash
 spfn ops token issue --name laptop --scopes 'waitlist:read' --app <url>
@@ -442,6 +448,10 @@ point, which that release added. The CLI does not depend on the package in any f
 loads it from the app at run time, and tells a missing package apart from one too old to
 carry the entry point, so the message names the thing to do.
 
+Because the package is the app's, it is resolved **from the directory the command runs in**.
+Run `spfn ops token` from the app's root; running it elsewhere reports the package as
+missing, and the message names the directory it looked in.
+
 ---
 
 ## Scaffold structure

package/dist/index.js

@@ -922,7 +922,7 @@ var init_deployment_config = __esm({
 
 // src/utils/version.ts
 function getCliVersion() {
-  return "0.3.0-beta.1";
+  return "0.3.0-beta.2";
 }
 function getTagFromVersion(version) {
   const match = version.match(/-([a-z]+)\./i);
@@ -5380,7 +5380,39 @@ async function fetchOpsManifest(appUrl, token) {
   if (manifest?.manifestVersion !== 1 || !Array.isArray(manifest.commands)) {
     throw new Error("The manifest answer has an unknown shape.");
   }
-  return manifest;
+  return { manifestVersion: 1, commands: usableCommands(manifest.commands) };
+}
+var OPS_METHODS = /* @__PURE__ */ new Set(["GET", "POST", "PUT", "PATCH", "DELETE"]);
+var OPS_PATH_PREFIX = "/_ops/";
+function unusableBecause(command) {
+  if (typeof command?.name !== "string" || command.name.length === 0) {
+    return "it has no name";
+  }
+  if (typeof command.method !== "string" || !OPS_METHODS.has(command.method)) {
+    return `its method is ${JSON.stringify(command.method)}`;
+  }
+  if (typeof command.path !== "string" || !command.path.startsWith(OPS_PATH_PREFIX)) {
+    return `its path ${JSON.stringify(command.path)} is outside ${OPS_PATH_PREFIX}`;
+  }
+  if (command.path.split("/").includes("..")) {
+    return `its path ${JSON.stringify(command.path)} climbs out of the ops namespace`;
+  }
+  return null;
+}
+function usableCommands(commands) {
+  const usable = [];
+  for (const command of commands) {
+    const reason = unusableBecause(command);
+    if (reason !== null) {
+      console.error(`\u26A0\uFE0F  Ignoring an ops command the manifest announced: ${reason}.`);
+      continue;
+    }
+    usable.push({ ...command, input: isPlainObject(command.input) ? command.input : {} });
+  }
+  return usable;
+}
+function isPlainObject(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function buildCommandPath(command, params, query) {
   const path5 = command.path.replace(/:([A-Za-z0-9_]+)/g, (_match, name) => {
@@ -5407,6 +5439,10 @@ var SECTIONS = [
 function isSchema(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
+var MAX_SCHEMA_DEPTH = 12;
+function plain(value) {
+  return value.replace(/[\u0000-\u001f\u007f-\u009f]/g, "?");
+}
 function typeName(schema) {
   if (Array.isArray(schema.enum)) {
     return schema.enum.every((v) => typeof v === "string") ? "string" : "value";
@@ -5453,7 +5489,7 @@ function constraintNotes(schema) {
   }
   return notes;
 }
-function collectFields(schema, prefix = "") {
+function collectFields(schema, prefix = "", depth = 0) {
   const properties = isSchema(schema.properties) ? schema.properties : {};
   const required = Array.isArray(schema.required) ? schema.required : [];
   const rows = [];
@@ -5461,17 +5497,17 @@ function collectFields(schema, prefix = "") {
     if (!isSchema(raw)) {
       continue;
     }
-    const path5 = prefix ? `${prefix}.${name}` : name;
-    const nested = isSchema(raw.properties) ? collectFields(raw, path5) : [];
+    const path5 = prefix ? `${prefix}.${plain(name)}` : plain(name);
+    const nested = isSchema(raw.properties) && depth < MAX_SCHEMA_DEPTH ? collectFields(raw, path5, depth + 1) : [];
     if (nested.length > 0) {
       rows.push(...nested);
       continue;
     }
     rows.push({
       name: path5,
-      type: typeName(raw),
+      type: plain(typeName(raw)),
       requirement: required.includes(name) ? "required" : "optional",
-      notes: constraintNotes(raw).join(", ")
+      notes: plain(constraintNotes(raw).join(", "))
     });
   }
   return rows;
@@ -5490,7 +5526,7 @@ function renderSection(label, flag, rows) {
   return lines;
 }
 function renderCommandUsage(command) {
-  const lines = [`${command.name}  ${command.method} ${command.path}`, ""];
+  const lines = [`${plain(command.name)}  ${command.method} ${plain(command.path)}`, ""];
   let described = false;
   for (const section of SECTIONS) {
     const schema = command.input[section.key];
@@ -5507,7 +5543,7 @@ function renderCommandUsage(command) {
   if (!described) {
     lines.push("  Takes no input.", "");
   }
-  lines.push(`  Invoke: spfn ops call ${command.name}${exampleFlags(command)}`);
+  lines.push(`  Invoke: spfn ops call ${plain(command.name)}${exampleFlags(command)}`);
   return lines.join("\n");
 }
 function exampleFlags(command) {
@@ -5598,18 +5634,37 @@ function deleteOpsToken(account) {
 }
 
 // src/commands/ops/resolve.ts
+function isLoopback(hostname) {
+  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "[::1]" || hostname.endsWith(".localhost");
+}
+function assertTransportSafe(parsed, appUrl) {
+  if (parsed.protocol === "https:" || parsed.protocol === "http:" && isLoopback(parsed.hostname)) {
+    return;
+  }
+  if (parsed.protocol === "http:") {
+    console.error(chalk33.red(`\u274C Refusing to talk to ${appUrl} over http.`));
+    console.error(chalk33.gray("   An administrator password and an ops token cross this connection, and http sends both in the clear."));
+    console.error(chalk33.gray("   Use https. http is allowed only against localhost."));
+    process.exit(1);
+  }
+  console.error(chalk33.red(`\u274C App URL must be https, got "${parsed.protocol}//".`));
+  console.error(chalk33.gray("   The ops surface is reached over HTTP(S) \u2014 http is allowed only against localhost."));
+  process.exit(1);
+}
 function resolveAppUrl(options) {
   const appUrl = options.app ?? process.env.SPFN_OPS_APP;
   if (!appUrl) {
     console.error(chalk33.red("\u274C No app URL. Pass --app <url> or set SPFN_OPS_APP."));
     process.exit(1);
   }
+  let parsed;
   try {
-    new URL(appUrl);
+    parsed = new URL(appUrl);
   } catch {
     console.error(chalk33.red(`\u274C Invalid app URL: ${appUrl}`));
     process.exit(1);
   }
+  assertTransportSafe(parsed, appUrl);
   return appUrl;
 }
 function appAccount(appUrl) {
@@ -5623,7 +5678,13 @@ async function resolveToken(options, appUrl) {
     return process.env.SPFN_OPS_TOKEN;
   }
   if (keychainSupported()) {
-    const stored = await loadOpsToken(appAccount(appUrl));
+    const stored = await loadOpsToken(appAccount(appUrl)).catch((err) => {
+      console.error(chalk33.yellow(
+        `\u26A0\uFE0F  Could not read the keychain (${err instanceof Error ? err.message : String(err)}).`
+      ));
+      console.error(chalk33.gray("   Unlock it, or pass --token / set SPFN_OPS_TOKEN for this run."));
+      return null;
+    });
     if (stored) {
       return stored;
     }
@@ -5654,16 +5715,26 @@ import prompts9 from "prompts";
 import chalk34 from "chalk";
 
 // src/utils/ops/auth-crypto.ts
+import { createRequire } from "module";
+import { join as join25 } from "path";
+import { pathToFileURL as pathToFileURL3 } from "url";
 var CRYPTO_ENTRY_SINCE = "0.3.0-beta.2";
 var CRYPTO_ENTRY = "@spfn/auth/crypto";
+async function importFromApp(specifier) {
+  const requireFromApp = createRequire(join25(process.cwd(), "noop.js"));
+  return await import(pathToFileURL3(requireFromApp.resolve(specifier)).href);
+}
 async function loadAuthCrypto() {
   try {
-    return await import(CRYPTO_ENTRY);
+    return await importFromApp(CRYPTO_ENTRY);
   } catch (err) {
     const code = err.code;
     if (code === "ERR_MODULE_NOT_FOUND" || code === "MODULE_NOT_FOUND") {
       throw new Error(
-        "This project does not have @spfn/auth installed, and ops tokens live in its schema \u2014 so this app has none to issue, list or revoke.\n   An app that uses the ops surface installs @spfn/auth for opsTokenAuth; add it there.\n   Invoking commands with a token you already hold (spfn ops list / call) does not need it."
+        `No @spfn/auth is installed in ${process.cwd()}, and ops tokens live in its schema \u2014 so this app has none to issue, list or revoke.
+   An app that uses the ops surface installs @spfn/auth for opsTokenAuth; add it there.
+   Run this from the app directory \u2014 the package is resolved from where the command runs.
+   Invoking commands with a token you already hold (spfn ops list / call) does not need it.`
       );
     }
     if (code === "ERR_PACKAGE_PATH_NOT_EXPORTED") {
@@ -5677,8 +5748,18 @@ async function loadAuthCrypto() {
 }
 
 // src/utils/ops/admin-session.ts
+function parseJsonAnswer(text, status, statusText) {
+  if (!text) {
+    return {};
+  }
+  try {
+    return JSON.parse(text);
+  } catch {
+    throw new Error(`The app answered ${status} ${statusText} with something that is not JSON.`);
+  }
+}
 async function postJson(appUrl, path5, body, authorization) {
-  const response = await fetch(new URL(path5, appUrl), {
+  const response = await fetch(joinUrl(appUrl, path5), {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -5687,7 +5768,7 @@ async function postJson(appUrl, path5, body, authorization) {
     body: JSON.stringify(body)
   });
   const text = await response.text();
-  const parsed = text ? JSON.parse(text) : {};
+  const parsed = parseJsonAnswer(text, response.status, response.statusText);
   if (!response.ok) {
     throw new Error(parsed.message ?? parsed.error ?? `${response.status} ${response.statusText}`);
   }
@@ -5752,7 +5833,7 @@ async function withAdminSession(appUrl, run2) {
   return result;
 }
 async function adminRequest(appUrl, method, path5, session, body) {
-  const response = await fetch(new URL(path5, appUrl), {
+  const response = await fetch(joinUrl(appUrl, path5), {
     method,
     headers: {
       Authorization: session.authorization,
@@ -5761,7 +5842,7 @@ async function adminRequest(appUrl, method, path5, session, body) {
     ...body === void 0 ? {} : { body: JSON.stringify(body) }
   });
   const text = await response.text();
-  const parsed = text ? JSON.parse(text) : {};
+  const parsed = parseJsonAnswer(text, response.status, response.statusText);
   if (!response.ok) {
     throw new Error(parsed.message ?? parsed.error ?? `${response.status} ${response.statusText}`);
   }
@@ -5920,7 +6001,7 @@ async function listCommands(options) {
   console.log(chalk36.bold(`Ops commands at ${appUrl}:
 `));
   for (const command of manifest.commands) {
-    console.log(`  ${chalk36.cyan(command.name)}  ${chalk36.gray(`${command.method} ${command.path}`)}  input: ${inputSummary(command)}`);
+    console.log(`  ${chalk36.cyan(plain(command.name))}  ${chalk36.gray(`${command.method} ${plain(command.path)}`)}  input: ${inputSummary(command)}`);
   }
   console.log(chalk36.gray(`
 \u{1F4A1} Invoke: spfn ops call <name> [--param k=v] [--query k=v] [--data '{"..."}']`));
@@ -5932,8 +6013,8 @@ async function callCommand(name, options) {
   const manifest = await fetchOpsManifest(appUrl, token);
   const command = manifest.commands.find((c) => c.name === name);
   if (!command) {
-    console.error(chalk36.red(`\u274C Unknown ops command "${name}".`));
-    console.error(chalk36.gray(`   Known: ${manifest.commands.map((c) => c.name).join(", ") || "(none)"}`));
+    console.error(chalk36.red(`\u274C Unknown ops command "${plain(name)}".`));
+    console.error(chalk36.gray(`   Known: ${manifest.commands.map((c) => plain(c.name)).join(", ") || "(none)"}`));
     process.exit(1);
   }
   if (options.describe) {
@@ -5943,7 +6024,7 @@ async function callCommand(name, options) {
   let body;
   if (options.data !== void 0) {
     if (command.method === "GET") {
-      console.error(chalk36.red(`\u274C "${name}" is a ${command.method} command and takes no request body.`));
+      console.error(chalk36.red(`\u274C "${plain(name)}" is a ${command.method} command and takes no request body.`));
       console.error(chalk36.gray("   Pass its input with --query k=v (or --param k=v for path segments)."));
       process.exit(1);
     }
@@ -5964,7 +6045,7 @@ async function callCommand(name, options) {
     console.log(rendered);
     return;
   }
-  console.error(chalk36.red(`\u274C ${command.method} ${command.path} answered ${response.status}`));
+  console.error(chalk36.red(`\u274C ${command.method} ${plain(command.path)} answered ${response.status}`));
   console.error(rendered);
   process.exit(1);
 }
@@ -5994,7 +6075,7 @@ function resolveEnv(env9) {
 
 // src/commands/secret/store-value.ts
 init_logger();
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 init_env_file();
 
 // src/utils/sops.ts
@@ -6043,19 +6124,19 @@ async function sopsUpdateKeys(absFile) {
 
 // src/utils/secret-config.ts
 import { existsSync as existsSync28, readdirSync as readdirSync2 } from "fs";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 var SECRETS_DIR = "secrets";
 function getSopsFile(cwd, env9) {
   const relFile = `${SECRETS_DIR}/${env9}.enc.json`;
-  return { absFile: join25(cwd, relFile), relFile };
+  return { absFile: join26(cwd, relFile), relFile };
 }
 function findUp(cwd, filename, maxDepth = 6) {
   let dir = cwd;
   for (let depth = 0; depth < maxDepth; depth++) {
-    if (existsSync28(join25(dir, filename))) {
+    if (existsSync28(join26(dir, filename))) {
       return dir;
     }
-    const parent = join25(dir, "..");
+    const parent = join26(dir, "..");
     if (parent === dir) {
       break;
     }
@@ -6065,17 +6146,17 @@ function findUp(cwd, filename, maxDepth = 6) {
 }
 function findSopsConfig(cwd) {
   const dir = findUp(cwd, ".sops.yaml");
-  return dir ? join25(dir, ".sops.yaml") : null;
+  return dir ? join26(dir, ".sops.yaml") : null;
 }
 function hasSopsConfig(cwd) {
   return findSopsConfig(cwd) !== null;
 }
 function listSopsFiles(cwd) {
-  const dir = join25(cwd, SECRETS_DIR);
+  const dir = join26(cwd, SECRETS_DIR);
   if (!existsSync28(dir)) {
     return [];
   }
-  return readdirSync2(dir).filter((name) => name.endsWith(".enc.json")).map((name) => join25(dir, name));
+  return readdirSync2(dir).filter((name) => name.endsWith(".enc.json")).map((name) => join26(dir, name));
 }
 
 // src/commands/secret/store-value.ts
@@ -6104,7 +6185,7 @@ async function storeSecret(cwd, env9, key, value) {
       );
     }
     await store.set(keychainName(key), value);
-    const serverEnvPath = join26(cwd, ".env.server");
+    const serverEnvPath = join27(cwd, ".env.server");
     const result = upsertEnvVar(serverEnvPath, key, keychainRef(key));
     restrictEnvFilePerms(serverEnvPath);
     ensureGitignored(cwd, [{ pattern: ".env.server", comment: "spfn server env (secrets)" }]);
@@ -6344,10 +6425,10 @@ init_logger();
 import { execa as execa12 } from "execa";
 import { existsSync as existsSync29, mkdirSync as mkdirSync6 } from "fs";
 import { homedir } from "os";
-import { dirname as dirname5, join as join27 } from "path";
+import { dirname as dirname5, join as join28 } from "path";
 import chalk41 from "chalk";
 function ageKeyFile() {
-  return process.env.SOPS_AGE_KEY_FILE ?? join27(homedir(), ".config", "sops", "age", "keys.txt");
+  return process.env.SOPS_AGE_KEY_FILE ?? join28(homedir(), ".config", "sops", "age", "keys.txt");
 }
 async function ensureAgeInstalled() {
   try {
@@ -6395,7 +6476,7 @@ function printPublicKeys(keys) {
 // src/commands/secret/recipients.ts
 init_logger();
 import { existsSync as existsSync30, readFileSync as readFileSync12, writeFileSync as writeFileSync19 } from "fs";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 import { parse as parse3, stringify } from "yaml";
 import chalk42 from "chalk";
 var SOPS_CONFIG = ".sops.yaml";
@@ -6403,7 +6484,7 @@ var DEFAULT_PATH_REGEX = "secrets/.*\\.enc\\.json$";
 var AGE_RECIPIENT = /^age1[0-9a-z]+$/;
 async function secretRecipients(action, key, _options) {
   const cwd = process.cwd();
-  const configPath = join28(cwd, SOPS_CONFIG);
+  const configPath = join29(cwd, SOPS_CONFIG);
   if (action === "list") {
     listRecipients(configPath);
     return;
@@ -6488,7 +6569,7 @@ async function reencrypt(cwd) {
 
 // src/commands/secret/check.ts
 init_logger();
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 import chalk43 from "chalk";
 init_env_file();
 var COMMITTED_FILES = [".env", ".env.example"];
@@ -6507,14 +6588,14 @@ async function secretCheck(options) {
   const issues = [];
   const warnings = [];
   for (const file of COMMITTED_FILES) {
-    const parsed = parseEnvFile(join29(cwd, file));
+    const parsed = parseEnvFile(join30(cwd, file));
     for (const [key, value] of Object.entries(parsed)) {
       if (secretKeys.has(key) && value.length > 0 && !PLACEHOLDER.test(value)) {
         issues.push(`${chalk43.cyan(key)} has a real value in committed ${chalk43.yellow(file)} \u2014 move it to the keychain/SOPS.`);
       }
     }
   }
-  const serverEnv = parseEnvFile(join29(cwd, ".env.server"));
+  const serverEnv = parseEnvFile(join30(cwd, ".env.server"));
   for (const key of secretKeys) {
     const value = serverEnv[key];
     if (value && !value.startsWith(KEYCHAIN_REF_PREFIX)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spfn",
-  "version": "0.3.0-beta.1",
+  "version": "0.3.0-beta.2",
   "description": "Scaffold a full-stack TypeScript backend onto a Next.js app built with an AI coding agent: auth, database, typed routes and codegen, one fixed vertical slice per feature",
   "type": "module",
   "bin": {