From fbd4632e9658d86a87ed709b7c2985a87f98c0b2 Mon Sep 17 00:00:00 2001
From: DuncanAForbes <daf@duncanforbes.io>
Date: Mon, 6 Apr 2026 20:59:20 +0100
Subject: [PATCH] fix(cli): set output mode before loadLocalEnv, normalise
 .env.local URLs

- Reorder preAction hook so --json/--quiet flags are active before
  loadLocalEnv prints any messages
- Add normalizeUrl() to strip surrounding quotes, trailing slashes, and
  validate http(s) scheme on .env.local URL values
---
 bin/bagdock.ts |  2 +-
 src/config.ts  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bin/bagdock.ts b/bin/bagdock.ts
index 4569114..721e2af 100644
--- a/bin/bagdock.ts
+++ b/bin/bagdock.ts
@@ -47,8 +47,8 @@ program
   .option('--ngrok', 'Use API URLs from .env.local (for ngrok tunnels)')
   .hook('preAction', (_thisCommand, actionCommand) => {
     const opts = program.opts()
-    if (opts.ngrok) loadLocalEnv()
     setOutputMode({ json: opts.json, quiet: opts.quiet })
+    if (opts.ngrok) loadLocalEnv()
     if (opts.apiKey) setApiKeyOverride(opts.apiKey)
     if (opts.profile) setProfileOverride(opts.profile)
     if (opts.env) {
diff --git a/src/config.ts b/src/config.ts
index 67c098b..530c883 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -26,6 +26,15 @@ export function getDashboardBase() { return _dashboardBase }
  * in the current working directory. Used by the --ngrok flag to point
  * the CLI at a local tunnel without hardcoding internal URLs.
  */
+function normalizeUrl(raw: string): string {
+  let url = raw.replace(/^['"]|['"]$/g, '').replace(/\/+$/, '')
+  if (!/^https?:\/\//i.test(url)) {
+    console.error(chalk.red(`Invalid URL (must start with http:// or https://): ${raw}`))
+    process.exit(1)
+  }
+  return url
+}
+
 export function loadLocalEnv() {
   const envPath = join(process.cwd(), '.env.local')
   if (!existsSync(envPath)) {
@@ -51,9 +60,9 @@ export function loadLocalEnv() {
     process.exit(1)
   }
 
-  _apiBase = apiUrl
+  _apiBase = normalizeUrl(apiUrl)
   if (vars['BAGDOCK_DASHBOARD_URL']) {
-    _dashboardBase = vars['BAGDOCK_DASHBOARD_URL']
+    _dashboardBase = normalizeUrl(vars['BAGDOCK_DASHBOARD_URL'])
   }
 
   console.log(chalk.dim(`Using local env → ${_apiBase}`))