@bigbrainforge/setup 3.19.0 → 3.20.0

package/dist/setup.cjs

@@ -189,6 +189,21 @@ var require_license = __commonJS({
   }
 });
 
+// ../forge-plugin/lib/sanitize-terminal.js
+var require_sanitize_terminal = __commonJS({
+  "../forge-plugin/lib/sanitize-terminal.js"(exports2, module2) {
+    var TERMINAL_CONTROL_RE = (
+      // biome-ignore lint/suspicious/noControlCharactersInRegex: matching control characters is the entire point.
+      /[\u0000-\u001F\u007F-\u009F\u00AD\u061C\u200B-\u200F\u2028-\u202E\u2060-\u2064\u2066-\u2069\uFEFF]/g
+    );
+    function sanitizeForTerminal2(value) {
+      const text = value === null || value === void 0 ? "" : String(value);
+      return text.replace(TERMINAL_CONTROL_RE, "");
+    }
+    module2.exports = { sanitizeForTerminal: sanitizeForTerminal2 };
+  }
+});
+
 // ../forge-plugin/lib/discover-instance.js
 var require_discover_instance = __commonJS({
   "../forge-plugin/lib/discover-instance.js"(exports2, module2) {
@@ -196,6 +211,14 @@ var require_discover_instance = __commonJS({
     var os2 = require("node:os");
     var path2 = require("node:path");
     var { resolveLicense } = require_license();
+    var { sanitizeForTerminal: sanitizeForTerminal2 } = require_sanitize_terminal();
+    function failure(reason, hint, extra = {}) {
+      const cleaned = {};
+      for (const [key, value] of Object.entries(extra)) {
+        cleaned[key] = typeof value === "string" ? sanitizeForTerminal2(value) : value;
+      }
+      return { ok: false, reason, hint: sanitizeForTerminal2(hint), ...cleaned };
+    }
     var DEFAULT_LICENSING_URL2 = "https://licensing.bigbrainforge.com";
     var LOOPBACK_HOSTS = /* @__PURE__ */ new Set(["127.0.0.1", "localhost", "::1", "[::1]"]);
     function isSecureUrl2(value) {
@@ -215,17 +238,12 @@ var require_discover_instance = __commonJS({
         const parsed = new URL(base);
         scheme = `${parsed.protocol}//${parsed.hostname}`;
       } catch {
-        return {
-          ok: false,
-          reason: "insecure_licensing_url",
-          hint: `FORGE_LICENSING_URL is not a valid URL: ${base}`
-        };
+        return failure("insecure_licensing_url", `FORGE_LICENSING_URL is not a valid URL: ${base}`);
       }
-      return {
-        ok: false,
-        reason: "insecure_licensing_url",
-        hint: `FORGE_LICENSING_URL must use https:// (got ${scheme}). Plain http:// is allowed only for loopback (127.0.0.1, localhost, ::1) \u2014 refusing to send the license credential in cleartext.`
-      };
+      return failure(
+        "insecure_licensing_url",
+        `FORGE_LICENSING_URL must use https:// (got ${scheme}). Plain http:// is allowed only for loopback (127.0.0.1, localhost, ::1) \u2014 refusing to send the license credential in cleartext.`
+      );
     }
     function pluginConfigPath(io = {}) {
       const env = io.env ?? process.env;
@@ -235,7 +253,8 @@ var require_discover_instance = __commonJS({
     function readPinnedUrl(io) {
       try {
         const config = JSON.parse(fs.readFileSync(pluginConfigPath(io), "utf8"));
-        return typeof config.mcp_url === "string" && config.mcp_url.length > 0 ? config.mcp_url : null;
+        const pinned = typeof config.mcp_url === "string" && config.mcp_url.length > 0 ? config.mcp_url : null;
+        return pinned === null ? null : sanitizeForTerminal2(pinned);
       } catch {
         return null;
       }
@@ -276,11 +295,10 @@ var require_discover_instance = __commonJS({
           signal: AbortSignal.timeout(15e3)
         });
       } catch {
-        return {
-          ok: false,
-          reason: "discovery_unreachable",
-          hint: `licensing service unreachable \u2014 check network egress to ${base}`
-        };
+        return failure(
+          "discovery_unreachable",
+          `licensing service unreachable \u2014 check network egress to ${base}`
+        );
       }
       let body = {};
       try {
@@ -289,43 +307,39 @@ var require_discover_instance = __commonJS({
         body = {};
       }
       if (response.status === 401) {
-        return {
-          ok: false,
-          reason: "license_invalid",
-          hint: body.error || "unknown or revoked license \u2014 contact your org admin"
-        };
+        return failure(
+          "license_invalid",
+          body.error || "unknown or revoked license \u2014 contact your org admin"
+        );
       }
       if (!response.ok || typeof body.instance_url !== "string" || body.instance_url.length === 0) {
-        return {
-          ok: false,
-          reason: "discovery_unreachable",
-          hint: `discovery failed (HTTP ${response.status}) at ${base}/license/discover`
-        };
+        return failure(
+          "discovery_unreachable",
+          `discovery failed (HTTP ${response.status}) at ${base}/license/discover`
+        );
       }
       return {
         ok: true,
-        instance_url: body.instance_url.replace(/\/$/, ""),
-        deployment_model: body.deployment_model ?? null
+        instance_url: sanitizeForTerminal2(body.instance_url).replace(/\/$/, ""),
+        deployment_model: body.deployment_model === null || body.deployment_model === void 0 ? null : sanitizeForTerminal2(body.deployment_model)
       };
     }
     function checkPinConflict(pinned, discovered, acceptNewInstance) {
       if (!pinned || sameHost(pinned, discovered) || acceptNewInstance === true) {
         return null;
       }
-      return {
-        ok: false,
-        reason: "pin_conflict",
-        pinned_url: pinned,
-        discovered_url: discovered,
-        hint: `discovery returned ${discovered} but this machine is pinned to ${pinned}. Refusing to release the license to a new host. If the change is expected (your org migrated instances), re-run with --accept-new-instance.`
-      };
+      return failure(
+        "pin_conflict",
+        `discovery returned ${discovered} but this machine is pinned to ${pinned}. Refusing to release the license to a new host. If the change is expected (your org migrated instances), re-run with --accept-new-instance.`,
+        { pinned_url: pinned, discovered_url: discovered }
+      );
     }
     async function discoverInstance2(io = {}) {
       const env = io.env ?? process.env;
       const doFetch = io.fetchImpl ?? fetch;
       const license = resolveLicense(io);
       if (license.value === null) {
-        return { ok: false, reason: "no_license", hint: license.hint };
+        return failure("no_license", license.hint);
       }
       const pinned = readPinnedUrl(io);
       if (pinned && io.forceDiscovery !== true) {
@@ -342,11 +356,10 @@ var require_discover_instance = __commonJS({
       }
       const { instance_url: discovered, deployment_model: deploymentModel } = discovery;
       if (!isSecureUrl2(discovered)) {
-        return {
-          ok: false,
-          reason: "insecure_instance_url",
-          hint: `discovery returned an insecure instance_url (${discovered}) \u2014 refusing to pin it. The instance must be served over https:// (plain http:// is allowed only for loopback), so the license is never exchanged over a cleartext connection.`
-        };
+        return failure(
+          "insecure_instance_url",
+          `discovery returned an insecure instance_url (${discovered}) \u2014 refusing to pin it. The instance must be served over https:// (plain http:// is allowed only for loopback), so the license is never exchanged over a cleartext connection.`
+        );
       }
       const conflict = checkPinConflict(pinned, discovered, io.acceptNewInstance);
       if (conflict) {
@@ -355,7 +368,7 @@ var require_discover_instance = __commonJS({
       if (!pinned || !sameHost(pinned, discovered)) {
         const pinResult = pinInstanceUrl(io, discovered);
         if (!pinResult.ok) {
-          return { ok: false, reason: "discovery_unreachable", hint: pinResult.error };
+          return failure("discovery_unreachable", pinResult.error);
         }
       }
       return {
@@ -911,6 +924,22 @@ var require_exec_cli = __commonJS({
   }
 });
 
+// ../forge-plugin/lib/prompt-abort.js
+var require_prompt_abort = __commonJS({
+  "../forge-plugin/lib/prompt-abort.js"(exports2, module2) {
+    var PROMPT_ABORTED = "PROMPT_ABORTED";
+    function promptAbortError2(what = "prompt") {
+      const err = new Error(`${what} aborted (Ctrl-C or end of input).`);
+      err.code = PROMPT_ABORTED;
+      return err;
+    }
+    function isPromptAbort2(err) {
+      return Boolean(err) && err.code === PROMPT_ABORTED;
+    }
+    module2.exports = { PROMPT_ABORTED, promptAbortError: promptAbortError2, isPromptAbort: isPromptAbort2 };
+  }
+});
+
 // src/setup.js
 var os = require("node:os");
 var path = require("node:path");
@@ -924,6 +953,8 @@ var {
   assertSafeVersion
 } = require_plugin_bundle();
 var { resolveSpawn } = require_exec_cli();
+var { sanitizeForTerminal } = require_sanitize_terminal();
+var { isPromptAbort, promptAbortError } = require_prompt_abort();
 var LICENSE_RE = /^forge_lic_[0-9A-Za-z]{43}$/;
 var DEFAULT_LICENSING_URL = "https://licensing.bigbrainforge.com";
 var DEFAULT_DIST_URL = "https://licensing.bigbrainforge.com";
@@ -937,26 +968,52 @@ function runShim(io, cmd, args) {
 function errMessage(err) {
   return err && err.message ? err.message : String(err);
 }
+async function promptHidden(q, { input = process.stdin, output = process.stdout } = {}) {
+  const readline = require("node:readline");
+  return new Promise((res, rej) => {
+    const rl = readline.createInterface({ input, output, terminal: true });
+    let settled = false;
+    rl.on("close", () => {
+      if (settled) return;
+      settled = true;
+      output.write("\n");
+      rej(promptAbortError("license prompt"));
+    });
+    const orig = rl._writeToOutput.bind(rl);
+    const columnsAt = (k) => {
+      const saved = rl.cursor;
+      rl.cursor = k;
+      const pos = rl.getCursorPos();
+      rl.cursor = saved;
+      return pos.rows === 0 ? pos.cols : pos.rows * rl.columns + pos.cols;
+    };
+    rl._writeToOutput = (s) => {
+      if (s.includes("\n") || s.includes("\r")) return orig("");
+      if (s.startsWith(q)) {
+        return orig(q + "*".repeat(Math.max(0, columnsAt(rl.line.length) - columnsAt(0))));
+      }
+      const end = rl.cursor;
+      const start = Math.max(0, end - s.length);
+      if (rl.line.slice(start, end) === s) {
+        return orig("*".repeat(Math.max(0, columnsAt(end) - columnsAt(start))));
+      }
+      return orig(s.replace(/[^ ]/g, "*"));
+    };
+    rl.question(q, (a) => {
+      settled = true;
+      rl.close();
+      output.write("\n");
+      res(a.trim());
+    });
+  });
+}
 function defaultIo() {
   return {
     homedir: os.homedir(),
     env: process.env,
     print: (l) => process.stdout.write(`${l}
 `),
-    promptHidden: async (q) => {
-      const readline = require("node:readline");
-      return new Promise((res) => {
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        const orig = rl._writeToOutput.bind(rl);
-        rl._writeToOutput = (s) => s.includes("\n") || s === q ? orig(s) : orig("");
-        process.stdout.write(q);
-        rl.question("", (a) => {
-          rl.close();
-          process.stdout.write("\n");
-          res(a.trim());
-        });
-      });
-    },
+    promptHidden: (q) => promptHidden(q),
     fetch: (url, opts) => globalThis.fetch(url, opts),
     run: (cmd, args = [], opts = {}) => {
       const { stdio, ...rest } = opts;
@@ -969,15 +1026,19 @@ function defaultIo() {
     }
   };
 }
+function say(io, line) {
+  io.print(sanitizeForTerminal(line));
+}
 function fail(io, tier, message, fix) {
-  io.print("");
-  io.print(`\u2717 [${tier}] ${message}`);
-  if (fix) io.print(`  fix: ${fix}`);
+  say(io, "");
+  say(io, `\u2717 [${tier}] ${message}`);
+  if (fix) say(io, `  fix: ${fix}`);
   return 1;
 }
 async function runSetup(argv, io = defaultIo()) {
   const args = argv.filter((a) => !a.startsWith("--"));
   const acceptNewInstance = argv.includes("--accept-new-instance");
+  const print = (line) => say(io, line);
   const tarProbe = io.run("tar", ["--version"]);
   if (tarProbe.error || tarProbe.status !== 0) {
     return fail(
@@ -988,7 +1049,19 @@ async function runSetup(argv, io = defaultIo()) {
     );
   }
   let license = args[0] ?? "";
-  if (!license) license = await io.promptHidden("Paste your Forge license: ");
+  if (!license) {
+    try {
+      license = await io.promptHidden("Paste your Forge license: ");
+    } catch (err) {
+      if (!isPromptAbort(err)) throw err;
+      return fail(
+        io,
+        "credential",
+        "setup was cancelled at the license prompt \u2014 nothing on this machine was changed",
+        `rerun when you have the license to hand: ${RERUN_SETUP_CMD}`
+      );
+    }
+  }
   if (!LICENSE_RE.test(license)) {
     return fail(
       io,
@@ -1006,11 +1079,12 @@ async function runSetup(argv, io = defaultIo()) {
       `fix the named problem (usually permissions on ~/.claude/forge), then rerun: ${RERUN_SETUP_CMD}`
     );
   }
-  io.print(`\u2713 license stored (${wrote.path})`);
+  print(`\u2713 license stored (${wrote.path})`);
   const licensingUrl = io.env.FORGE_LICENSING_URL || DEFAULT_LICENSING_URL;
   const discoveryFetch = async (url, opts) => {
     const res = await io.fetch(url, opts);
-    return { ...res, ok: res.ok ?? (res.status >= 200 && res.status < 300) };
+    if (res.ok !== void 0) return res;
+    return { ...res, ok: res.status >= 200 && res.status < 300 };
   };
   const discovered = await discoverInstance({
     homedir: io.homedir,
@@ -1034,7 +1108,7 @@ async function runSetup(argv, io = defaultIo()) {
       ) : `check network egress to ${licensingUrl} (it must be on your allowlist)`
     );
   }
-  io.print(`\u2713 instance pinned: ${discovered.instance_url} (${discovered.deployment_model})`);
+  print(`\u2713 instance pinned: ${discovered.instance_url} (${discovered.deployment_model})`);
   let npmrc;
   try {
     npmrc = writeNpmrcLicense(license, { homedir: io.homedir, env: io.env });
@@ -1048,11 +1122,11 @@ async function runSetup(argv, io = defaultIo()) {
   }
   if (npmrc.status === "declined") {
     const legacyNote = npmrc.replacedLegacy ? " (a legacy npm.pkg.github.com credential line found alongside it was removed)" : "";
-    io.print(
+    print(
       npmrc.foreignScopeTarget === "" ? `! npm NOT seeded \u2014 ~/.npmrc has a malformed @bigbrainforge:registry= line (no value). Fix or remove that line, then rerun setup; otherwise no action is needed.${legacyNote}` : `! npm NOT seeded \u2014 @bigbrainforge:registry already points at ${npmrc.foreignScopeTarget} (an enterprise proxy or other custom config). If that isn't your organization's proxy, remove that line from ~/.npmrc and rerun setup; otherwise no action is needed.${legacyNote}`
     );
   } else {
-    io.print(
+    print(
       npmrc.status === "seeded" ? `\u2713 npm seeded (${npmrc.path})${npmrc.replacedLegacy ? " \u2014 legacy GitHub Packages lines replaced" : ""}` : `\u2713 npm already seeded (${npmrc.path}) \u2014 no change needed`
     );
   }
@@ -1148,7 +1222,7 @@ async function runSetup(argv, io = defaultIo()) {
       `the download may be corrupted or tampered \u2014 rerun to retry: ${RERUN_SETUP_CMD} (if it persists, contact your Forge administrator)`
     );
   }
-  io.print(`\u2713 plugin bundle ${manifest.version} verified (sha256) and staged at ${staged.target}`);
+  print(`\u2713 plugin bundle ${manifest.version} verified (sha256) and staged at ${staged.target}`);
   const root = bundleRoot(io.homedir);
   const addRes = runShim(io, "claude", ["plugin", "marketplace", "add", root]);
   const installRes = addRes.status === 0 ? runShim(io, "claude", ["plugin", "install", "forge@forge"]) : addRes;
@@ -1157,19 +1231,19 @@ async function runSetup(argv, io = defaultIo()) {
 ${installRes.stderr || ""}`
   );
   if (addRes.status === 0 && installRes.status === 0) {
-    io.print("\u2713 plugin installed from the local Forge marketplace");
+    print("\u2713 plugin installed from the local Forge marketplace");
   } else if (alreadyRegistered) {
-    io.print("\u2713 plugin already installed from the local Forge marketplace \u2014 nothing to do");
+    print("\u2713 plugin already installed from the local Forge marketplace \u2014 nothing to do");
   } else {
-    io.print("");
-    io.print("! Claude Code CLI not reachable from this shell \u2014 run these two commands yourself:");
-    io.print("");
-    io.print(`    claude plugin marketplace add "${root}"`);
-    io.print("    claude plugin install forge@forge");
-    io.print("");
+    print("");
+    print("! Claude Code CLI not reachable from this shell \u2014 run these two commands yourself:");
+    print("");
+    print(`    claude plugin marketplace add "${root}"`);
+    print("    claude plugin install forge@forge");
+    print("");
   }
   const bundledBootstrap = path.join(staged.target, "scripts", "bootstrap.js");
-  io.print("Handing off to the Forge plugin bootstrap (server check + issue tracker)\u2026");
+  print("Handing off to the Forge plugin bootstrap (server check + issue tracker)\u2026");
   const hand = io.run(process.execPath, [bundledBootstrap], { stdio: "inherit" });
   if (hand.status !== 0) {
     return fail(
@@ -1179,15 +1253,15 @@ ${installRes.stderr || ""}`
       `rerun it yourself: node "${bundledBootstrap}"`
     );
   }
-  io.print("");
-  io.print("Done. Open Claude Code \u2014 Forge is ready.");
+  print("");
+  print("Done. Open Claude Code \u2014 Forge is ready.");
   return 0;
 }
-module.exports = { runSetup, LICENSE_RE, defaultIo, RERUN_SETUP_CMD };
+module.exports = { runSetup, LICENSE_RE, defaultIo, promptHidden, RERUN_SETUP_CMD };
 if (require.main === module) {
   runSetup(process.argv.slice(2)).then((code) => process.exit(code)).catch((err) => {
     process.stderr.write(`
-\u2717 [unexpected] ${errMessage(err)}
+\u2717 [unexpected] ${sanitizeForTerminal(errMessage(err))}
 `);
     process.stderr.write(
       "  fix: this is unexpected \u2014 please report it (including this message) to your Forge administrator\n"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbrainforge/setup",
-  "version": "3.19.0",
+  "version": "3.20.0",
   "description": "Forge workstation setup — paste one license, get a working Forge install.",
   "license": "UNLICENSED",
   "homepage": "https://github.com/bigbrainforge/forge",