bluekiwi 0.3.20 → 0.3.21

package/dist/commands/init.js

@@ -41,6 +41,7 @@ export async function initCommand(options = {}) {
     // Load existing config for pre-filling prompts
     const existingCfg = loadConfig() ?? createEmptyConfig();
     let existingProfile = getProfile(existingCfg, profileName);
+    const activeProfile = getProfile(existingCfg, existingCfg.active_profile);
     let server = normalizeEnvValue(options.server) ??
         normalizeEnvValue(process.env.BLUEKIWI_API_URL) ??
         normalizeEnvValue(process.env.BLUEKIWI_SERVER);
@@ -58,21 +59,23 @@ export async function initCommand(options = {}) {
             existingProfile = getProfile(existingCfg, profileName);
         }
     }
-    if (!isNonInteractive && (server === undefined || apiKey === undefined)) {
-        const questions = [];
-        if (server === undefined) {
-            questions.push({
+    if (!isNonInteractive) {
+        if (options.server === undefined) {
+            const serverAnswer = await prompts({
                 type: "text",
                 name: "server",
                 message: "BlueKiwi server URL",
-                initial: existingProfile?.profile.server_url,
+                initial: existingProfile?.profile.server_url ??
+                    activeProfile?.profile.server_url ??
+                    server,
             });
+            server = normalizeEnvValue(serverAnswer.server) ?? server;
         }
         if (apiKey === undefined) {
             const maskedKey = existingProfile?.profile.api_key
                 ? maskApiKey(existingProfile.profile.api_key)
                 : undefined;
-            questions.push({
+            const apiKeyAnswer = await prompts({
                 type: "text",
                 name: "apiKey",
                 message: maskedKey
@@ -80,15 +83,7 @@ export async function initCommand(options = {}) {
                     : "API key (bk_...)",
                 initial: maskedKey,
             });
-        }
-        const answers = await prompts(questions);
-        server ??= answers.server;
-        // If user kept the masked key (just pressed Enter), restore original
-        if (apiKey === undefined) {
-            const entered = answers.apiKey;
-            const maskedKey = existingProfile?.profile.api_key
-                ? maskApiKey(existingProfile.profile.api_key)
-                : undefined;
+            const entered = apiKeyAnswer.apiKey;
             if (entered && maskedKey && entered === maskedKey) {
                 apiKey = existingProfile.profile.api_key;
             }

package/dist/index.js

@@ -24,41 +24,43 @@ const program = new Command();
 program
     .name("bluekiwi")
     .description("BlueKiwi CLI — connect your agent runtime to a BlueKiwi server")
-    .version(pkg.version);
+    .helpOption("-h, --help", "display help for command")
+    .version(pkg.version, "-v, --version", "display version number");
 program
     .command("accept <token>")
-    .requiredOption("--server <url>", "BlueKiwi server URL")
-    .option("--profile <name>", "Profile name (default: default)")
-    .option("--username <name>", "Username (non-interactive)")
-    .option("--password <pass>", "Password (non-interactive)")
+    .requiredOption("-s, --server <url>", "BlueKiwi server URL")
+    .option("-p, --profile <name>", "Profile name (default: default)")
+    .option("-u, --username <name>", "Username (non-interactive)")
+    .option("-w, --password <pass>", "Password (non-interactive)")
     .action(acceptCommand);
 program
     .command("init")
-    .option("--server <url>", "BlueKiwi server URL")
-    .option("--api-key <key>", "API key (bk_...)")
-    .option("--profile <name>", "Profile name (default: default)")
-    .option("--runtime <name>", "Runtime to install into (repeatable, or comma-separated)", collectRuntimes, [])
-    .option("--yes", "Suppress all prompts (non-interactive)")
+    .option("-s, --server <url>", "BlueKiwi server URL")
+    .option("-k, --api-key <key>", "API key (bk_...)")
+    .option("--apikey <key>", "Alias for --api-key")
+    .option("-p, --profile <name>", "Profile name (default: default)")
+    .option("-r, --runtime <name>", "Runtime to install into (repeatable, or comma-separated)", collectRuntimes, [])
+    .option("-y, --yes", "Suppress all prompts (non-interactive)")
     .action((opts) => initCommand({
     server: opts.server,
-    apiKey: opts.apiKey,
+    apiKey: opts.apiKey ?? opts.apikey,
     runtimes: opts.runtime?.length ? opts.runtime : undefined,
     profile: opts.profile,
     yes: opts.yes,
 }));
 program
     .command("status")
-    .option("--profile <name>", "Profile name (default: active profile)")
+    .option("-p, --profile <name>", "Profile name (default: active profile)")
     .action((opts) => statusCommand(opts.profile));
 program.command("upgrade").action(upgradeCommand);
 program
     .command("logout")
-    .option("--profile <name>", "Remove only one profile")
+    .option("-p, --profile <name>", "Remove only one profile")
     .action((opts) => logoutCommand(opts.profile));
 program.command("runtimes").action(runtimesCommand.list);
 program
     .command("runtimes:add <name>")
-    .option("--profile <name>", "Profile to install into runtimes and set active")
+    .option("-p, --profile <name>", "Profile to install into runtimes and set active")
     .action((name, opts) => runtimesCommand.add(name, opts.profile));
 program.command("runtimes:remove <name>").action(runtimesCommand.remove);
 program.command("profile").action(profileCommand.list);
@@ -66,6 +68,18 @@ program.command("profile:list").action(profileCommand.list);
 program.command("profile:use <name>").action(profileCommand.use);
 program.command("profile:remove <name>").action(profileCommand.remove);
 program.command("dev-link").action(devLinkCommand);
+program.command("help [command]").action((command) => {
+    if (!command) {
+        program.outputHelp();
+        return;
+    }
+    const target = program.commands.find((cmd) => cmd.name() === command || cmd.aliases().includes(command));
+    if (!target) {
+        console.error(`Unknown command '${command}'`);
+        process.exit(1);
+    }
+    target.outputHelp();
+});
 program.parseAsync(process.argv).catch((err) => {
     console.error(err.message);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bluekiwi",
-  "version": "0.3.20",
+  "version": "0.3.21",
   "description": "BlueKiwi CLI — install MCP client and skills into your agent runtime",
   "license": "MIT",
   "repository": {