macaw-ai 0.9.10 → 0.9.12

package/README.md

@@ -42,8 +42,10 @@ because it has no path to the place approvals are given.
 Anthropic, LangChain, MCP, LiteLLM and Pydantic AI, with the examples ready to
 run.
 
-Both are free, and both create a workspace on first run: a link appears in
-your terminal, you approve it in a browser, and that is the account.
+Both are free. The first install creates a workspace: a link appears in your
+terminal, you approve it in a browser, and that is the account. Later installs
+find that key and join the same workspace, so choosing both surfaces above
+asks you once, not twice.
 
 ## Licence
 

package/bin/macaw.js

@@ -1,26 +1,32 @@
 #!/usr/bin/env node
-// `npx macaw-ai install` - the one name to remember. It installs nothing
-// itself; it asks which surface you want governed and hands off to the
-// package that does that one thing.
+// `macaw-ai install` - the one name to remember. It installs nothing itself;
+// it asks which surface you want governed and hands off to the package that
+// does that one thing.
 //
 // Kept separate from those packages so this name never has to narrow. It
 // means "MACAW" today and will still mean it when there are six surfaces.
 
 import { spawnSync } from "node:child_process";
 import { createInterface } from "node:readline/promises";
+import fs from "node:fs";
+import path from "node:path";
 
 const SURFACES = [
   {
     key: "1",
     pkg: "@macaw-ai/coding-agents",
-    label: "Claude Code and Codex on this machine",
+    label: "Claude Code and Codex",
     detail: "every tool call stops at a hook and waits for a decision",
+    command: "macaw-sidecar",
+    subcommand: true,
   },
   {
     key: "2",
     pkg: "@macaw-ai/client",
-    label: "a Python project",
-    detail: "the SDK and adapters, for agents you write yourself",
+    label: "the MACAW SDK Client Library and secureAI adapters",
+    detail: "drop-in adapters for popular agentic frameworks",
+    command: "macaw-client",
+    subcommand: true,
   },
 ];
 
@@ -28,12 +34,58 @@ const C = process.stdout.isTTY
   ? { b: "\x1b[1m", dim: "\x1b[2m", c: "\x1b[36m", x: "\x1b[0m" }
   : { b: "", dim: "", c: "", x: "" };
 
-function run(pkg, args) {
-  console.log(`\n${C.dim}  → npx ${pkg} ${args.join(" ")}${C.x}\n`);
-  const r = spawnSync("npx", ["-y", pkg, ...args], { stdio: "inherit" });
+function sh(cmd, args, env) {
+  console.log(`\n${C.dim}  → ${cmd} ${args.join(" ")}${C.x}\n`);
+  const r = spawnSync(cmd, args, { stdio: "inherit", env: { ...process.env, ...env } });
   return r.status ?? 1;
 }
 
+// Installed, then run by name. npx links no commands, so the launchers it
+// leaves behind can only be reached by their full path inside an npm cache
+// directory - which is how an install ended up telling people to type ninety
+// characters.
+function run(surface, args, env) {
+  const code = sh("npm", ["install", "-g", surface.pkg], env);
+  if (code !== 0) return code;
+  const rest = surface.subcommand ? args : args.filter((a) => a !== "install");
+  return sh(surface.command, rest, env);
+}
+
+// The coding-agents installer writes its key here. Reading it back lets the
+// second surface join that workspace without asking for a key the user
+// approved thirty seconds earlier.
+function keyFromThisDirectory() {
+  try {
+    const cfg = JSON.parse(fs.readFileSync(path.join(process.cwd(), ".macaw", "config.json"), "utf8"));
+    if (typeof cfg?.api_key === "string" && cfg.api_key.startsWith("mw_")) {
+      return { MACAW_API_KEY: cfg.api_key, MACAW_WORKSPACE: cfg.workspace || "" };
+    }
+  } catch {
+    // No install here, or not readable. The next installer asks, as it would.
+  }
+  return undefined;
+}
+
+// Both surfaces, in this order. Coding agents first because that install is
+// the one that creates the workspace, and the key it writes is then handed to
+// the client rather than asked for again.
+//
+// The order is load-bearing the other way too: coding-agents writes
+// $PWD/.macaw/config.json, which the client's lookup reads. The client writes
+// into a subdirectory it chooses, which nothing else can be expected to find.
+function both(args) {
+  const steps = args.length ? args : ["install"];
+  for (const [i, s] of SURFACES.entries()) {
+    // Two installers each printing their own banner reads as the thing having
+    // restarted. Say which step this is.
+    console.log("");
+    console.log(`${C.b}  ── ${i + 1} of ${SURFACES.length} · ${s.label} ──${C.x}`);
+    const code = run(s, steps, i === 0 ? undefined : keyFromThisDirectory());
+    if (code !== 0) return code;
+  }
+  return 0;
+}
+
 async function main() {
   const args = process.argv.slice(2);
 
@@ -41,7 +93,14 @@ async function main() {
   //   macaw-ai install --coding-agents
   const named = SURFACES.find((s) => args.includes(`--${s.pkg.split("/")[1]}`));
   if (named) {
-    process.exit(run(named.pkg, args.filter((a) => !a.startsWith("--macaw") && a !== `--${named.pkg.split("/")[1]}`)));
+    process.exit(run(named, args.filter((a) => !a.startsWith("--macaw") && a !== `--${named.pkg.split("/")[1]}`)));
+  }
+
+  //   macaw-ai install --both
+  // The menu's third choice, as a flag. The other two already have one, and
+  // without this there is no way to ask for both without a terminal.
+  if (args.includes("--both")) {
+    process.exit(both(args.filter((a) => a !== "--both")));
   }
 
   console.log("");
@@ -60,7 +119,9 @@ async function main() {
   // something nobody asked for. Say what to type instead.
   if (!process.stdin.isTTY) {
     console.log("  Nothing is attached to answer, so pick one directly:");
-    for (const s of SURFACES) console.log(`      npx ${s.pkg} install`);
+    for (const s of SURFACES) {
+      console.log(`      npm install -g ${s.pkg} && ${s.command}${s.subcommand ? " install" : ""}`);
+    }
     console.log("");
     process.exit(1);
   }
@@ -70,20 +131,14 @@ async function main() {
   rl.close();
 
   const rest = args.length ? args : ["install"];
-  if (choice === "3") {
-    for (const s of SURFACES) {
-      const code = run(s.pkg, rest);
-      if (code !== 0) process.exit(code);
-    }
-    process.exit(0);
-  }
+  if (choice === "3") process.exit(both(rest));
 
   const picked = SURFACES.find((s) => s.key === choice);
   if (!picked) {
     console.log("  Not a choice.");
     process.exit(1);
   }
-  process.exit(run(picked.pkg, rest));
+  process.exit(run(picked, rest));
 }
 
 main().catch((e) => { console.error(e.message); process.exit(1); });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macaw-ai",
-  "version": "0.9.10",
+  "version": "0.9.12",
   "description": "Deterministic controls for agents. Ask MACAW to govern your coding agent or your Python project, and it installs the right thing.",
   "type": "module",
   "bin": {