onedeploy-cli 0.1.8 → 0.1.10

package/README.md

@@ -1,6 +1,6 @@
-# OneDeploy CLI
+# oneDeploy CLI
 
-This CLI allows you to connect to a OneDeploy cluster via
+This CLI allows you to connect to a oneDeploy cluster via
 [Nebula](https://github.com/slackhq/nebula).
 
 ## Getting Started
@@ -17,12 +17,11 @@ or from an administrator prompt on Windows:
 npx onedeploy-cli
 ```
 
-Then, you need to create an API key on your OneDeploy dashboard. You can
-`Setup new connection` to enter your dashboard URL and API key. Afterwards, you
-can `Connect` to the cluster you added. Please note that connections are stored
-per computer (for the root user), not individually per user.
+Then, you need to create an API key on your oneDeploy dashboard. You can
+`Enter new URL` to enter your oneDeploy URL. After the first connection, this
+URL will be remembered. You will need to authenticate using your passkey.
 
 ## License
 
-The OneDeploy CLI licensed under MIT, see [here](./LICENSE). It uses the Nebula
+The oneDeploy CLI licensed under MIT, see [here](./LICENSE). It uses the Nebula
 overlay network, which is also MIT licensed.

package/dist/browser.js

@@ -0,0 +1,46 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+export const openBrowser = async (url) => {
+    try {
+        // If running as root via sudo, run browser as the original user
+        const isRoot = process.getuid?.() === 0;
+        const sudoUser = process.env.SUDO_USER;
+        switch (process.platform) {
+            case "linux": {
+                if (isRoot && sudoUser) {
+                    // Run as the original user to avoid browser sandbox issues
+                    await promisify(execFile)("sudo", [
+                        "-u",
+                        sudoUser,
+                        "xdg-open",
+                        url,
+                    ]);
+                }
+                else {
+                    await promisify(execFile)("xdg-open", [url]);
+                }
+                break;
+            }
+            case "darwin": {
+                if (isRoot && sudoUser) {
+                    // Run as the original user to avoid browser issues
+                    await promisify(execFile)("sudo", ["-u", sudoUser, "open", url]);
+                }
+                else {
+                    await promisify(execFile)("open", [url]);
+                }
+                break;
+            }
+            case "win32":
+                await promisify(execFile)("cmd", ["/c", "start", '""', url]);
+                break;
+            default:
+                console.error(`Unsupported platform: ${process.platform}.`);
+                console.error("Please open the URL manually.");
+                break;
+        }
+    }
+    catch {
+        console.error("Could not open browser automatically. Please open the URL manually.");
+    }
+};

package/dist/config.js

@@ -1,19 +1,11 @@
 import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { y } from "yedra";
-const configDir = `${homedir()}/.config/onedeploy`;
+export const configDir = `${homedir()}/.config/onedeploy`;
 await mkdir(configDir, { recursive: true });
-const Instance = y.object({
-    url: y.string(),
-});
-const Config = y.object({
-    instances: Instance.array(),
-});
 export const loadConfig = async () => {
     try {
         const result = await readFile(`${configDir}/config.json`, "utf-8");
-        const config = JSON.parse(result);
-        return Config.parse(config);
+        return JSON.parse(result);
     }
     catch (_error) {
         // no config yet

package/dist/index.js

@@ -7,21 +7,33 @@ if (process.argv.includes("--version")) {
     process.exit();
 }
 const config = await loadConfig();
-const setupConnection = async () => {
-    const result = await prompts([
-        {
-            type: "text",
-            name: "url",
-            message: "Enter OneDeploy URL",
-        },
-    ]);
-    if (result.url === undefined) {
+const NEW_URL_VALUE = "__NEW_URL__";
+const normalizeUrl = (url) => {
+    const trimmedUrl = url.trim();
+    // Convert http:// to https://
+    if (trimmedUrl.startsWith("http://")) {
+        return trimmedUrl.replace("http://", "https://");
+    }
+    // Add https:// if no protocol specified
+    if (!trimmedUrl.startsWith("https://")) {
+        return `https://${trimmedUrl}`;
+    }
+    return trimmedUrl;
+};
+const addInstance = async (url) => {
+    // Check for duplicates
+    if (config.instances.some((instance) => instance.url === url)) {
         return;
     }
-    config.instances.push({ url: result.url });
+    config.instances.push({ url });
     await saveConfig(config);
 };
+const REMOVE_URL_VALUE = "__REMOVE_URL__";
 const removeConnection = async () => {
+    if (config.instances.length === 0) {
+        console.log("No connections to remove.");
+        return;
+    }
     const { connection } = await prompts([
         {
             type: "select",
@@ -50,53 +62,58 @@ const removeConnection = async () => {
     }
 };
 const mainMenu = async () => {
-    const { action } = await prompts([
+    const choices = [
+        ...config.instances.map((instance) => ({
+            title: instance.url,
+            value: instance.url,
+        })),
+        {
+            title: "Enter new URL",
+            value: NEW_URL_VALUE,
+        },
+        {
+            title: "Remove a URL",
+            value: REMOVE_URL_VALUE,
+            disabled: config.instances.length === 0,
+        },
+    ];
+    const { selection } = await prompts([
         {
             type: "select",
-            name: "action",
-            message: "What do you want to do?",
-            choices: [
-                {
-                    title: "Connect",
-                    value: "connect",
-                    disabled: config.instances.length === 0,
-                },
-                {
-                    title: "Setup new connection",
-                    value: "setup",
-                },
-                {
-                    title: "Remove connection",
-                    value: "remove",
-                },
-            ],
+            name: "selection",
+            message: "Select oneDeploy instance",
+            choices,
         },
     ]);
-    if (action === "connect") {
+    if (selection === undefined) {
+        return false;
+    }
+    if (selection === REMOVE_URL_VALUE) {
+        await removeConnection();
+        return true;
+    }
+    let urlToConnect;
+    if (selection === NEW_URL_VALUE) {
         const result = await prompts([
             {
-                type: "select",
-                name: "connection",
-                message: "Select OneDeploy instance",
-                choices: config.instances.map((instance) => ({
-                    title: instance.url,
-                    value: instance,
-                })),
+                type: "text",
+                name: "url",
+                message: "Enter oneDeploy URL",
             },
         ]);
-        if (result.connection !== undefined) {
-            await connectNebula(result.connection);
+        if (result.url === undefined) {
+            return true;
         }
-    }
-    else if (action === "setup") {
-        await setupConnection();
-    }
-    else if (action === "remove") {
-        await removeConnection();
+        urlToConnect = normalizeUrl(result.url);
     }
     else {
-        return false;
+        urlToConnect = selection;
     }
+    // Connect first
+    const instance = { url: urlToConnect, apiKey: "" };
+    await connectNebula(instance);
+    // Only save if connection was successful (didn't throw)
+    await addInstance(urlToConnect);
     return true;
 };
 process.on("SIGINT", () => {

package/dist/nebula.js

@@ -1,12 +1,15 @@
 import { execFile, spawn } from "node:child_process";
-import { randomBytes, randomUUID } from "node:crypto";
-import { chmod, mkdir, rm, writeFile } from "node:fs/promises";
+import { randomUUID } from "node:crypto";
+import { access, chmod, mkdir, readFile, rm, writeFile, } from "node:fs/promises";
 import { createServer } from "node:http";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { Readable } from "node:stream";
 import { promisify } from "node:util";
 import { parse } from "yaml";
+import { openBrowser } from "./browser.js";
+import { configDir } from "./config.js";
+import { successPage } from "./success.js";
 const getNebulaPackageName = () => {
     switch (process.platform) {
         case "linux":
@@ -33,22 +36,52 @@ const getNebulaPackageName = () => {
 const nebulaVersion = "v1.10.0";
 const packageName = getNebulaPackageName();
 const nebulaUrl = `https://github.com/slackhq/nebula/releases/download/${nebulaVersion}/${packageName}`;
+const nebulaDir = path.join(configDir, "nebula");
 const tmpDir = path.join(tmpdir(), `onedeploy-${randomUUID()}`);
 await mkdir(tmpDir, { recursive: true });
-export const installNebula = async () => {
-    console.log(`Downloading Nebula to ${tmpDir}/${packageName}...`);
+const isCacheValid = async () => {
+    try {
+        const versionFile = path.join(nebulaDir, "version");
+        const cachedVersion = await readFile(versionFile, "utf-8");
+        if (cachedVersion.trim() !== nebulaVersion) {
+            // Version mismatch - delete old version
+            await rm(nebulaDir, { recursive: true, force: true });
+            return false;
+        }
+        // Check if binaries exist
+        await access(path.join(nebulaDir, "nebula"));
+        await access(path.join(nebulaDir, "nebula-cert"));
+        return true;
+    }
+    catch {
+        // If any error occurs (file doesn't exist, etc.), invalidate cache
+        await rm(nebulaDir, { recursive: true, force: true });
+        return false;
+    }
+};
+const downloadNebula = async () => {
+    console.log(`Downloading Nebula ${nebulaVersion}...`);
     const file = await fetch(nebulaUrl);
     if (file.body === null) {
         throw new Error("Could not download Nebula executable.");
     }
-    await writeFile(`${tmpDir}/${packageName}`, Readable.from(file.body));
-    console.log(`Extracting Nebula to ${tmpDir}/nebula...`);
-    await promisify(execFile)("tar", [
-        "-xf",
-        `${tmpDir}/${packageName}`,
-        "-C",
-        tmpDir,
-    ]);
+    const downloadPath = path.join(tmpDir, packageName);
+    await writeFile(downloadPath, Readable.from(file.body));
+    console.log(`Extracting Nebula...`);
+    // Extract directly to nebulaDir
+    await mkdir(nebulaDir, { recursive: true });
+    await promisify(execFile)("tar", ["-xf", downloadPath, "-C", nebulaDir]);
+    // Store version info
+    await writeFile(path.join(nebulaDir, "version"), nebulaVersion);
+    // Clean up downloaded archive
+    await rm(downloadPath, { force: true });
+    console.log(`Stored Nebula binaries to ${nebulaDir}`);
+};
+export const installNebula = async () => {
+    const cached = await isCacheValid();
+    if (!cached) {
+        await downloadNebula();
+    }
 };
 export const cleanupNebula = async () => {
     await rm(tmpDir, { recursive: true, force: true });
@@ -68,27 +101,25 @@ export const getNebulaCert = async (instance, session) => {
     console.log(`Wrote Nebula configuration to ${tmpDir}/nebula.yml`);
     const parsedConfig = parse(nebulaConfig);
     await writeFile(`${tmpDir}/nebula-debug.crt`, parsedConfig.pki.cert);
-    const { stdout } = await promisify(execFile)(`${tmpDir}/nebula-cert`, [
+    const { stdout } = await promisify(execFile)(`${nebulaDir}/nebula-cert`, [
         "print",
         "-path",
         `${tmpDir}/nebula-debug.crt`,
     ]);
+    const cert = JSON.parse(stdout);
     // in case our local time isn't correct, wait for the certificate to become valid
-    const validFrom = stdout.match(/Not before: ([\d-]+ [\d:]+ \+\d+)/);
-    if (validFrom === null) {
-        throw new Error("Invalid Nebula certificate: Missing 'Not before' field.");
+    const validFromDate = new Date(cert.details.notBefore);
+    if (validFromDate.toString() === "Invalid Date") {
+        throw new Error("Nebula certificate has invalid 'notBefore' date");
     }
-    const validFromDate = new Date(validFrom[1]);
     if (validFromDate > new Date()) {
         const waitTime = validFromDate.getTime() - Date.now();
         console.log(`Your system clock is running slow! Waiting ${Math.ceil(waitTime / 1000)} seconds for Nebula certificate to become valid...`);
         await new Promise((resolve) => setTimeout(resolve, waitTime));
     }
-    process.stdout.write(stdout);
 };
 export let isNebulaRunning = false;
 const getSession = (instance) => {
-    const verificationCode = randomBytes(8).toString("base64url");
     return new Promise((resolve) => {
         const getServerAddr = () => {
             const addr = server.address();
@@ -106,8 +137,10 @@ const getSession = (instance) => {
                     throw new Error("Missing token in callback URL");
                 }
                 // authentication complete
-                res.writeHead(200);
-                res.write("Authentication successful! You can close this window.");
+                res.writeHead(200, "OK", {
+                    "content-type": "text/html",
+                });
+                res.write(successPage);
                 res.end();
                 server.close();
                 resolve(token);
@@ -115,17 +148,19 @@ const getSession = (instance) => {
             else {
                 const target = `${getServerAddr()}/authenticated`;
                 res.writeHead(302, {
-                    location: `${instance.url}/auth/nebula?redirect=${encodeURIComponent(target)}&code=${encodeURIComponent(verificationCode)}`,
+                    location: `${instance.url}/auth/nebula?redirect=${encodeURIComponent(target)}`,
                 });
                 res.end();
             }
         });
-        server.on("listening", () => {
+        server.on("listening", async () => {
             const addr = server.address();
             if (addr === null || typeof addr === "string") {
                 throw new Error("Unexpected address type");
             }
-            console.log(`Visit ${getServerAddr()} to authenticate. Client verification code: ${verificationCode}`);
+            const authUrl = getServerAddr();
+            console.log(`Visit ${authUrl} to authenticate (opened in browser)`);
+            await openBrowser(authUrl);
         });
         server.listen();
     });
@@ -134,7 +169,7 @@ export const connectNebula = async (instance) => {
     const session = await getSession(instance);
     await getNebulaCert(instance, session);
     isNebulaRunning = true;
-    const nebula = spawn(`${tmpDir}/nebula`, ["-config", `${tmpDir}/nebula.yml`], { stdio: "inherit" });
+    const nebula = spawn(`${nebulaDir}/nebula`, ["-config", `${tmpDir}/nebula.yml`], { stdio: "inherit" });
     const interval = setInterval(async () => {
         // refresh Nebula cert every 10 minutes (lifetime is 15 minutes)
         await getNebulaCert(instance, session);

package/dist/success.js

@@ -0,0 +1,201 @@
+export const successPage = `<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>oneDeploy</title>
+    <link rel="icon" type="image/svg+xml"
+        href="data:image/svg+xml,%3Csvg width='48' height='48' viewBox='0 0 48 48' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='14' cy='27' r='14' fill='%2322C55E'/%3E%3Ccircle cx='38' cy='10' r='10' fill='%234ADE80'/%3E%3Ccircle cx='40' cy='40' r='8' fill='%2316A34A'/%3E%3Cline x1='26' y1='19' x2='30' y2='14' stroke='%2386EFAC' stroke-width='3' stroke-linecap='round'/%3E%3Cline x1='26' y1='36' x2='34' y2='38' stroke='%2386EFAC' stroke-width='3' stroke-linecap='round'/%3E%3Cpath d='M9 20V34L21 27L9 20Z' fill='white'/%3E%3C/svg%3E">
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+            margin: 0;
+            padding: 0;
+        }
+
+        .page-container {
+            min-height: 100vh;
+            background-color: #0b0b0f;
+            color: #f3f4f6;
+        }
+
+        .navbar {
+            padding: 1rem;
+            border-bottom: 1px solid rgba(255, 255, 255, 0.05);
+            background-color: #0e0e14;
+        }
+
+        .logo-container {
+            display: flex;
+            align-items: center;
+            gap: 0.75rem;
+        }
+
+        .logo-container img {
+            width: 2.5rem;
+            height: 2.5rem;
+        }
+
+        .logo-text {
+            font-size: 1.5rem;
+            font-weight: 700;
+            letter-spacing: -0.025em;
+            line-height: 1.2;
+        }
+
+        @media (min-width: 768px) {
+            .logo-text {
+                font-size: 1.875rem;
+            }
+        }
+
+        .logo-one {
+            color: #4ade80;
+        }
+
+        .logo-deploy {
+            color: #f3f4f6;
+        }
+
+        .content-wrapper {
+            padding: 1rem;
+        }
+
+        .container {
+            min-height: 80vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding-left: 1rem;
+            padding-right: 1rem;
+        }
+
+        .card {
+            width: 100%;
+            max-width: 28rem;
+            background-color: #14141c;
+            border: 1px solid rgba(255, 255, 255, 0.05);
+            border-radius: 1rem;
+            padding: 2rem;
+            box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
+        }
+
+        .header {
+            text-align: center;
+            margin-bottom: 2rem;
+        }
+
+        .icon-container {
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            width: 4rem;
+            height: 4rem;
+            border-radius: 1rem;
+            background-color: rgba(139, 92, 246, 0.1);
+            color: #a78bfa;
+            margin-bottom: 1.5rem;
+            border: 1px solid rgba(255, 255, 255, 0.05);
+        }
+
+        .icon-container svg {
+            width: 2rem;
+            height: 2rem;
+        }
+
+        h1 {
+            font-size: 1.875rem;
+            font-weight: 700;
+            color: #f3f4f6;
+            letter-spacing: -0.025em;
+            margin: 0 0 0.5rem 0;
+            line-height: 2.25rem;
+            text-align: center;
+        }
+
+        .description {
+            color: #9ca3af;
+            font-size: 1rem;
+            line-height: 1.5rem;
+            text-align: center;
+            margin: 0;
+        }
+
+        .status-container {
+            min-height: 60px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .success-box {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding-top: 0.75rem;
+            padding-bottom: 0.75rem;
+            font-size: 1rem;
+            font-weight: 500;
+            background-color: rgba(34, 197, 94, 0.1);
+            border: 1px solid rgba(34, 197, 94, 0.2);
+            border-radius: 0.5rem;
+            color: #4ade80;
+        }
+
+        .success-box svg {
+            width: 1.25rem;
+            height: 1.25rem;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="page-container">
+        <div class="navbar">
+            <div class="logo-container">
+                <img alt="oneDeploy Logo"
+                    src="data:image/svg+xml,%3Csvg width='48' height='48' viewBox='0 0 48 48' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='14' cy='27' r='14' fill='%2322C55E'/%3E%3Ccircle cx='38' cy='10' r='10' fill='%234ADE80'/%3E%3Ccircle cx='40' cy='40' r='8' fill='%2316A34A'/%3E%3Cline x1='26' y1='19' x2='30' y2='14' stroke='%2386EFAC' stroke-width='3' stroke-linecap='round'/%3E%3Cline x1='26' y1='36' x2='34' y2='38' stroke='%2386EFAC' stroke-width='3' stroke-linecap='round'/%3E%3Cpath d='M9 20V34L21 27L9 20Z' fill='white'/%3E%3C/svg%3E">
+                <div class="logo-text">
+                    <span class="logo-one">one</span><span class="logo-deploy">Deploy</span>
+                </div>
+            </div>
+        </div>
+        <div class="content-wrapper">
+            <div class="container">
+                <div class="card">
+                    <div class="header">
+                        <div class="icon-container">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
+                                stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                                <circle cx="12" cy="12" r="10" />
+                                <line x1="2" y1="12" x2="22" y2="12" />
+                                <path
+                                    d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z" />
+                            </svg>
+                        </div>
+                        <h1>Network Access Request</h1>
+                        <p class="description">oneDeploy CLI is requesting access to the oneDeploy network</p>
+                    </div>
+
+                    <div class="status-container">
+                        <div class="success-box">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
+                                stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                                <path d="M20 6 9 17l-5-5" />
+                            </svg>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "onedeploy-cli",
-	"version": "0.1.8",
+	"version": "0.1.10",
 	"description": "CLI tool for connecting to OneDeploy via Nebula",
 	"keywords": [
 		"onedeploy",
@@ -32,14 +32,13 @@
 		"fix": "biome check src/* --fix"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.3.8",
-		"@types/node": "^25.0.1",
+		"@biomejs/biome": "^2.3.10",
+		"@types/node": "^25.0.3",
 		"@types/prompts": "^2.4.9",
 		"typescript": "^5.9.3"
 	},
 	"dependencies": {
 		"prompts": "^2.4.2",
-		"yaml": "^2.8.2",
-		"yedra": "^0.19.0"
+		"yaml": "^2.8.2"
 	}
 }

package/src/index.ts

@@ -15,22 +15,37 @@ if (process.argv.includes("--version")) {
 
 const config = await loadConfig();
 
-const setupConnection = async () => {
-	const result = await prompts([
-		{
-			type: "text",
-			name: "url",
-			message: "Enter OneDeploy URL",
-		},
-	]);
-	if (result.url === undefined) {
+const NEW_URL_VALUE = "__NEW_URL__";
+
+const normalizeUrl = (url: string): string => {
+	const trimmedUrl = url.trim();
+	// Convert http:// to https://
+	if (trimmedUrl.startsWith("http://")) {
+		return trimmedUrl.replace("http://", "https://");
+	}
+	// Add https:// if no protocol specified
+	if (!trimmedUrl.startsWith("https://")) {
+		return `https://${trimmedUrl}`;
+	}
+	return trimmedUrl;
+};
+
+const addInstance = async (url: string) => {
+	// Check for duplicates
+	if (config.instances.some((instance) => instance.url === url)) {
 		return;
 	}
-	config.instances.push({ url: result.url });
+	config.instances.push({ url });
 	await saveConfig(config);
 };
 
+const REMOVE_URL_VALUE = "__REMOVE_URL__";
+
 const removeConnection = async () => {
+	if (config.instances.length === 0) {
+		console.log("No connections to remove.");
+		return;
+	}
 	const { connection } = await prompts([
 		{
 			type: "select",
@@ -60,50 +75,65 @@ const removeConnection = async () => {
 };
 
 const mainMenu = async (): Promise<boolean> => {
-	const { action } = await prompts([
+	const choices = [
+		...config.instances.map((instance) => ({
+			title: instance.url,
+			value: instance.url,
+		})),
+		{
+			title: "Enter new URL",
+			value: NEW_URL_VALUE,
+		},
+		{
+			title: "Remove a URL",
+			value: REMOVE_URL_VALUE,
+			disabled: config.instances.length === 0,
+		},
+	];
+
+	const { selection } = await prompts([
 		{
 			type: "select",
-			name: "action",
-			message: "What do you want to do?",
-			choices: [
-				{
-					title: "Connect",
-					value: "connect",
-					disabled: config.instances.length === 0,
-				},
-				{
-					title: "Setup new connection",
-					value: "setup",
-				},
-				{
-					title: "Remove connection",
-					value: "remove",
-				},
-			],
+			name: "selection",
+			message: "Select oneDeploy instance",
+			choices,
 		},
 	]);
-	if (action === "connect") {
+
+	if (selection === undefined) {
+		return false;
+	}
+
+	if (selection === REMOVE_URL_VALUE) {
+		await removeConnection();
+		return true;
+	}
+
+	let urlToConnect: string;
+
+	if (selection === NEW_URL_VALUE) {
 		const result = await prompts([
 			{
-				type: "select",
-				name: "connection",
-				message: "Select OneDeploy instance",
-				choices: config.instances.map((instance) => ({
-					title: instance.url,
-					value: instance,
-				})),
+				type: "text",
+				name: "url",
+				message: "Enter oneDeploy URL",
 			},
 		]);
-		if (result.connection !== undefined) {
-			await connectNebula(result.connection);
+		if (result.url === undefined) {
+			return true;
 		}
-	} else if (action === "setup") {
-		await setupConnection();
-	} else if (action === "remove") {
-		await removeConnection();
+		urlToConnect = normalizeUrl(result.url);
 	} else {
-		return false;
+		urlToConnect = selection;
 	}
+
+	// Connect first
+	const instance = { url: urlToConnect, apiKey: "" };
+	await connectNebula(instance);
+
+	// Only save if connection was successful (didn't throw)
+	await addInstance(urlToConnect);
+
 	return true;
 };