bod-cli 0.7.2 → 0.7.4

package/dist/cli.js

@@ -20152,12 +20152,15 @@ 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");
+  const explicitInstance = !!(process.env._BOD_INSTANCE_OVERRIDE || process.env.BOD_INSTANCE);
+  if (!explicitInstance) {
+    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");
+  }
   const { url, apiKey } = getResolvedInstance(loadConfig());
   const client = new BodClient(url, apiKey);
   const appId = await resolveAppId(client, resolveAppName(appArg));
@@ -20419,7 +20422,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.7.4",
   "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

@@ -80,19 +80,30 @@ function directTarget(port: number, token: string, label: string): DbTarget {
 }
 
 /**
- * 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.
+ *
+ * Precedence:
+ *   1. Explicit `--instance <name>` / `BOD_INSTANCE` → always the Bodify agent
+ *      proxy for that instance. Local shortcuts are skipped so the flag isn't
+ *      silently ignored while `bod serve` runs in the same dir.
+ *   2. Otherwise, prefer direct-to-BodDB if we can discover the port + admin
+ *      password locally (`.bodify/serve.info.json` from `bod serve`, or
+ *      `.env BODDB_ADMIN_PASSWORD` + `bodify.yaml database.port`).
+ *   3. Fall back to the Bodify agent proxy for the default instance.
  */
 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).
+  const explicitInstance = !!(process.env._BOD_INSTANCE_OVERRIDE || process.env.BOD_INSTANCE)
+
+  if (!explicitInstance) {
+    // 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 — or explicitly-requested instance).
   const { url, apiKey } = getResolvedInstance(loadConfig())
   const client = new BodClient(url, apiKey)
   const appId = await resolveAppId(client, resolveAppName(appArg))