@vibedhost/cli 1.0.0 → 1.0.2

package/dist/index.js

@@ -48,7 +48,7 @@ async function main() {
 }
 function printHelp() {
     console.log(`
-VibedHost Cloud Engine — Command Line Interface
+VibedHost Cloud Engine: Command Line Interface
 --------------------------------------------------------------------------
 Deploy web applications and manage dedicated cloud workspaces directly from
 your terminal, Claude Code, Cursor, or automated CI/CD pipelines.
@@ -57,12 +57,13 @@ Website:   https://www.vibedhost.com
 Dashboard: https://www.vibedhost.com/dashboard/workspaces
 
 Usage:
-  npx vibed [command] [options]
+  npx @vibedhost/cli [command] [options]
+  vibed [command] [options]
 
 Getting Started:
   1. Create account & workspace:  https://www.vibedhost.com/register
-  2. Authenticate terminal:       npx vibed login
-  3. Deploy local project:        npx vibed deploy
+  2. Authenticate terminal:       npx @vibedhost/cli login
+  3. Deploy local project:        npx @vibedhost/cli deploy
 
 Commands:
   login              Authenticate this terminal with your VibedHost account
@@ -86,13 +87,13 @@ Inspection Options:
   --ai               Format latest error snippet for AI coding assistants
 
 Examples:
-  npx vibed login
-  npx vibed deploy
-  npx vibed deploy ./dist --name frontend-spa
-  npx vibed status
-  npx vibed logs my-app
-  npx vibed logs my-app --ai
-  npx vibed env set DATABASE_URL=postgresql://...
+  npx @vibedhost/cli login
+  npx @vibedhost/cli deploy
+  npx @vibedhost/cli deploy ./dist --name frontend-spa
+  npx @vibedhost/cli status
+  npx @vibedhost/cli logs my-app
+  npx @vibedhost/cli logs my-app --ai
+  npx @vibedhost/cli env set DATABASE_URL=postgresql://...
 `);
 }
 async function handleLogin() {
@@ -129,11 +130,11 @@ async function handleLogin() {
                 });
                 console.log(`\nAuthentication successful!`);
                 console.log(`Logged in as: ${pollData.user?.email || "Authenticated User"}`);
-                console.log(`Run 'npx vibed deploy' inside any project directory to deploy.`);
+                console.log(`Run 'vibed deploy' (or 'npx @vibedhost/cli deploy') inside any project directory to deploy.`);
                 return;
             }
             if (pollData.status === "expired" || pollData.status === "invalid") {
-                console.error("\nSession expired or rejected. Please run 'npx vibed login' again.");
+                console.error("\nSession expired or rejected. Please run 'vibed login' (or 'npx @vibedhost/cli login') again.");
                 process.exit(1);
             }
         }
@@ -152,7 +153,7 @@ function handleLogout() {
 async function handleWhoami() {
     const config = (0, utils_1.readGlobalConfig)();
     if (!config?.token) {
-        console.log("Not authenticated. Run 'npx vibed login' to connect your account.");
+        console.log("Not authenticated. Run 'vibed login' (or 'npx @vibedhost/cli login') to connect your account.");
         return;
     }
     try {
@@ -196,13 +197,13 @@ async function handleDeploy() {
     const config = (0, utils_1.readGlobalConfig)();
     if (!config?.token) {
         console.log(`
-VibedHost Cloud Engine — Deployment Gateway
+VibedHost Cloud Engine: Deployment Gateway
 ------------------------------------------------------------
 You are not currently authenticated.
 
 Get Started:
 1. Create an account:  https://www.vibedhost.com/register
-2. Authenticate:       npx vibed login
+2. Authenticate:       vibed login (or npx @vibedhost/cli login)
 `);
         process.exit(1);
     }
@@ -234,7 +235,7 @@ Get Started:
         });
         const wsData = (await wsRes.json());
         if (!wsRes.ok) {
-            console.error(`Authentication error: ${wsData.error || "Invalid token. Please run 'npx vibed login'."}`);
+            console.error(`Authentication error: ${wsData.error || "Invalid token. Please run 'vibed login' (or 'npx @vibedhost/cli login')."}`);
             process.exit(1);
         }
         workspaces = (wsData.workspaces || []).filter((w) => w.status === "running");
@@ -246,7 +247,7 @@ Wallet Balance: €${(wsData.walletBalance || 0).toFixed(2)}
 To deploy applications, launch a dedicated cloud workspace:
 https://www.vibedhost.com/dashboard/workspaces
 
-Once provisioned, run 'npx vibed deploy' again.
+Once provisioned, run 'vibed deploy' (or 'npx @vibedhost/cli deploy') again.
 `);
             process.exit(1);
         }
@@ -407,9 +408,9 @@ Workspace: ${targetWs.name}
 Status:    ${result.error || "A build is already in progress for this application."}
 
 Troubleshooting:
-- Stream live logs:    npx vibed logs ${appName}
-- Check status:        npx vibed status ${appName}
-- Format for AI debug: npx vibed logs ${appName} --ai
+- Stream live logs:    vibed logs ${appName}
+- Check status:        vibed status ${appName}
+- Format for AI debug: vibed logs ${appName} --ai
 `);
             process.exit(1);
         }
@@ -422,9 +423,9 @@ Workspace: ${targetWs.name}
 Error:     ${result.error || "Build failed. Please check your configuration."}
 
 Troubleshooting:
-- Stream logs:         npx vibed logs ${appName}
-- Format for AI debug: npx vibed logs ${appName} --ai
-- Adjust port:         npx vibed port set 3000
+- Stream logs:         vibed logs ${appName}
+- Format for AI debug: vibed logs ${appName} --ai
+- Adjust port:         vibed port set 3000
 `);
             process.exit(1);
         }
@@ -483,7 +484,7 @@ Workspace:  ${targetWs.name}
 Status:     Failed
 
 Build unsuccessful.
-Run 'npx vibed logs ${finalAppName}' to view container error logs.
+Run 'vibed logs ${finalAppName}' to view container error logs.
 ------------------------------------------------------------
 `);
             process.exit(1);
@@ -497,8 +498,8 @@ Workspace:  ${targetWs.name}
 Status:     Building
 
 Your application is continuing to build in the background.
-Run 'npx vibed status' to check status.
-Run 'npx vibed logs' to view live build logs.
+Run 'vibed status' to check status.
+Run 'vibed logs' to view live build logs.
 ------------------------------------------------------------
 `);
         }
@@ -511,7 +512,7 @@ Run 'npx vibed logs' to view live build logs.
 async function handleStatus() {
     const config = (0, utils_1.readGlobalConfig)();
     if (!config?.token) {
-        console.error("Not authenticated. Please run 'npx vibed login' first.");
+        console.error("Not authenticated. Please run 'vibed login' (or 'npx @vibedhost/cli login') first.");
         process.exit(1);
     }
     const projectConfig = (0, utils_1.readProjectConfig)();
@@ -549,7 +550,7 @@ Workspace:  ${data.workspaceName || "Workspace"}
 Status:     Failed
 
 Build unsuccessful.
-Run 'npx vibed logs ${appName}' to view error logs.
+Run 'vibed logs ${appName}' to view error logs.
 ------------------------------------------------------------
 `);
             }
@@ -562,7 +563,7 @@ Workspace:  ${data.workspaceName || "Workspace"}
 Status:     Building
 
 Building application container in background.
-Run 'npx vibed logs ${appName}' to view build progress.
+Run 'vibed logs ${appName}' to view build progress.
 ------------------------------------------------------------
 `);
             }
@@ -611,7 +612,7 @@ Run 'npx vibed logs ${appName}' to view build progress.
 async function handleLogs() {
     const config = (0, utils_1.readGlobalConfig)();
     if (!config?.token) {
-        console.error("Not authenticated. Please run 'npx vibed login' first.");
+        console.error("Not authenticated. Please run 'vibed login' (or 'npx @vibedhost/cli login') first.");
         process.exit(1);
     }
     const isAiFormat = args.includes("--ai");
@@ -619,14 +620,21 @@ async function handleLogs() {
     const projectConfig = (0, utils_1.readProjectConfig)();
     const appName = filteredArgs[0] || projectConfig?.appName || (0, utils_1.inferAppName)(process.cwd());
     if (!appName) {
-        console.error("Please specify application name: npx vibed logs <appName>");
+        console.error("Please specify application name: vibed logs <appName> (or npx @vibedhost/cli logs <appName>)");
         process.exit(1);
     }
     try {
         const res = await fetch(`${utils_1.API_BASE_URL}/api/cli/logs?appName=${encodeURIComponent(appName)}`, {
             headers: { Authorization: `Bearer ${config.token}` }
         });
-        const data = (await res.json());
+        const rawText = await res.text();
+        let data = {};
+        try {
+            data = JSON.parse(rawText);
+        }
+        catch {
+            data = { logs: rawText };
+        }
         if (!res.ok) {
             console.error(`Error: ${data.error || "Failed to retrieve logs."}`);
             process.exit(1);
@@ -661,20 +669,20 @@ Please analyze these logs and tell me how to resolve the error.
 async function handleEnv() {
     const config = (0, utils_1.readGlobalConfig)();
     if (!config?.token) {
-        console.error("Not authenticated. Run 'npx vibed login'.");
+        console.error("Not authenticated. Run 'vibed login' (or 'npx @vibedhost/cli login').");
         process.exit(1);
     }
     const subCommand = args[1];
     const projectConfig = (0, utils_1.readProjectConfig)();
     const appName = projectConfig?.appName || (0, utils_1.inferAppName)(process.cwd());
     if (!appName) {
-        console.error("No linked project found in this folder. Run inside a project directory or run 'npx vibed deploy' first.");
+        console.error("No linked project found in this folder. Run inside a project directory or run 'vibed deploy' first.");
         process.exit(1);
     }
     if (subCommand === "set") {
         const keyVal = args[2];
         if (!keyVal || !keyVal.includes("=")) {
-            console.error("Usage: npx vibed env set KEY=VALUE");
+            console.error("Usage: vibed env set KEY=VALUE (or npx @vibedhost/cli env set KEY=VALUE)");
             process.exit(1);
         }
         const idx = keyVal.indexOf("=");
@@ -730,7 +738,7 @@ async function handleEnv() {
 async function handlePort() {
     const config = (0, utils_1.readGlobalConfig)();
     if (!config?.token) {
-        console.error("Not authenticated. Run 'npx vibed login'.");
+        console.error("Not authenticated. Run 'vibed login' (or 'npx @vibedhost/cli login').");
         process.exit(1);
     }
     const subCommand = args[1];
@@ -742,7 +750,7 @@ async function handlePort() {
         process.exit(1);
     }
     if (subCommand !== "set" || isNaN(portVal) || portVal < 1 || portVal > 65535) {
-        console.error("Usage: npx vibed port set <1-65535>");
+        console.error("Usage: vibed port set <1-65535> (or npx @vibedhost/cli port set <1-65535>)");
         process.exit(1);
     }
     try {
@@ -771,7 +779,7 @@ async function handlePort() {
 async function handleDb() {
     const config = (0, utils_1.readGlobalConfig)();
     if (!config?.token) {
-        console.error("Not authenticated. Please run 'npx vibed login' first.");
+        console.error("Not authenticated. Please run 'vibed login' (or 'npx @vibedhost/cli login') first.");
         process.exit(1);
     }
     const subCommand = args[1] || "list";
@@ -782,7 +790,14 @@ async function handleDb() {
             const res = await fetch(`${utils_1.API_BASE_URL}/api/cli/db`, {
                 headers: { Authorization: `Bearer ${config.token}` }
             });
-            const data = (await res.json());
+            const rawText = await res.text();
+            let data = {};
+            try {
+                data = JSON.parse(rawText);
+            }
+            catch {
+                throw new Error("Unable to retrieve database inventory from gateway.");
+            }
             if (!res.ok) {
                 console.error(`Error: ${data.error || "Failed to fetch databases."}`);
                 process.exit(1);
@@ -792,7 +807,7 @@ async function handleDb() {
             console.log("------------------------------------------------------------");
             if (!data.databases || data.databases.length === 0) {
                 console.log("No databases provisioned yet.");
-                console.log("Run 'npx vibed db create <name>' to launch a database.\n");
+                console.log("Run 'vibed db create <name>' (or 'npx @vibedhost/cli db create <name>') to launch a database.\n");
                 return;
             }
             data.databases.forEach((d, idx) => {
@@ -851,7 +866,14 @@ async function handleDb() {
                     engine: cleanEngine
                 })
             });
-            const data = (await res.json());
+            const rawText = await res.text();
+            let data = {};
+            try {
+                data = JSON.parse(rawText);
+            }
+            catch {
+                throw new Error("Database initialization started. Run 'vibed db' to check status.");
+            }
             if (!res.ok || !data.success) {
                 console.error(`Database launch error: ${data.error || "Failed to create database."}`);
                 process.exit(1);
@@ -863,7 +885,7 @@ async function handleDb() {
             console.log(`Workspace:   ${data.workspaceName}`);
             console.log(`URI:         ${data.internalUri}`);
             console.log("------------------------------------------------------------");
-            console.log(`To link to your app, run: npx vibed db link ${data.name}\n`);
+            console.log(`To link to your app, run: vibed db link ${data.name}\n`);
         }
         catch (err) {
             console.error(`Connection error: ${err.message}`);
@@ -875,7 +897,7 @@ async function handleDb() {
         const dbTargetName = args[2] && !args[2].startsWith("--") ? args[2] : "";
         const targetAppName = projectConfig?.appName || (0, utils_1.inferAppName)(process.cwd());
         if (!dbTargetName) {
-            console.error("Usage: npx vibed db link <database-name>");
+            console.error("Usage: vibed db link <database-name> (or npx @vibedhost/cli db link <database-name>)");
             process.exit(1);
         }
         console.log(`Linking database '${dbTargetName}' to application '${targetAppName}'...`);
@@ -892,7 +914,14 @@ async function handleDb() {
                     dbName: dbTargetName
                 })
             });
-            const data = (await res.json());
+            const rawText = await res.text();
+            let data = {};
+            try {
+                data = JSON.parse(rawText);
+            }
+            catch {
+                throw new Error("Database link request is processing on the workspace.");
+            }
             if (!res.ok || !data.success) {
                 console.error(`Link error: ${data.error || "Failed to link database."}`);
                 process.exit(1);
@@ -905,7 +934,7 @@ async function handleDb() {
         }
         return;
     }
-    console.log("Usage: npx vibed db [create|list|link]");
+    console.log("Usage: vibed db [create|list|link] (or npx @vibedhost/cli db [create|list|link])");
 }
 main().catch((err) => {
     console.error(`Execution error: ${err.message}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vibedhost/cli",
-  "version": "1.0.0",
-  "description": "VibedHost Cloud Engine CLI — Deploy applications to dedicated cloud workspaces directly from your terminal.",
+  "version": "1.0.2",
+  "description": "VibedHost Cloud Engine CLI: Deploy applications to dedicated cloud workspaces directly from your terminal.",
   "main": "./dist/index.js",
   "bin": {
     "vibed": "./dist/index.js",

package/src/index.ts

@@ -61,7 +61,7 @@ async function main() {
 
 function printHelp() {
   console.log(`
-VibedHost Cloud Engine — Command Line Interface
+VibedHost Cloud Engine: Command Line Interface
 --------------------------------------------------------------------------
 Deploy web applications and manage dedicated cloud workspaces directly from
 your terminal, Claude Code, Cursor, or automated CI/CD pipelines.
@@ -70,12 +70,13 @@ Website:   https://www.vibedhost.com
 Dashboard: https://www.vibedhost.com/dashboard/workspaces
 
 Usage:
-  npx vibed [command] [options]
+  npx @vibedhost/cli [command] [options]
+  vibed [command] [options]
 
 Getting Started:
   1. Create account & workspace:  https://www.vibedhost.com/register
-  2. Authenticate terminal:       npx vibed login
-  3. Deploy local project:        npx vibed deploy
+  2. Authenticate terminal:       npx @vibedhost/cli login
+  3. Deploy local project:        npx @vibedhost/cli deploy
 
 Commands:
   login              Authenticate this terminal with your VibedHost account
@@ -99,13 +100,13 @@ Inspection Options:
   --ai               Format latest error snippet for AI coding assistants
 
 Examples:
-  npx vibed login
-  npx vibed deploy
-  npx vibed deploy ./dist --name frontend-spa
-  npx vibed status
-  npx vibed logs my-app
-  npx vibed logs my-app --ai
-  npx vibed env set DATABASE_URL=postgresql://...
+  npx @vibedhost/cli login
+  npx @vibedhost/cli deploy
+  npx @vibedhost/cli deploy ./dist --name frontend-spa
+  npx @vibedhost/cli status
+  npx @vibedhost/cli logs my-app
+  npx @vibedhost/cli logs my-app --ai
+  npx @vibedhost/cli env set DATABASE_URL=postgresql://...
 `);
 }
 
@@ -153,12 +154,12 @@ async function handleLogin() {
 
         console.log(`\nAuthentication successful!`);
         console.log(`Logged in as: ${pollData.user?.email || "Authenticated User"}`);
-        console.log(`Run 'npx vibed deploy' inside any project directory to deploy.`);
+        console.log(`Run 'vibed deploy' (or 'npx @vibedhost/cli deploy') inside any project directory to deploy.`);
         return;
       }
 
       if (pollData.status === "expired" || pollData.status === "invalid") {
-        console.error("\nSession expired or rejected. Please run 'npx vibed login' again.");
+        console.error("\nSession expired or rejected. Please run 'vibed login' (or 'npx @vibedhost/cli login') again.");
         process.exit(1);
       }
     }
@@ -179,7 +180,7 @@ function handleLogout() {
 async function handleWhoami() {
   const config = readGlobalConfig();
   if (!config?.token) {
-    console.log("Not authenticated. Run 'npx vibed login' to connect your account.");
+    console.log("Not authenticated. Run 'vibed login' (or 'npx @vibedhost/cli login') to connect your account.");
     return;
   }
 
@@ -227,13 +228,13 @@ async function handleDeploy() {
   const config = readGlobalConfig();
   if (!config?.token) {
     console.log(`
-VibedHost Cloud Engine — Deployment Gateway
+VibedHost Cloud Engine: Deployment Gateway
 ------------------------------------------------------------
 You are not currently authenticated.
 
 Get Started:
 1. Create an account:  https://www.vibedhost.com/register
-2. Authenticate:       npx vibed login
+2. Authenticate:       vibed login (or npx @vibedhost/cli login)
 `);
     process.exit(1);
   }
@@ -272,7 +273,7 @@ Get Started:
     const wsData = (await wsRes.json()) as any;
 
     if (!wsRes.ok) {
-      console.error(`Authentication error: ${wsData.error || "Invalid token. Please run 'npx vibed login'."}`);
+      console.error(`Authentication error: ${wsData.error || "Invalid token. Please run 'vibed login' (or 'npx @vibedhost/cli login')."}`);
       process.exit(1);
     }
 
@@ -286,7 +287,7 @@ Wallet Balance: €${(wsData.walletBalance || 0).toFixed(2)}
 To deploy applications, launch a dedicated cloud workspace:
 https://www.vibedhost.com/dashboard/workspaces
 
-Once provisioned, run 'npx vibed deploy' again.
+Once provisioned, run 'vibed deploy' (or 'npx @vibedhost/cli deploy') again.
 `);
       process.exit(1);
     }
@@ -476,9 +477,9 @@ Workspace: ${targetWs.name}
 Status:    ${result.error || "A build is already in progress for this application."}
 
 Troubleshooting:
-- Stream live logs:    npx vibed logs ${appName}
-- Check status:        npx vibed status ${appName}
-- Format for AI debug: npx vibed logs ${appName} --ai
+- Stream live logs:    vibed logs ${appName}
+- Check status:        vibed status ${appName}
+- Format for AI debug: vibed logs ${appName} --ai
 `);
       process.exit(1);
     }
@@ -492,9 +493,9 @@ Workspace: ${targetWs.name}
 Error:     ${result.error || "Build failed. Please check your configuration."}
 
 Troubleshooting:
-- Stream logs:         npx vibed logs ${appName}
-- Format for AI debug: npx vibed logs ${appName} --ai
-- Adjust port:         npx vibed port set 3000
+- Stream logs:         vibed logs ${appName}
+- Format for AI debug: vibed logs ${appName} --ai
+- Adjust port:         vibed port set 3000
 `);
       process.exit(1);
     }
@@ -562,7 +563,7 @@ Workspace:  ${targetWs.name}
 Status:     Failed
 
 Build unsuccessful.
-Run 'npx vibed logs ${finalAppName}' to view container error logs.
+Run 'vibed logs ${finalAppName}' to view container error logs.
 ------------------------------------------------------------
 `);
       process.exit(1);
@@ -575,8 +576,8 @@ Workspace:  ${targetWs.name}
 Status:     Building
 
 Your application is continuing to build in the background.
-Run 'npx vibed status' to check status.
-Run 'npx vibed logs' to view live build logs.
+Run 'vibed status' to check status.
+Run 'vibed logs' to view live build logs.
 ------------------------------------------------------------
 `);
     }
@@ -589,7 +590,7 @@ Run 'npx vibed logs' to view live build logs.
 async function handleStatus() {
   const config = readGlobalConfig();
   if (!config?.token) {
-    console.error("Not authenticated. Please run 'npx vibed login' first.");
+    console.error("Not authenticated. Please run 'vibed login' (or 'npx @vibedhost/cli login') first.");
     process.exit(1);
   }
 
@@ -631,7 +632,7 @@ Workspace:  ${data.workspaceName || "Workspace"}
 Status:     Failed
 
 Build unsuccessful.
-Run 'npx vibed logs ${appName}' to view error logs.
+Run 'vibed logs ${appName}' to view error logs.
 ------------------------------------------------------------
 `);
       } else {
@@ -643,7 +644,7 @@ Workspace:  ${data.workspaceName || "Workspace"}
 Status:     Building
 
 Building application container in background.
-Run 'npx vibed logs ${appName}' to view build progress.
+Run 'vibed logs ${appName}' to view build progress.
 ------------------------------------------------------------
 `);
       }
@@ -697,7 +698,7 @@ Run 'npx vibed logs ${appName}' to view build progress.
 async function handleLogs() {
   const config = readGlobalConfig();
   if (!config?.token) {
-    console.error("Not authenticated. Please run 'npx vibed login' first.");
+    console.error("Not authenticated. Please run 'vibed login' (or 'npx @vibedhost/cli login') first.");
     process.exit(1);
   }
 
@@ -707,7 +708,7 @@ async function handleLogs() {
   const appName = filteredArgs[0] || projectConfig?.appName || inferAppName(process.cwd());
 
   if (!appName) {
-    console.error("Please specify application name: npx vibed logs <appName>");
+    console.error("Please specify application name: vibed logs <appName> (or npx @vibedhost/cli logs <appName>)");
     process.exit(1);
   }
 
@@ -715,7 +716,13 @@ async function handleLogs() {
     const res = await fetch(`${API_BASE_URL}/api/cli/logs?appName=${encodeURIComponent(appName)}`, {
       headers: { Authorization: `Bearer ${config.token}` }
     });
-    const data = (await res.json()) as any;
+    const rawText = await res.text();
+    let data: any = {};
+    try {
+      data = JSON.parse(rawText);
+    } catch {
+      data = { logs: rawText };
+    }
 
     if (!res.ok) {
       console.error(`Error: ${data.error || "Failed to retrieve logs."}`);
@@ -751,7 +758,7 @@ Please analyze these logs and tell me how to resolve the error.
 async function handleEnv() {
   const config = readGlobalConfig();
   if (!config?.token) {
-    console.error("Not authenticated. Run 'npx vibed login'.");
+    console.error("Not authenticated. Run 'vibed login' (or 'npx @vibedhost/cli login').");
     process.exit(1);
   }
 
@@ -760,14 +767,14 @@ async function handleEnv() {
   const appName = projectConfig?.appName || inferAppName(process.cwd());
 
   if (!appName) {
-    console.error("No linked project found in this folder. Run inside a project directory or run 'npx vibed deploy' first.");
+    console.error("No linked project found in this folder. Run inside a project directory or run 'vibed deploy' first.");
     process.exit(1);
   }
 
   if (subCommand === "set") {
     const keyVal = args[2];
     if (!keyVal || !keyVal.includes("=")) {
-      console.error("Usage: npx vibed env set KEY=VALUE");
+      console.error("Usage: vibed env set KEY=VALUE (or npx @vibedhost/cli env set KEY=VALUE)");
       process.exit(1);
     }
     const idx = keyVal.indexOf("=");
@@ -822,7 +829,7 @@ async function handleEnv() {
 async function handlePort() {
   const config = readGlobalConfig();
   if (!config?.token) {
-    console.error("Not authenticated. Run 'npx vibed login'.");
+    console.error("Not authenticated. Run 'vibed login' (or 'npx @vibedhost/cli login').");
     process.exit(1);
   }
 
@@ -837,7 +844,7 @@ async function handlePort() {
   }
 
   if (subCommand !== "set" || isNaN(portVal) || portVal < 1 || portVal > 65535) {
-    console.error("Usage: npx vibed port set <1-65535>");
+    console.error("Usage: vibed port set <1-65535> (or npx @vibedhost/cli port set <1-65535>)");
     process.exit(1);
   }
 
@@ -867,7 +874,7 @@ async function handlePort() {
 async function handleDb() {
   const config = readGlobalConfig();
   if (!config?.token) {
-    console.error("Not authenticated. Please run 'npx vibed login' first.");
+    console.error("Not authenticated. Please run 'vibed login' (or 'npx @vibedhost/cli login') first.");
     process.exit(1);
   }
 
@@ -880,7 +887,13 @@ async function handleDb() {
       const res = await fetch(`${API_BASE_URL}/api/cli/db`, {
         headers: { Authorization: `Bearer ${config.token}` }
       });
-      const data = (await res.json()) as any;
+      const rawText = await res.text();
+      let data: any = {};
+      try {
+        data = JSON.parse(rawText);
+      } catch {
+        throw new Error("Unable to retrieve database inventory from gateway.");
+      }
 
       if (!res.ok) {
         console.error(`Error: ${data.error || "Failed to fetch databases."}`);
@@ -893,7 +906,7 @@ async function handleDb() {
 
       if (!data.databases || data.databases.length === 0) {
         console.log("No databases provisioned yet.");
-        console.log("Run 'npx vibed db create <name>' to launch a database.\n");
+        console.log("Run 'vibed db create <name>' (or 'npx @vibedhost/cli db create <name>') to launch a database.\n");
         return;
       }
 
@@ -957,7 +970,13 @@ async function handleDb() {
         })
       });
 
-      const data = (await res.json()) as any;
+      const rawText = await res.text();
+      let data: any = {};
+      try {
+        data = JSON.parse(rawText);
+      } catch {
+        throw new Error("Database initialization started. Run 'vibed db' to check status.");
+      }
 
       if (!res.ok || !data.success) {
         console.error(`Database launch error: ${data.error || "Failed to create database."}`);
@@ -971,7 +990,7 @@ async function handleDb() {
       console.log(`Workspace:   ${data.workspaceName}`);
       console.log(`URI:         ${data.internalUri}`);
       console.log("------------------------------------------------------------");
-      console.log(`To link to your app, run: npx vibed db link ${data.name}\n`);
+      console.log(`To link to your app, run: vibed db link ${data.name}\n`);
     } catch (err: any) {
       console.error(`Connection error: ${err.message}`);
     }
@@ -984,7 +1003,7 @@ async function handleDb() {
     const targetAppName = projectConfig?.appName || inferAppName(process.cwd());
 
     if (!dbTargetName) {
-      console.error("Usage: npx vibed db link <database-name>");
+      console.error("Usage: vibed db link <database-name> (or npx @vibedhost/cli db link <database-name>)");
       process.exit(1);
     }
 
@@ -1004,7 +1023,13 @@ async function handleDb() {
         })
       });
 
-      const data = (await res.json()) as any;
+      const rawText = await res.text();
+      let data: any = {};
+      try {
+        data = JSON.parse(rawText);
+      } catch {
+        throw new Error("Database link request is processing on the workspace.");
+      }
 
       if (!res.ok || !data.success) {
         console.error(`Link error: ${data.error || "Failed to link database."}`);
@@ -1019,7 +1044,7 @@ async function handleDb() {
     return;
   }
 
-  console.log("Usage: npx vibed db [create|list|link]");
+  console.log("Usage: vibed db [create|list|link] (or npx @vibedhost/cli db [create|list|link])");
 }
 
 main().catch((err) => {