@macaw-ai/client 0.9.11 → 0.9.13

package/bin/install.js

@@ -254,7 +254,24 @@ async function activate() {
 
 // ------------------------------------------------------------------ main ---
 
+function usage() {
+  console.log("");
+  console.log(`${C.b}  macaw-client${C.x} - the MACAW SDK and the secureAI adapters`);
+  console.log("");
+  console.log("    macaw-client install              pick a Python, install the wheels,");
+  console.log("                                      lay down the examples");
+  console.log("    macaw-client install --activate   the same, with a new workspace");
+  console.log("    macaw-client --check              report what it would do, change nothing");
+  console.log("");
+  process.exit(1);
+}
+
 async function main() {
+  // A verb, like `macaw-sidecar install`. Bare, this used to pip install into
+  // an interpreter and write a directory with nothing asked for.
+  const argv = process.argv.slice(2);
+  if (!argv.includes("--check") && !argv.includes("install")) usage();
+
   console.log("");
   console.log(`${C.b}  MACAW${C.x}`);
   console.log("");
@@ -328,27 +345,54 @@ async function main() {
     console.log(`      ${C.c}MACAW_PYTHON=${dflt.display} npx @macaw-ai/client install${C.x}`);
   }
 
-  // 3 — a key, or a workspace
+  // 3 — the workspace. The same three choices, in the same words, as the
+  // coding-agents installer: the step that confused people was this one
+  // deciding for them and saying so afterwards.
   console.log("");
+  console.log(`${C.b}  Workspace${C.x}`);
   const found = existingKey(dir);
   let workspace = found?.workspace || "";
   let key;
 
   if (found?.explicit) {
+    // Handed to us rather than discovered - nothing to confirm.
     key = found.key;
     ok(found.workspace ? `Same workspace: ${found.workspace}` : "Using the key passed in");
-  } else if (found) {
-    info(`A key is already on this machine: ${found.from}`);
-    key = await ask(`  API Key ${C.dim}[Enter joins that workspace]${C.x} `, found.key);
   } else if (!process.stdin.isTTY) {
-    // Without this the default is "", which starts a device activation,
-    // prints a link nobody is watching, and blocks for ten minutes.
-    no("No key found, and nothing is attached to approve a new workspace.");
-    info("Run this in a terminal, or pass a key: MACAW_API_KEY=mw_... npx @macaw-ai/client install");
-    rl.close();
-    process.exit(1);
+    if (!found) {
+      no("No key found, and nothing is attached to answer.");
+      info("Pass one:  MACAW_API_KEY=mw_... npx @macaw-ai/client install");
+      rl.close();
+      process.exit(1);
+    }
+    key = found.key;
+    ok(found.from);
   } else {
-    key = await ask(`  API Key ${C.dim}[Enter creates a new workspace]${C.x} `, "");
+    console.log("");
+    console.log("    1) Use a key already on this machine");
+    console.log("    2) Paste an API key");
+    console.log("    3) Create a new workspace");
+    console.log("");
+    const choice = (await ask("    Choose [1]: ", "1")) || "1";
+
+    if (choice === "1" && found) {
+      key = found.key;
+      ok(found.from);
+    } else if (choice === "1") {
+      console.log(`  ${C.y}⚠${C.x} No key found.`);
+      console.log("      Looked in: $MACAW_API_KEY, $MACAW_HOME, this directory, ~/.macaw");
+      console.log("      Creating a new workspace instead.");
+      key = "";
+    } else if (choice === "2") {
+      key = await ask("    API Key: ", "");
+      if (!key) { no("Nothing entered."); rl.close(); process.exit(1); }
+    } else if (choice === "3") {
+      key = "";
+    } else {
+      no("Not a choice.");
+      rl.close();
+      process.exit(1);
+    }
   }
 
   if (key === "") {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@macaw-ai/client",
-  "version": "0.9.11",
+  "version": "0.9.13",
   "description": "Set up the MACAW client for a Python project: installs the SDK and adapters, creates a workspace, leaves the examples ready to run.",
   "type": "module",
   "bin": {
-    "macaw-client-install": "bin/install.js"
+    "macaw-client": "bin/install.js"
   },
   "files": [
     "bin/install.js",