macaw-ai 0.9.14 → 0.9.16

package/README.md

@@ -4,14 +4,15 @@ Deterministic controls for agents. One command, and it asks what you want
 governed.
 
 ```bash
-npx macaw-ai install
+npx macaw-ai install --system     # every directory, for you; the sidecar runs as a service
+npx macaw-ai install --local      # this project only
 ```
 
 ```
-  1) Claude Code and Codex on this machine
+  1) Claude Code and Codex
      every tool call stops at a hook and waits for a decision
-  2) a Python project
-     the SDK and adapters, for agents you write yourself
+  2) the MACAW SDK Client Library and secureAI adapters
+     drop-in adapters for popular agentic frameworks
   3) both
 ```
 
@@ -19,15 +20,15 @@ It installs nothing itself — it hands off to the package that does that one
 thing. Name the surface and it asks nothing:
 
 ```bash
-npx macaw-ai install --coding-agents
+npx macaw-ai install --coding-agents --system
 npx macaw-ai install --client
 ```
 
 Or go straight there:
 
 ```bash
-npx @macaw-ai/coding-agents install
-npx @macaw-ai/client install
+npm install -g @macaw-ai/coding-agents && macaw-sidecar install --system
+npm install -g @macaw-ai/client && macaw-client install
 ```
 
 ## What each one does

package/bin/macaw.js

@@ -9,6 +9,7 @@
 import { spawnSync } from "node:child_process";
 import { createInterface } from "node:readline/promises";
 import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 
 const SURFACES = [
@@ -19,6 +20,7 @@ const SURFACES = [
     detail: "every tool call stops at a hook and waits for a decision",
     command: "macaw-sidecar",
     subcommand: true,
+    hint: "install --local   (or --system: every directory, as a service)",
   },
   {
     key: "2",
@@ -27,6 +29,7 @@ const SURFACES = [
     detail: "drop-in adapters for popular agentic frameworks",
     command: "macaw-client",
     subcommand: true,
+    hint: "install",
   },
 ];
 
@@ -51,17 +54,22 @@ function run(surface, args, env) {
   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 || "" };
+// The coding-agents installer writes its key here: in this directory for
+// --local, in the home directory for --system. Reading it back lets the second
+// surface join that workspace without asking for a key the user approved
+// thirty seconds earlier. The scope decides which to read first, so a project
+// install left in this directory cannot stand in for the one just made.
+function keyFromInstall(args) {
+  const dirs = args.includes("--system") ? [os.homedir(), process.cwd()] : [process.cwd(), os.homedir()];
+  for (const dir of dirs) {
+    try {
+      const cfg = JSON.parse(fs.readFileSync(path.join(dir, ".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 there, or not readable. The next installer asks, as it would.
     }
-  } catch {
-    // No install here, or not readable. The next installer asks, as it would.
   }
   return undefined;
 }
@@ -71,7 +79,7 @@ function keyFromThisDirectory() {
 // 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
+// .macaw/config.json where keyFromInstall looks for it. 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"];
@@ -80,7 +88,7 @@ function both(args) {
     // 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());
+    const code = run(s, steps, i === 0 ? undefined : keyFromInstall(steps));
     if (code !== 0) return code;
   }
   return 0;
@@ -120,7 +128,7 @@ async function main() {
   if (!process.stdin.isTTY) {
     console.log("  Nothing is attached to answer, so pick one directly:");
     for (const s of SURFACES) {
-      console.log(`      npm install -g ${s.pkg} && ${s.command}${s.subcommand ? " install" : ""}`);
+      console.log(`      npm install -g ${s.pkg} && ${s.command} ${s.hint}`);
     }
     console.log("");
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macaw-ai",
-  "version": "0.9.14",
+  "version": "0.9.16",
   "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": {