@acnlabs/acn-cli 0.13.0 → 0.13.2

package/dist/index.js

@@ -31,7 +31,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@acnlabs/acn-cli",
-      version: "0.13.0",
+      version: "0.13.2",
       description: "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
       main: "dist/index.js",
       bin: {
@@ -124,32 +124,91 @@ var import_path = require("path");
 var import_fs = require("fs");
 var CONFIG_DIR = (0, import_path.join)((0, import_os.homedir)(), ".acn");
 var CONFIG_FILE = (0, import_path.join)(CONFIG_DIR, "config.json");
-var DEFAULT_BASE_URL = "https://api.acnlabs.dev";
-function loadConfig() {
-  if (!(0, import_fs.existsSync)(CONFIG_FILE)) {
-    return { base_url: DEFAULT_BASE_URL };
+var REGION_BASE_URLS = {
+  global: "https://api.acnlabs.dev",
+  cn: "https://acn.acnlabs.cn"
+};
+var DEFAULT_BASE_URL = REGION_BASE_URLS.global;
+function normalizeBaseUrl(url) {
+  let u = url.trim().replace(/\/+$/, "");
+  u = u.replace(/\/api\/v1$/i, "");
+  return u.replace(/\/+$/, "");
+}
+function baseUrlForRegion(region) {
+  const key = region.trim().toLowerCase();
+  if (key === "global" || key === "cn") {
+    return REGION_BASE_URLS[key];
   }
+  throw new Error(`Unknown region "${region}". Valid: global | cn`);
+}
+function inferRegion(baseUrl) {
+  const u = normalizeBaseUrl(baseUrl);
+  if (u === REGION_BASE_URLS.global) return "global";
+  if (u === REGION_BASE_URLS.cn) return "cn";
+  return void 0;
+}
+function readConfigFile() {
+  if (!(0, import_fs.existsSync)(CONFIG_FILE)) return {};
   try {
     const raw = (0, import_fs.readFileSync)(CONFIG_FILE, "utf-8");
-    const parsed = JSON.parse(raw);
-    return {
-      base_url: parsed.base_url ?? DEFAULT_BASE_URL,
-      api_key: parsed.api_key,
-      agent_id: parsed.agent_id
-    };
+    return JSON.parse(raw);
   } catch {
-    return { base_url: DEFAULT_BASE_URL };
+    return {};
   }
 }
+function resolveBaseUrl(overrides) {
+  if (overrides?.base_url) {
+    return normalizeBaseUrl(overrides.base_url);
+  }
+  if (overrides?.region) {
+    return baseUrlForRegion(overrides.region);
+  }
+  const env = process.env.ACN_BASE_URL?.trim();
+  if (env) {
+    return normalizeBaseUrl(env);
+  }
+  const file = readConfigFile();
+  if (file.base_url) {
+    return normalizeBaseUrl(file.base_url);
+  }
+  if (file.region) {
+    return baseUrlForRegion(file.region);
+  }
+  return DEFAULT_BASE_URL;
+}
+function loadConfig() {
+  const file = readConfigFile();
+  const base_url = resolveBaseUrl();
+  return {
+    base_url,
+    api_key: file.api_key,
+    agent_id: file.agent_id,
+    region: inferRegion(base_url)
+  };
+}
 function saveConfig(updates) {
   if (!(0, import_fs.existsSync)(CONFIG_DIR)) {
     (0, import_fs.mkdirSync)(CONFIG_DIR, { recursive: true });
   }
-  const current = loadConfig();
+  const file = readConfigFile();
+  const current = {
+    base_url: file.base_url ? normalizeBaseUrl(file.base_url) : DEFAULT_BASE_URL,
+    api_key: file.api_key,
+    agent_id: file.agent_id,
+    region: file.region === "global" || file.region === "cn" ? file.region : void 0
+  };
   const next = { ...current, ...updates };
-  const clean = { base_url: next.base_url };
+  if (updates.region && !updates.base_url) {
+    next.base_url = baseUrlForRegion(updates.region);
+  }
+  if (updates.base_url && updates.region === void 0) {
+    next.region = inferRegion(updates.base_url);
+  }
+  const clean = { base_url: normalizeBaseUrl(next.base_url) };
   if (next.api_key !== void 0) clean.api_key = next.api_key;
   if (next.agent_id !== void 0) clean.agent_id = next.agent_id;
+  const region = next.region ?? inferRegion(clean.base_url);
+  if (region !== void 0) clean.region = region;
   (0, import_fs.writeFileSync)(CONFIG_FILE, JSON.stringify(clean, null, 2), "utf-8");
 }
 function getConfigPath() {
@@ -157,7 +216,7 @@ function getConfigPath() {
 }
 
 // src/commands/config.ts
-var VALID_KEYS = ["api-key", "agent-id", "base-url"];
+var VALID_KEYS = ["api-key", "agent-id", "base-url", "region"];
 var KEY_MAP = {
   "api-key": "api_key",
   "agent-id": "agent_id",
@@ -165,11 +224,25 @@ var KEY_MAP = {
 };
 function configCommand() {
   const cmd = new import_commander.Command("config").description("Manage local ACN configuration");
-  cmd.command("set <key> <value>").description(`Set a config value. Keys: ${VALID_KEYS.join(", ")}`).action((key, value) => {
+  cmd.command("set <key> <value>").description(
+    `Set a config value. Keys: ${VALID_KEYS.join(", ")}. region is global|cn (sets base-url). Env ACN_BASE_URL overrides base-url at runtime.`
+  ).action((key, value) => {
     if (!VALID_KEYS.includes(key)) {
       console.error(`Unknown key "${key}". Valid keys: ${VALID_KEYS.join(", ")}`);
       process.exit(1);
     }
+    if (key === "region") {
+      try {
+        const base_url = baseUrlForRegion(value);
+        const region = value.trim().toLowerCase();
+        saveConfig({ region, base_url });
+        output({ key, value: region, base_url }, `Set region = ${region} (base-url = ${base_url})`);
+      } catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
+        process.exit(1);
+      }
+      return;
+    }
     saveConfig({ [KEY_MAP[key]]: value });
     output({ key, value }, `Set ${key} = ${value}`);
   });
@@ -179,19 +252,21 @@ function configCommand() {
       process.exit(1);
     }
     const config = loadConfig();
-    const val = config[KEY_MAP[key]];
+    const val = key === "region" ? config.region : config[KEY_MAP[key]];
     if (val === void 0) {
       console.error(`Key "${key}" is not set.`);
       process.exit(1);
     }
-    output({ key, value: val }, val);
+    output({ key, value: val }, String(val));
   });
   cmd.command("show").description("Show all config values").action(() => {
     const config = loadConfig();
     const path = getConfigPath();
+    const envOverride = process.env.ACN_BASE_URL?.trim() ? ` (ACN_BASE_URL override active)` : "";
     output(config, [
       `Config file: ${path}`,
-      `  base-url : ${config.base_url}`,
+      `  region   : ${config.region ?? "(custom / unknown)"}`,
+      `  base-url : ${config.base_url}${envOverride}`,
       `  api-key  : ${config.api_key ? maskKey(config.api_key) : "(not set)"}`,
       `  agent-id : ${config.agent_id ?? "(not set)"}`
     ].join("\n"));
@@ -228,8 +303,9 @@ function extractDetail(body) {
 }
 async function acnFetch(path, options = {}) {
   const config = loadConfig();
-  const { params, ...fetchOptions } = options;
-  const url = new URL(`${config.base_url}/api/v1${path}`);
+  const { params, baseUrl: baseUrlOverride, ...fetchOptions } = options;
+  const origin = baseUrlOverride ? normalizeBaseUrl(baseUrlOverride) : config.base_url;
+  const url = new URL(`${origin}/api/v1${path}`);
   if (params) {
     for (const [k, v] of Object.entries(params)) {
       if (v !== void 0) url.searchParams.set(k, String(v));
@@ -257,23 +333,25 @@ async function acnFetch(path, options = {}) {
   }
   return res.json();
 }
-function acnGet(path, params) {
-  return acnFetch(path, { method: "GET", params });
+function acnGet(path, params, opts) {
+  return acnFetch(path, { method: "GET", params, baseUrl: opts?.baseUrl });
 }
-function acnPost(path, body) {
+function acnPost(path, body, opts) {
   return acnFetch(path, {
     method: "POST",
-    body: body !== void 0 ? JSON.stringify(body) : void 0
+    body: body !== void 0 ? JSON.stringify(body) : void 0,
+    baseUrl: opts?.baseUrl
   });
 }
-function acnPatch(path, body) {
+function acnPatch(path, body, opts) {
   return acnFetch(path, {
     method: "PATCH",
-    body: body !== void 0 ? JSON.stringify(body) : void 0
+    body: body !== void 0 ? JSON.stringify(body) : void 0,
+    baseUrl: opts?.baseUrl
   });
 }
-function acnDelete(path) {
-  return acnFetch(path, { method: "DELETE" });
+function acnDelete(path, opts) {
+  return acnFetch(path, { method: "DELETE", baseUrl: opts?.baseUrl });
 }
 
 // src/commands/join.ts
@@ -281,8 +359,30 @@ function joinCommand() {
   return new import_commander2.Command("join").description("Register this agent with ACN and save credentials locally").requiredOption("-n, --name <name>", "Agent name").requiredOption("-t, --tags <tags>", "Comma-separated capability tags (e.g. coding,review)").option("-e, --endpoint <url>", "Public A2A endpoint URL of this agent").option("-d, --description <text>", "Agent description").option(
     "--relay",
     "Receive messages in real time over an outbound WebSocket (run `acn listen`) instead of hosting a public endpoint. Registers in open/push mode with no delivery URL."
+  ).option(
+    "--region <region>",
+    "ACN deployment to join: global (api.acnlabs.dev) or cn (acn.acnlabs.cn). Pick by where the agent is hosted \u2014 not by user nationality."
+  ).option(
+    "--base-url <url>",
+    "Override ACN origin (no /api/v1). Overrides --region and ACN_BASE_URL for this join."
   ).action(
     async (opts) => {
+      if (opts.region && opts.baseUrl) {
+        console.error("Use either --region or --base-url, not both.");
+        process.exit(1);
+      }
+      if (opts.region) {
+        const r = opts.region.trim().toLowerCase();
+        if (r !== "global" && r !== "cn") {
+          console.error(`Unknown --region "${opts.region}". Valid: global | cn`);
+          process.exit(1);
+        }
+      }
+      const base_url = resolveBaseUrl({
+        base_url: opts.baseUrl,
+        region: opts.region
+      });
+      const region = opts.region?.trim().toLowerCase() === "cn" || opts.region?.trim().toLowerCase() === "global" ? opts.region.trim().toLowerCase() : inferRegion(base_url);
       const tags = opts.tags.split(",").map((s) => s.trim()).filter(Boolean);
       const body = {
         name: opts.name,
@@ -295,19 +395,30 @@ function joinCommand() {
         ...opts.relay ? { delivery: "relay", communication_policy: { mode: "open" } } : {}
       };
       try {
-        const res = await acnPost("/agents/join", body);
-        saveConfig({ api_key: res.api_key, agent_id: res.agent_id });
+        const res = await acnPost("/agents/join", body, {
+          baseUrl: base_url
+        });
+        saveConfig({
+          api_key: res.api_key,
+          agent_id: res.agent_id,
+          base_url,
+          ...region ? { region } : {}
+        });
         const claimLine = res.claim_url ? `
   Claim URL: ${res.claim_url}` : "";
         const verifyLine = res.verification_code ? `
   Verify   : ${res.verification_code}` : "";
+        const regionLine = region ? `
+  Region   : ${region}` : "";
         output(res, [
           `Registered successfully!`,
           `  Agent ID : ${res.agent_id}`,
           `  API Key  : ${res.api_key}`,
+          `  ACN      : ${base_url}${regionLine}`,
           `  Status   : ${res.status}${claimLine}${verifyLine}`,
           ``,
-          `Credentials saved to ~/.acn/config.json`
+          `Credentials saved to ~/.acn/config.json`,
+          `Do not reuse this api_key against another region \u2014 re-join instead.`
         ].join("\n"));
       } catch (err) {
         handleError(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acnlabs/acn-cli",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "Official CLI for ACN (Agent Collaboration Network) — zero-integration agent access",
   "main": "dist/index.js",
   "bin": {