setclaw 1.3.0 → 1.3.2

package/README.md

@@ -65,6 +65,23 @@ npm i -g setclaw
 setclaw <your-quatarly-api-key>
 ```
 
+### What it does
+
+- ✔ Backs up your current env vars and Factory config to `~/.setclaw/backup.json`
+- ✔ Adds all 11 models to Factory AI Droid
+- ✔ Sets env vars **system-wide** (all users) — falls back to current user if no admin rights
+- ✔ Works on Windows, macOS, and Linux
+
+### Restore Original Settings
+
+Made a mistake or want to undo everything?
+
+```bash
+setclaw --restore
+```
+
+This removes all env vars setclaw set and restores your original Factory config from the backup.
+
 ---
 
 ## Using Claude Code
@@ -157,7 +174,18 @@ Then create an account at [app.factory.ai](https://app.factory.ai), run `droid`
 <details>
 <summary><b>Can I run it again with a different API key?</b></summary>
 
-Yes. Just run `npx setclaw@latest <new-key>` again — it updates existing models and env vars without creating duplicates. A backup of your Factory settings is saved before any changes.
+Yes. Just run `npx setclaw@latest <new-key>` or `setclaw <new-key>` again — it updates existing models and env vars without creating duplicates. A fresh backup is saved before every run.
+
+</details>
+
+<details>
+<summary><b>How do I restore my original settings?</b></summary>
+
+```bash
+setclaw --restore
+```
+
+This reverts all env vars to their pre-setclaw values and restores your original Factory config from `~/.setclaw/backup.json`.
 
 </details>
 

package/bin/setclaw.js

@@ -56,7 +56,10 @@ out("");
 
 const args    = process.argv.slice(2);
 const restore = args.includes("--restore");
-const apiKey  = !restore ? (process.env.QUATARLY_API_KEY || args.find(a => !a.startsWith("--"))) : null;
+
+// Only treat an arg as API key if it doesn't start with - and looks like a key
+const keyArg  = args.find(a => !a.startsWith("-") && a.length > 8);
+const apiKey  = !restore ? (process.env.QUATARLY_API_KEY || keyArg) : null;
 
 // ─── First-run detection ──────────────────────────────────────────────
 
@@ -68,36 +71,16 @@ const isFirstRun = !isNpx && existsSync(MARKER_FILE);
 // ════════════════════════════════════════════════════════════════════
 
 if (restore) {
-  if (!existsSync(BACKUP_FILE)) {
-    fail("No backup found. Nothing to restore.");
-    process.exit(1);
-  }
-
-  const backup = JSON.parse(readFileSync(BACKUP_FILE, "utf-8"));
-  log("Restoring original environment variables...");
+  log("Removing setclaw environment variables...");
 
   if (OS === "win32") {
     for (const key of VAR_KEYS) {
-      if (backup.env[key] !== undefined) {
-        // Restore to both user and system
-        try {
-          execSync(`reg add "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment" /v "${key}" /t REG_SZ /d "${backup.env[key]}" /f`, { stdio: "ignore" });
-        } catch {}
-        execSync(`reg add "HKCU\\Environment" /v "${key}" /t REG_SZ /d "${backup.env[key]}" /f`, { stdio: "ignore" });
-        ok(`Restored ${key} = ${backup.env[key] || "(empty)"}`);
-      } else {
-        // Was not set before — delete it
-        try {
-          execSync(`reg delete "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment" /v "${key}" /f`, { stdio: "ignore" });
-        } catch {}
-        try {
-          execSync(`reg delete "HKCU\\Environment" /v "${key}" /f`, { stdio: "ignore" });
-        } catch {}
-        ok(`Removed ${key} (was not set before)`);
-      }
+      // Delete from both HKLM and HKCU — don't "restore", just remove
+      try { execSync(`reg delete "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment" /v "${key}" /f`, { stdio: "ignore" }); } catch {}
+      try { execSync(`reg delete "HKCU\\Environment" /v "${key}" /f`, { stdio: "ignore" }); } catch {}
+      ok(`Removed ${key}`);
     }
   } else {
-    // Remove setclaw block from all rc files
     const marker    = "# --- Quatarly / Claude Code env ---";
     const endMarker = "# --- end Quatarly ---";
     const rcFiles   = ["/etc/environment", "/etc/zshenv", "/etc/bash.bashrc",
@@ -114,12 +97,17 @@ if (restore) {
     }
   }
 
-  // Restore Factory settings
+  // Restore Factory settings from backup if it exists
   const factoryPath = join(HOME, ".factory", "settings.json");
-  if (backup.factory && existsSync(factoryPath)) {
-    log("Restoring Factory settings...");
-    writeFileSync(factoryPath, JSON.stringify(backup.factory, null, 2), "utf-8");
-    ok("Factory settings restored.");
+  if (existsSync(BACKUP_FILE)) {
+    const backup = JSON.parse(readFileSync(BACKUP_FILE, "utf-8"));
+    if (backup.factory && existsSync(factoryPath)) {
+      log("Restoring Factory settings...");
+      writeFileSync(factoryPath, JSON.stringify(backup.factory, null, 2), "utf-8");
+      ok("Factory settings restored.");
+    }
+  } else {
+    warn("No backup found — env vars removed, Factory settings unchanged.");
   }
 
   // Clean up backup
@@ -155,30 +143,11 @@ if (!key) { fail("API key cannot be empty."); process.exit(1); }
 
 err("");
 
-// ─── Backup current state ─────────────────────────────────────────────
+// ─── Backup current state (Factory config only) ───────────────────────
 
 mkdirSync(BACKUP_DIR, { recursive: true });
 
-const backup = { env: {}, factory: null };
-
-if (OS === "win32") {
-  for (const k of VAR_KEYS) {
-    try {
-      const val = execSync(`reg query "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment" /v "${k}" 2>nul`, { encoding: "utf-8" });
-      const match = val.match(/REG_SZ\s+(.+)/);
-      backup.env[k] = match ? match[1].trim() : "";
-    } catch {
-      // Also try HKCU
-      try {
-        const val = execSync(`reg query "HKCU\\Environment" /v "${k}" 2>nul`, { encoding: "utf-8" });
-        const match = val.match(/REG_SZ\s+(.+)/);
-        backup.env[k] = match ? match[1].trim() : "";
-      } catch {
-        backup.env[k] = undefined; // Was not set
-      }
-    }
-  }
-}
+const backup = { factory: null };
 
 // Backup Factory settings
 const factoryPath = join(HOME, ".factory", "settings.json");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setclaw",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "BOA & Quatarly setup for Claude Code and Factory",
   "type": "module",
   "bin": {