@keynv/cli 0.1.0-rc.15 → 0.1.0-rc.17

package/dist/index.js

@@ -1057,7 +1057,7 @@ var require_lib = __commonJS({
 var VERSION, AGENT;
 var init_version = __esm({
   "src/version.ts"() {
-    VERSION = "0.1.0-rc.15" ;
+    VERSION = "0.1.0-rc.17" ;
     AGENT = `keynv-cli/${VERSION}`;
   }
 });
@@ -5734,7 +5734,7 @@ var init_http = __esm({
       async request(path, opts = {}) {
         if (this.hydrated) await this.hydrated;
         if (!this.creds && opts.authed !== false) {
-          throw clientError(401, "auth.missing_token", "Not logged in. Run `keynv login` first.");
+          throw clientError(401, "auth.missing_token", "Not connected. Run `keynv` first.");
         }
         const headers = {
           "content-type": "application/json",
@@ -5994,7 +5994,7 @@ When the user asks about secrets or env vars, follow this decision tree:
 | User intent | Run / suggest |
 |---|---|
 | "Add a new API key" / "set up a secret" | \`keynv secret create\` (interactive prompt picks project + env + key) |
-| "I have a \`.env\`, migrate it" | \`keynv init\` (you're seeing this file because that already happened) |
+| "I have a \`.env\`, migrate it" | Run \`keynv\` and choose **Set up this project** |
 | "Run the app / dev server / tests" | \`keynv exec -- <their existing command>\` (auto-loads \`.keynv.env\`) |
 | "Show me the value of X" | \`keynv secret get @alias\` \u2014 but copy to clipboard, do NOT print the value into chat / terminal |
 | "Rotate this key" | \`keynv secret rotate @alias\` |
@@ -6021,7 +6021,7 @@ keynv whoami                # who am I logged in as
 keynv --help                # full command list
 \`\`\`
 
-If \`.keynv.env\` is missing or empty, the user probably hasn't run \`keynv init\` yet \u2014 suggest they do so before they paste a secret into a \`.env\`.`;
+If \`.keynv.env\` is missing or empty, the user probably hasn't run setup yet \u2014 suggest running \`keynv\` and choosing **Set up this project** before they paste a secret into a \`.env\`.`;
 }
 function renderKeynvBlock() {
   return `${KEYNV_BLOCK_START}
@@ -6060,7 +6060,7 @@ var AGENTS_FILE_BASENAME, KEYNV_BLOCK_START, KEYNV_BLOCK_END;
 var init_ai_context = __esm({
   "src/init/ai-context.ts"() {
     AGENTS_FILE_BASENAME = "AGENTS.md";
-    KEYNV_BLOCK_START = "<!-- keynv:start -- generated by `keynv init`; safe to leave intact, will be refreshed on re-run -->";
+    KEYNV_BLOCK_START = "<!-- keynv:start -- generated by keynv setup; safe to leave intact, will be refreshed on re-run -->";
     KEYNV_BLOCK_END = "<!-- keynv:end -->";
   }
 });
@@ -8605,11 +8605,11 @@ function toAliasKey(name) {
   return normalised.replace(/[^a-zA-Z0-9_-]/g, "").slice(0, 64) || "key";
 }
 async function runInitFlow(client, opts) {
-  ge("keynv init");
+  ge("Set up this project");
   const root = findProjectRoot(opts.cwd);
   if (root === null) {
     me(
-      "Couldn't find a project root (no package.json, pyproject.toml, Cargo.toml, go.mod, or .git anywhere up the tree). Run `keynv init` inside a project directory."
+      'Couldn\'t find a project root (no package.json, pyproject.toml, Cargo.toml, go.mod, or .git anywhere up the tree). Run `keynv` inside a project directory and choose "Set up this project".'
     );
     return { exitCode: 1 };
   }
@@ -9063,7 +9063,7 @@ function composeKeynvEnv(opts) {
       lines.push(...trimmed.split("\n"));
       lines.push("");
     }
-    lines.push(`# >>> keynv init  ${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)} >>>`);
+    lines.push(`# >>> keynv setup  ${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)} >>>`);
   } else {
     lines.push("# .keynv.env \u2014 alias references to vault secrets.");
     lines.push("# Safe to commit: this file contains references, not values.");
@@ -9085,7 +9085,7 @@ function composeKeynvEnv(opts) {
     }
   }
   if (mergeWithExisting !== null) {
-    lines.push("# <<< keynv init <<<");
+    lines.push("# <<< keynv setup <<<");
   }
   return lines;
 }
@@ -9227,7 +9227,7 @@ async function runBrowserAuth(serverUrl) {
       access_expires_at: new Date(Date.now() + data.expires_in * 1e3).toISOString()
     };
   }
-  throw new BrowserAuthError("Browser auth timed out. Run `keynv login` to try again.");
+  throw new BrowserAuthError("Browser auth timed out. Run `keynv` to try again.");
 }
 var BrowserAuthError;
 var init_browser_auth = __esm({
@@ -43651,7 +43651,7 @@ var init_audit2 = __esm({
 async function runLoginFlow(client, options = {}) {
   const server = options.server ?? DEFAULT_SERVER_URL;
   const s = ft();
-  s.start("Waiting for authorization");
+  s.start(`Opening browser for ${server}`);
   let creds;
   try {
     creds = await runBrowserAuth(server);
@@ -43891,17 +43891,21 @@ async function runMenu() {
   await client.ensureHydrated();
   let didLogin = false;
   if (!client.isLoggedIn) {
-    R2.info("Not logged in.");
+    const server = await pickConnectionTarget();
+    if (server === null) {
+      ye("Bye.");
+      return 0;
+    }
     try {
-      const ok = await runLoginFlow(client);
+      const ok = await runLoginFlow(client, { server });
       if (!ok) {
-        ye("Login cancelled.");
+        ye("Connection cancelled.");
         return 1;
       }
       didLogin = true;
     } catch (err) {
       if (err instanceof UserCancelled) {
-        me("Login cancelled.");
+        me("Connection cancelled.");
         return 130;
       }
       throw err;
@@ -43938,7 +43942,7 @@ async function runMenu() {
       const value = await Ee({
         message: "What now?",
         options: [
-          { value: "init", label: "Initialize this project (migrate .env)", hint: "keynv init" },
+          { value: "init", label: "Set up this project", hint: "migrate .env into keynv" },
           { value: "projects", label: "Projects" },
           { value: "secrets", label: "Secrets" },
           { value: "members", label: "Members" },
@@ -43994,9 +43998,41 @@ async function runMenu() {
     }
   }
 }
+async function pickConnectionTarget() {
+  R2.info("Connect once, then manage projects and secrets from this menu.");
+  const target = await Ee({
+    message: "Connect to keynv",
+    options: [
+      { value: "cloud", label: "keynv.dev", hint: "recommended" },
+      { value: "self-hosted", label: "Self-hosted server", hint: "enter your API URL" },
+      { value: "exit", label: "Exit" }
+    ]
+  });
+  if (q(target) || target === "exit") return null;
+  if (target === "cloud") return DEFAULT_SERVER_URL;
+  const server = await Re({
+    message: "Server API URL",
+    placeholder: "https://api.keynv.example.com",
+    validate: (value) => {
+      if (!value) return "Enter a server URL.";
+      try {
+        const parsed = new URL(value);
+        if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+          return "Use an http:// or https:// URL.";
+        }
+        return void 0;
+      } catch {
+        return "Enter a valid URL.";
+      }
+    }
+  });
+  if (q(server)) return null;
+  return String(server);
+}
 var init_menu = __esm({
   "src/ui/menu.ts"() {
     init_dist5();
+    init_defaults();
     init_http();
     init_store();
     init_detect();
@@ -46015,7 +46051,7 @@ function defaultRender(name) {
 function preview(matched) {
   if (matched.length <= 4)
     return "****";
-  return `${matched.slice(0, 4)}...`;
+  return `${matched.slice(0, 3)}...`;
 }
 function escapeRegExp(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -46364,7 +46400,7 @@ spelled \`--from\` to avoid the collision.)
     const client = new ApiClient();
     await client.ensureHydrated();
     if (!client.isLoggedIn) {
-      this.context.stderr.write("keynv: not logged in. Run `keynv login` first.\n");
+      this.context.stderr.write("keynv: not connected. Run `keynv` first.\n");
       return 1;
     }
     let envFileLoaded = null;
@@ -46393,7 +46429,7 @@ spelled \`--from\` to avoid the collision.)
     if (!envFileLoaded && !this.noEnvFile && !this.envFile && !process.env.KEYNV_ENV_FILE) {
       this.context.stderr.write(
         `keynv: no ${ENV_FILE_BASENAME} found in this directory or any parent.
-       Run \`keynv init\` in your project root to migrate secrets and create one.
+       Run \`keynv\` in your project root and choose "Set up this project" to create one.
 `
       );
     }
@@ -46737,7 +46773,7 @@ any prompts.
     const client = new ApiClient();
     await client.ensureHydrated();
     if (!client.isLoggedIn) {
-      this.context.stderr.write("keynv: not logged in. Run `keynv login` first.\n");
+      this.context.stderr.write("keynv: not connected. Run `keynv` first.\n");
       return 1;
     }
     const hasEnvFile = this.envFile != null;
@@ -47242,7 +47278,7 @@ var WhoamiCommand = class extends Command {
       const client = new ApiClient();
       await client.ensureHydrated();
       if (!client.isLoggedIn) {
-        this.context.stderr.write("keynv: not logged in. Run `keynv login`.\n");
+        this.context.stderr.write("keynv: not connected. Run `keynv`.\n");
         return 1;
       }
       const data = await client.request("/v1/whoami");
@@ -47819,11 +47855,11 @@ Non-interactive with --yes to skip prompts.
     this.context.stdout.write("       --owner-email alice@example.com \\\n");
     this.context.stdout.write('       --owner-password "<a long random password>" \\\n');
     this.context.stdout.write('       --org-name "Acme Inc"\n');
-    this.context.stdout.write("  3. Install the CLI and log in:\n");
+    this.context.stdout.write("  3. Install the CLI and connect from the TUI:\n");
     this.context.stdout.write("     npm install -g @keynv/cli\n");
-    this.context.stdout.write("     keynv login --server https://keynv.example.com\n");
-    this.context.stdout.write("  4. Onboard your first project:\n");
-    this.context.stdout.write("     cd your-project && keynv init\n");
+    this.context.stdout.write("     keynv\n");
+    this.context.stdout.write("  4. Onboard your first project from the same TUI:\n");
+    this.context.stdout.write("     cd your-project && keynv\n");
     if (this.compose) {
       const composeContent = `# keynv server + Litestream sidecar
 # Generated by \`keynv server init\`.
@@ -48409,7 +48445,7 @@ the error message.
     const client = new ApiClient();
     await client.ensureHydrated();
     if (!client.isLoggedIn) {
-      this.context.stderr.write("keynv: not logged in. Run `keynv login` first.\n");
+      this.context.stderr.write("keynv: not connected. Run `keynv` first.\n");
       return 1;
     }
     let value;