bod-cli 0.7.2 → 0.8.1

package/dist/cli.js

@@ -20151,23 +20151,47 @@ function directTarget(port, token, label) {
     }
   };
 }
-async function resolveDbTarget(appArg) {
-  const info = readServeInfo();
-  if (info)
-    return directTarget(info.dbPort, info.dbAdminPassword, "local serve");
-  const envPw = readDotEnv("BODDB_ADMIN_PASSWORD");
-  if (envPw)
-    return directTarget(readDbPortFromYaml(), envPw, "direct via .env");
+function isInAppFolder() {
+  return existsSync6(join6(process.cwd(), "bodify.yaml"));
+}
+async function resolveDbTarget(appArg, wantLocal) {
+  const inApp = isInAppFolder();
+  const scopeLabel = inApp ? "APP" : "BODIFY-PLATFORM";
+  if (wantLocal) {
+    if (!inApp) {
+      console.error(source_default.red("--local (-l) only works inside a Bodify app folder (needs bodify.yaml)."));
+      process.exit(1);
+    }
+    const info = readServeInfo();
+    if (info)
+      return directTarget(info.dbPort, info.dbAdminPassword, `LOCAL ${scopeLabel} bod serve`);
+    const envPw = readDotEnv("BODDB_ADMIN_PASSWORD");
+    if (envPw)
+      return directTarget(readDbPortFromYaml(), envPw, `LOCAL ${scopeLabel} via .env`);
+    console.error(source_default.red("--local (-l) requires a running `bod serve` in this directory."));
+    console.error(source_default.dim("  Expected `.bodify/serve.info.json` or BODDB_ADMIN_PASSWORD in .env — neither found."));
+    process.exit(1);
+  }
   const { url, apiKey } = getResolvedInstance(loadConfig());
   const client = new BodClient(url, apiKey);
-  const appId = await resolveAppId(client, resolveAppName(appArg));
+  const effectiveAppArg = inApp ? appArg : appArg ?? "bodify";
+  const appId = await resolveAppId(client, resolveAppName(effectiveAppArg));
+  const instanceLabel = process.env._BOD_INSTANCE_OVERRIDE || process.env.BOD_INSTANCE || "default";
   return {
-    label: `agent ${url} → app ${appId}`,
+    label: `REMOTE ${scopeLabel} ${instanceLabel} (${url}) → app ${appId}`,
     request(method, sub, body) {
       return client.request(method, `/apps/${appId}${sub}`, body);
     }
   };
 }
+function printTargetBanner(target) {
+  const isLocal = target.label.startsWith("LOCAL");
+  const color = isLocal ? source_default.cyan : source_default.yellow;
+  console.error(color(`→ DB target: ${target.label}${isInAppFolder() ? "" : "  [no bodify.yaml in cwd]"}`));
+}
+function readLocalFlag() {
+  return process.argv.slice(2).some((a2) => a2 === "--local" || a2 === "-l");
+}
 async function readBody(positional, file) {
   let raw;
   if (positional)
@@ -20248,7 +20272,8 @@ var getCmd = defineCommand2({
   },
   async run({ args }) {
     strictArgs(["path", "app", "a", "deep", "d", "limit", "n", "offset", "output", "o"]);
-    const target = await resolveDbTarget(args.app);
+    const target = await resolveDbTarget(args.app, readLocalFlag());
+    printTargetBanner(target);
     const path = normalizePath(args.path);
     const qs = [];
     if (!args.deep) {
@@ -20277,7 +20302,8 @@ var setCmd2 = defineCommand2({
   async run({ args }) {
     strictArgs(["path", "value", "app", "a", "file", "f"]);
     const body = await readBody(args.value, args.file);
-    const target = await resolveDbTarget(args.app);
+    const target = await resolveDbTarget(args.app, readLocalFlag());
+    printTargetBanner(target);
     await target.request("PUT", `/db/${normalizePath(args.path)}`, body);
     console.log(source_default.green(`✓ Set ${args.path}`));
   }
@@ -20293,7 +20319,8 @@ var updateCmd = defineCommand2({
   async run({ args }) {
     strictArgs(["path", "value", "app", "a", "file", "f"]);
     const body = await readBody(args.value, args.file);
-    const target = await resolveDbTarget(args.app);
+    const target = await resolveDbTarget(args.app, readLocalFlag());
+    printTargetBanner(target);
     await target.request("PATCH", `/db/${normalizePath(args.path)}`, body);
     console.log(source_default.green(`✓ Updated ${args.path}`));
   }
@@ -20309,7 +20336,8 @@ var pushCmd = defineCommand2({
   async run({ args }) {
     strictArgs(["path", "value", "app", "a", "file", "f"]);
     const body = await readBody(args.value, args.file);
-    const target = await resolveDbTarget(args.app);
+    const target = await resolveDbTarget(args.app, readLocalFlag());
+    printTargetBanner(target);
     const res = await target.request("POST", `/db/${normalizePath(args.path)}`, body);
     console.log(source_default.green(`✓ Pushed → ${args.path}/${res.key}`));
   }
@@ -20327,7 +20355,8 @@ var deleteCmd = defineCommand2({
       console.error(source_default.yellow(`Refusing to delete "${args.path}" without --confirm (-y).`));
       process.exit(1);
     }
-    const target = await resolveDbTarget(args.app);
+    const target = await resolveDbTarget(args.app, readLocalFlag());
+    printTargetBanner(target);
     await target.request("DELETE", `/db/${normalizePath(args.path)}`);
     console.log(source_default.green(`✓ Deleted ${args.path}`));
   }
@@ -20394,7 +20423,8 @@ var queryCmd = defineCommand2({
       limit: args.limit ? Number(args.limit) : undefined,
       offset: args.offset ? Number(args.offset) : undefined
     };
-    const target = await resolveDbTarget(args.app);
+    const target = await resolveDbTarget(args.app, readLocalFlag());
+    printTargetBanner(target);
     const res = await target.request("POST", `/query/${normalizePath(args.path)}`, body);
     let rows = res.data;
     if (!args.deep && Array.isArray(rows)) {
@@ -20419,7 +20449,18 @@ var db_default = defineCommand2({
 });
 
 // src/cli.ts
-var instanceFlag = process.argv.find((a2) => a2.startsWith("--instance="))?.split("=").slice(1).join("=");
+function parseInstanceFlag() {
+  const argv2 = process.argv;
+  for (let i2 = 0;i2 < argv2.length; i2++) {
+    const a2 = argv2[i2];
+    if (a2.startsWith("--instance="))
+      return a2.slice("--instance=".length);
+    if (a2 === "--instance" && i2 + 1 < argv2.length)
+      return argv2[i2 + 1];
+  }
+  return;
+}
+var instanceFlag = parseInstanceFlag();
 var isLocal = process.argv.includes("--local") || process.argv.includes("-l");
 if (instanceFlag)
   setInstanceOverride(instanceFlag);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bod-cli",
-  "version": "0.7.2",
+  "version": "0.8.1",
   "type": "module",
   "bin": {
     "bod": "./dist/cli.js"

package/src/cli.ts

@@ -17,8 +17,18 @@ import sshCmd from './commands/ssh'
 import publishCmd from './commands/publish'
 import dbCmd from './commands/db'
 
-// Parse --instance / --local / -l early so it's set before citty dispatches subcommands
-const instanceFlag = process.argv.find(a => a.startsWith('--instance='))?.split('=').slice(1).join('=')
+// Parse --instance / --local / -l early so it's set before citty dispatches subcommands.
+// Supports both `--instance=NAME` and `--instance NAME` forms.
+function parseInstanceFlag(): string | undefined {
+  const argv = process.argv
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i]
+    if (a.startsWith('--instance=')) return a.slice('--instance='.length)
+    if (a === '--instance' && i + 1 < argv.length) return argv[i + 1]
+  }
+  return undefined
+}
+const instanceFlag = parseInstanceFlag()
 const isLocal = process.argv.includes('--local') || process.argv.includes('-l')
 if (instanceFlag) setInstanceOverride(instanceFlag)
 else if (isLocal) setInstanceOverride('local')

package/src/commands/db.ts

@@ -79,31 +79,76 @@ function directTarget(port: number, token: string, label: string): DbTarget {
   }
 }
 
+/** True if cwd has a `bodify.yaml` (i.e. we're inside a Bodify app project). */
+function isInAppFolder(): boolean {
+  return existsSync(join(process.cwd(), 'bodify.yaml'))
+}
+
 /**
- * Resolve a target for DB commands. Direct-to-BodDB takes precedence when we
- * can discover the port + admin password locally — this covers `bod serve`
- * running in the same dir (via `.bodify/serve.info.json` or `.env`). Falls
- * back to the Bodify agent proxy for deployed apps.
+ * Resolve a target for DB commands.
+ *
+ * Explicit, predictable rules — no silent auto-detection:
+ *   • `-l` / `--local`: REQUIRE a running `bod serve` in cwd. Connects
+ *     directly to its BodDB (port from `.bodify/serve.info.json`, or
+ *     `.env BODDB_ADMIN_PASSWORD` + `bodify.yaml database.port`). Fails
+ *     loudly if no local serve is discoverable — we never silently fall
+ *     through to prod when `-l` was requested.
+ *   • No `-l` (default): route through the Bodify agent proxy (remote prod
+ *     by default, or the instance named by `--instance` / `BOD_INSTANCE`).
+ *     Even when `bod serve` is running in the same directory, we stay on
+ *     prod unless `-l` was passed — this is the opposite of the old
+ *     behavior and prevents "which DB did I just write to?" confusion.
+ *
+ * Every resolved target carries a human label that the command layer prints
+ * as a banner before running, so the user can always see where writes land.
  */
-async function resolveDbTarget(appArg: string | undefined): Promise<DbTarget> {
-  // 1. Live `bod serve` info file — authoritative (correct port even if scanned).
-  const info = readServeInfo()
-  if (info) return directTarget(info.dbPort, info.dbAdminPassword, 'local serve')
-  // 2. .env BODDB_ADMIN_PASSWORD + bodify.yaml database.port — works without restarting serve.
-  const envPw = readDotEnv('BODDB_ADMIN_PASSWORD')
-  if (envPw) return directTarget(readDbPortFromYaml(), envPw, 'direct via .env')
-  // 3. Bodify agent proxy (deployed apps).
+async function resolveDbTarget(appArg: string | undefined, wantLocal: boolean): Promise<DbTarget> {
+  const inApp = isInAppFolder()
+  const scopeLabel = inApp ? 'APP' : 'BODIFY-PLATFORM'
+
+  if (wantLocal) {
+    // `-l` only makes sense inside an app folder — the Bodify platform DB
+    // isn't something you run locally via `bod serve`.
+    if (!inApp) {
+      console.error(chalk.red('--local (-l) only works inside a Bodify app folder (needs bodify.yaml).'))
+      process.exit(1)
+    }
+    const info = readServeInfo()
+    if (info) return directTarget(info.dbPort, info.dbAdminPassword, `LOCAL ${scopeLabel} bod serve`)
+    const envPw = readDotEnv('BODDB_ADMIN_PASSWORD')
+    if (envPw) return directTarget(readDbPortFromYaml(), envPw, `LOCAL ${scopeLabel} via .env`)
+    console.error(chalk.red('--local (-l) requires a running `bod serve` in this directory.'))
+    console.error(chalk.dim('  Expected `.bodify/serve.info.json` or BODDB_ADMIN_PASSWORD in .env — neither found.'))
+    process.exit(1)
+  }
+
+  // Remote: Bodify agent proxy. Inside an app folder → that app's DB;
+  // outside → the Bodify platform app's own DB.
   const { url, apiKey } = getResolvedInstance(loadConfig())
   const client = new BodClient(url, apiKey)
-  const appId = await resolveAppId(client, resolveAppName(appArg))
+  const effectiveAppArg = inApp ? appArg : (appArg ?? 'bodify')
+  const appId = await resolveAppId(client, resolveAppName(effectiveAppArg))
+  const instanceLabel = process.env._BOD_INSTANCE_OVERRIDE || process.env.BOD_INSTANCE || 'default'
   return {
-    label: `agent ${url} → app ${appId}`,
+    label: `REMOTE ${scopeLabel} ${instanceLabel} (${url}) → app ${appId}`,
     request<T>(method: string, sub: string, body?: unknown): Promise<T> {
       return client.request<T>(method, `/apps/${appId}${sub}`, body)
     },
   }
 }
 
+/** Print a clear banner showing the resolved DB target. Always on stderr. */
+function printTargetBanner(target: DbTarget): void {
+  const isLocal = target.label.startsWith('LOCAL')
+  const color = isLocal ? chalk.cyan : chalk.yellow
+  console.error(color(`→ DB target: ${target.label}${isInAppFolder() ? '' : '  [no bodify.yaml in cwd]'}`))
+}
+
+/** Read --local / -l from argv before citty parses, so all subcommands see it. */
+function readLocalFlag(): boolean {
+  return process.argv.slice(2).some(a => a === '--local' || a === '-l')
+}
+
 /** Read body from positional arg, --file, or stdin (in that order). */
 async function readBody(positional: string | undefined, file: string | undefined): Promise<unknown> {
   let raw: string | undefined
@@ -190,7 +235,8 @@ const getCmd = defineCommand({
   },
   async run({ args }) {
     strictArgs(['path', 'app', 'a', 'deep', 'd', 'limit', 'n', 'offset', 'output', 'o'])
-    const target = await resolveDbTarget(args.app)
+    const target = await resolveDbTarget(args.app, readLocalFlag())
+    printTargetBanner(target)
     const path = normalizePath(args.path)
     const qs: string[] = []
     if (!args.deep) {
@@ -218,7 +264,8 @@ const setCmd = defineCommand({
   async run({ args }) {
     strictArgs(['path', 'value', 'app', 'a', 'file', 'f'])
     const body = await readBody(args.value, args.file)
-    const target = await resolveDbTarget(args.app)
+    const target = await resolveDbTarget(args.app, readLocalFlag())
+    printTargetBanner(target)
     await target.request('PUT', `/db/${normalizePath(args.path)}`, body)
     console.log(chalk.green(`✓ Set ${args.path}`))
   },
@@ -235,7 +282,8 @@ const updateCmd = defineCommand({
   async run({ args }) {
     strictArgs(['path', 'value', 'app', 'a', 'file', 'f'])
     const body = await readBody(args.value, args.file)
-    const target = await resolveDbTarget(args.app)
+    const target = await resolveDbTarget(args.app, readLocalFlag())
+    printTargetBanner(target)
     await target.request('PATCH', `/db/${normalizePath(args.path)}`, body)
     console.log(chalk.green(`✓ Updated ${args.path}`))
   },
@@ -252,7 +300,8 @@ const pushCmd = defineCommand({
   async run({ args }) {
     strictArgs(['path', 'value', 'app', 'a', 'file', 'f'])
     const body = await readBody(args.value, args.file)
-    const target = await resolveDbTarget(args.app)
+    const target = await resolveDbTarget(args.app, readLocalFlag())
+    printTargetBanner(target)
     const res = await target.request<DbResponse>('POST', `/db/${normalizePath(args.path)}`, body)
     console.log(chalk.green(`✓ Pushed → ${args.path}/${res.key}`))
   },
@@ -271,7 +320,8 @@ const deleteCmd = defineCommand({
       console.error(chalk.yellow(`Refusing to delete "${args.path}" without --confirm (-y).`))
       process.exit(1)
     }
-    const target = await resolveDbTarget(args.app)
+    const target = await resolveDbTarget(args.app, readLocalFlag())
+    printTargetBanner(target)
     await target.request('DELETE', `/db/${normalizePath(args.path)}`)
     console.log(chalk.green(`✓ Deleted ${args.path}`))
   },
@@ -339,7 +389,8 @@ const queryCmd = defineCommand({
       limit: args.limit ? Number(args.limit) : undefined,
       offset: args.offset ? Number(args.offset) : undefined,
     }
-    const target = await resolveDbTarget(args.app)
+    const target = await resolveDbTarget(args.app, readLocalFlag())
+    printTargetBanner(target)
     const res = await target.request<DbResponse>('POST', `/query/${normalizePath(args.path)}`, body)
     let rows = res.data as Array<Record<string, unknown>> | null
     if (!args.deep && Array.isArray(rows)) {