openhome-cli 0.1.8 → 0.1.10

package/dist/cli.js

@@ -291,8 +291,17 @@ function openBrowser(url) {
 }
 async function loginCommand() {
   p.intro("\u{1F511} OpenHome Login");
+  p.note(
+    [
+      "Your API key is a private password that lets this CLI talk to your",
+      "OpenHome account. You can find it on your settings page.",
+      "",
+      `Press Enter and we'll open it for you \u2014 click the ${chalk2.bold("API Keys")} tab.`
+    ].join("\n"),
+    "Step 1 of 2 \u2014 Connect your account"
+  );
   const openSettings = await p.confirm({
-    message: `Press Enter to open your browser and navigate to the ${chalk2.bold("API Keys")} tab`,
+    message: "Ready? Press Enter to open your browser",
     initialValue: true,
     active: "Open browser",
     inactive: "Skip"
@@ -341,16 +350,33 @@ async function loginCommand() {
   p.note(
     [
       "To manage your abilities (list, delete, enable/disable) from the CLI,",
-      "you need one more thing: a session token.",
+      "you need one more thing: a session token. This takes ~30 seconds",
+      "and you only do it once.",
+      "",
+      `${chalk2.bold("Here's what you'll do:")}`,
+      "",
+      `${chalk2.bold("1.")}  We'll open ${chalk2.bold("app.openhome.com")} \u2014 make sure you're logged in`,
+      "",
+      `${chalk2.bold("2.")}  Open the browser console:`,
+      `     Mac \u2192 ${chalk2.cyan("Cmd + Option + J")}`,
+      `     Windows / Linux \u2192 ${chalk2.cyan("F12")} then click ${chalk2.cyan("Console")}`,
+      "",
+      `${chalk2.bold("3.")}  Chrome may show this warning \u2014 it's expected:`,
+      `     ${chalk2.yellow(`"Don't paste code you don't understand..."`)}`,
+      `     Type ${chalk2.cyan("allow pasting")} and press Enter to dismiss it.`,
+      "",
+      `${chalk2.bold("4.")}  Paste this command and press Enter:`,
+      "",
+      `     ${chalk2.green("copy(localStorage.getItem('token'))")}`,
       "",
-      `This takes about ${chalk2.bold("30 seconds")} and you only do it once.`
+      `${chalk2.bold("5.")}  Your token is copied to clipboard \u2014 paste it back here.`
     ].join("\n"),
-    "One more step"
+    "Enable management features (one-time setup)"
   );
   const doJwt = await p.confirm({
-    message: "Set up management access now?",
+    message: "Ready? Press Enter to open your browser and follow the steps above",
     initialValue: true,
-    active: "Yes, do it now",
+    active: "Open browser",
     inactive: "Skip for now"
   });
   handleCancel(doJwt);
@@ -366,39 +392,11 @@ async function loginCommand() {
 }
 async function setupJwt() {
   const { saveJwt: saveJwt2 } = await import("./store-USDMWKXY.js");
-  const openApp = await p.confirm({
-    message: `Press Enter to open ${chalk2.bold("app.openhome.com")} in your browser`,
-    initialValue: true,
-    active: "Open browser",
-    inactive: "Skip"
-  });
-  handleCancel(openApp);
-  if (openApp) {
-    openBrowser(OPENHOME_APP_URL);
-    console.log(
-      `
-  ${chalk2.dim(`Opened ${chalk2.bold("app.openhome.com")} \u2014 make sure you're logged in`)}
+  openBrowser(OPENHOME_APP_URL);
+  console.log(
+    `
+  ${chalk2.dim(`Opened ${chalk2.bold("app.openhome.com")} \u2014 follow the steps above`)}
 `
-    );
-  }
-  p.note(
-    [
-      `${chalk2.bold("1.")}  Open the browser console:`,
-      `     Mac \u2192 press ${chalk2.cyan("Cmd + Option + J")}`,
-      `     Windows / Linux \u2192 press ${chalk2.cyan("F12")}, then click ${chalk2.cyan("Console")}`,
-      "",
-      `${chalk2.bold("2.")}  Chrome may show a warning:`,
-      `     ${chalk2.yellow(`"Don't paste code you don't understand..."`)}`,
-      `     If so, type ${chalk2.cyan("allow pasting")} and press ${chalk2.bold("Enter")} first.`,
-      "",
-      `${chalk2.bold("3.")}  Paste this command and press ${chalk2.bold("Enter")}:`,
-      "",
-      `     ${chalk2.green("copy(localStorage.getItem('token'))")}`,
-      "",
-      `${chalk2.bold("4.")}  Your token is now copied to your clipboard.`,
-      `     Come back here and paste it below.`
-    ].join("\n"),
-    "How to get your session token"
   );
   const token = await p.password({
     message: "Paste your session token here",
@@ -3148,9 +3146,10 @@ async function logsCommand(opts = {}) {
 }
 
 // src/commands/set-jwt.ts
+import chalk13 from "chalk";
 async function setJwtCommand(token) {
+  p.intro("\u{1F511} Enable Management Features");
   if (token) {
-    p.intro("\u{1F511} Enable Management Features");
     try {
       saveJwt(token.trim());
       success("Session token saved.");
@@ -3165,14 +3164,46 @@ async function setJwtCommand(token) {
     }
     return;
   }
-  p.intro("\u{1F511} Enable Management Features");
+  p.note(
+    [
+      "Here's what you'll do:",
+      "",
+      `${chalk13.bold("1.")}  We'll open ${chalk13.bold("app.openhome.com")} \u2014 make sure you're logged in`,
+      "",
+      `${chalk13.bold("2.")}  Open the browser console:`,
+      `     Mac \u2192 ${chalk13.cyan("Cmd + Option + J")}`,
+      `     Windows / Linux \u2192 ${chalk13.cyan("F12")} then click ${chalk13.cyan("Console")}`,
+      "",
+      `${chalk13.bold("3.")}  Chrome may show this warning \u2014 it's expected:`,
+      `     ${chalk13.yellow(`"Don't paste code you don't understand..."`)}`,
+      `     Type ${chalk13.cyan("allow pasting")} and press Enter to dismiss it.`,
+      "",
+      `${chalk13.bold("4.")}  Paste this command and press Enter:`,
+      "",
+      `     ${chalk13.green("copy(localStorage.getItem('token'))")}`,
+      "",
+      `${chalk13.bold("5.")}  Your token is copied to clipboard \u2014 paste it back here.`
+    ].join("\n"),
+    "Enable management features (one-time setup)"
+  );
+  const ready = await p.confirm({
+    message: "Ready? Press Enter to open your browser and follow the steps above",
+    initialValue: true,
+    active: "Open browser",
+    inactive: "Cancel"
+  });
+  handleCancel(ready);
+  if (!ready) {
+    p.cancel("Cancelled.");
+    return;
+  }
   await setupJwt();
-  p.outro("Done.");
+  p.outro("Management features are now unlocked.");
 }
 
 // src/commands/validate.ts
 import { resolve as resolve5 } from "path";
-import chalk13 from "chalk";
+import chalk14 from "chalk";
 async function validateCommand(pathArg = ".") {
   const targetDir = resolve5(pathArg);
   p.intro(`\u{1F50E} Validate ability`);
@@ -3188,7 +3219,7 @@ async function validateCommand(pathArg = ".") {
   if (result.errors.length > 0) {
     p.note(
       result.errors.map(
-        (issue) => `${chalk13.red("\u2717")} ${issue.file ? chalk13.bold(`[${issue.file}]`) + " " : ""}${issue.message}`
+        (issue) => `${chalk14.red("\u2717")} ${issue.file ? chalk14.bold(`[${issue.file}]`) + " " : ""}${issue.message}`
       ).join("\n"),
       `${result.errors.length} Error(s)`
     );
@@ -3196,7 +3227,7 @@ async function validateCommand(pathArg = ".") {
   if (result.warnings.length > 0) {
     p.note(
       result.warnings.map(
-        (w) => `${chalk13.yellow("\u26A0")} ${w.file ? chalk13.bold(`[${w.file}]`) + " " : ""}${w.message}`
+        (w) => `${chalk14.yellow("\u26A0")} ${w.file ? chalk14.bold(`[${w.file}]`) + " " : ""}${w.message}`
       ).join("\n"),
       `${result.warnings.length} Warning(s)`
     );
@@ -3242,9 +3273,9 @@ async function checkForUpdates() {
       );
       process.exit(0);
     } else {
-      const { default: chalk14 } = await import("chalk");
+      const { default: chalk15 } = await import("chalk");
       console.log(
-        chalk14.yellow(
+        chalk15.yellow(
           `  Update available: v${version} \u2192 v${latest}   Run: npm install -g openhome-cli@latest
 `
         )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openhome-cli",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "CLI for managing OpenHome voice AI abilities",
   "type": "module",
   "bin": {

package/src/commands/login.ts

@@ -26,8 +26,18 @@ export async function loginCommand(): Promise<void> {
   p.intro("🔑 OpenHome Login");
 
   // Step 1: API key
+  p.note(
+    [
+      "Your API key is a private password that lets this CLI talk to your",
+      "OpenHome account. You can find it on your settings page.",
+      "",
+      `Press Enter and we'll open it for you — click the ${chalk.bold("API Keys")} tab.`,
+    ].join("\n"),
+    "Step 1 of 2 — Connect your account",
+  );
+
   const openSettings = await p.confirm({
-    message: `Press Enter to open your browser and navigate to the ${chalk.bold("API Keys")} tab`,
+    message: "Ready? Press Enter to open your browser",
     initialValue: true,
     active: "Open browser",
     inactive: "Skip",
@@ -88,17 +98,35 @@ export async function loginCommand(): Promise<void> {
   p.note(
     [
       "To manage your abilities (list, delete, enable/disable) from the CLI,",
-      "you need one more thing: a session token.",
+      "you need one more thing: a session token. This takes ~30 seconds",
+      "and you only do it once.",
+      "",
+      `${chalk.bold("Here's what you'll do:")}`,
+      "",
+      `${chalk.bold("1.")}  We'll open ${chalk.bold("app.openhome.com")} — make sure you're logged in`,
+      "",
+      `${chalk.bold("2.")}  Open the browser console:`,
+      `     Mac → ${chalk.cyan("Cmd + Option + J")}`,
+      `     Windows / Linux → ${chalk.cyan("F12")} then click ${chalk.cyan("Console")}`,
       "",
-      `This takes about ${chalk.bold("30 seconds")} and you only do it once.`,
+      `${chalk.bold("3.")}  Chrome may show this warning — it's expected:`,
+      `     ${chalk.yellow("\"Don't paste code you don't understand...\"")}`,
+      `     Type ${chalk.cyan("allow pasting")} and press Enter to dismiss it.`,
+      "",
+      `${chalk.bold("4.")}  Paste this command and press Enter:`,
+      "",
+      `     ${chalk.green("copy(localStorage.getItem('token'))")}`,
+      "",
+      `${chalk.bold("5.")}  Your token is copied to clipboard — paste it back here.`,
     ].join("\n"),
-    "One more step",
+    "Enable management features (one-time setup)",
   );
 
   const doJwt = await p.confirm({
-    message: "Set up management access now?",
+    message:
+      "Ready? Press Enter to open your browser and follow the steps above",
     initialValue: true,
-    active: "Yes, do it now",
+    active: "Open browser",
     inactive: "Skip for now",
   });
   handleCancel(doJwt);
@@ -118,39 +146,9 @@ export async function loginCommand(): Promise<void> {
 export async function setupJwt(): Promise<void> {
   const { saveJwt } = await import("../config/store.js");
 
-  const openApp = await p.confirm({
-    message: `Press Enter to open ${chalk.bold("app.openhome.com")} in your browser`,
-    initialValue: true,
-    active: "Open browser",
-    inactive: "Skip",
-  });
-  handleCancel(openApp);
-
-  if (openApp) {
-    openBrowser(OPENHOME_APP_URL);
-    console.log(
-      `\n  ${chalk.dim(`Opened ${chalk.bold("app.openhome.com")} — make sure you're logged in`)}\n`,
-    );
-  }
-
-  p.note(
-    [
-      `${chalk.bold("1.")}  Open the browser console:`,
-      `     Mac → press ${chalk.cyan("Cmd + Option + J")}`,
-      `     Windows / Linux → press ${chalk.cyan("F12")}, then click ${chalk.cyan("Console")}`,
-      "",
-      `${chalk.bold("2.")}  Chrome may show a warning:`,
-      `     ${chalk.yellow("\"Don't paste code you don't understand...\"")}`,
-      `     If so, type ${chalk.cyan("allow pasting")} and press ${chalk.bold("Enter")} first.`,
-      "",
-      `${chalk.bold("3.")}  Paste this command and press ${chalk.bold("Enter")}:`,
-      "",
-      `     ${chalk.green("copy(localStorage.getItem('token'))")}`,
-      "",
-      `${chalk.bold("4.")}  Your token is now copied to your clipboard.`,
-      `     Come back here and paste it below.`,
-    ].join("\n"),
-    "How to get your session token",
+  openBrowser(OPENHOME_APP_URL);
+  console.log(
+    `\n  ${chalk.dim(`Opened ${chalk.bold("app.openhome.com")} — follow the steps above`)}\n`,
   );
 
   const token = await p.password({

package/src/commands/set-jwt.ts

@@ -1,11 +1,15 @@
-import { setupJwt } from "./login.js";
+import { setupJwt, openBrowser } from "./login.js";
 import { saveJwt } from "../config/store.js";
-import { success, error, p } from "../ui/format.js";
+import { success, error, p, handleCancel } from "../ui/format.js";
+import chalk from "chalk";
+
+const OPENHOME_APP_URL = "https://app.openhome.com";
 
 export async function setJwtCommand(token?: string): Promise<void> {
+  p.intro("🔑 Enable Management Features");
+
   // Direct usage: openhome set-jwt eyJ...
   if (token) {
-    p.intro("🔑 Enable Management Features");
     try {
       saveJwt(token.trim());
       success("Session token saved.");
@@ -21,8 +25,44 @@ export async function setJwtCommand(token?: string): Promise<void> {
     return;
   }
 
-  // Guided flow — reuse the same walkthrough from login
-  p.intro("🔑 Enable Management Features");
+  // Guided flow — show instructions first, then open browser
+  p.note(
+    [
+      "Here's what you'll do:",
+      "",
+      `${chalk.bold("1.")}  We'll open ${chalk.bold("app.openhome.com")} — make sure you're logged in`,
+      "",
+      `${chalk.bold("2.")}  Open the browser console:`,
+      `     Mac → ${chalk.cyan("Cmd + Option + J")}`,
+      `     Windows / Linux → ${chalk.cyan("F12")} then click ${chalk.cyan("Console")}`,
+      "",
+      `${chalk.bold("3.")}  Chrome may show this warning — it's expected:`,
+      `     ${chalk.yellow("\"Don't paste code you don't understand...\"")}`,
+      `     Type ${chalk.cyan("allow pasting")} and press Enter to dismiss it.`,
+      "",
+      `${chalk.bold("4.")}  Paste this command and press Enter:`,
+      "",
+      `     ${chalk.green("copy(localStorage.getItem('token'))")}`,
+      "",
+      `${chalk.bold("5.")}  Your token is copied to clipboard — paste it back here.`,
+    ].join("\n"),
+    "Enable management features (one-time setup)",
+  );
+
+  const ready = await p.confirm({
+    message:
+      "Ready? Press Enter to open your browser and follow the steps above",
+    initialValue: true,
+    active: "Open browser",
+    inactive: "Cancel",
+  });
+  handleCancel(ready);
+
+  if (!ready) {
+    p.cancel("Cancelled.");
+    return;
+  }
+
   await setupJwt();
-  p.outro("Done.");
+  p.outro("Management features are now unlocked.");
 }