@acnlabs/acn-cli 0.13.0 → 0.13.3

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.3",
       description: "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
       main: "dist/index.js",
       bin: {
@@ -87,7 +87,7 @@ var require_package = __commonJS({
 });
 
 // src/index.ts
-var import_commander16 = require("commander");
+var import_commander18 = require("commander");
 
 // src/output.ts
 var jsonMode = false;
@@ -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);
@@ -1509,9 +1620,108 @@ function listenCommand() {
   return cmd;
 }
 
-// src/commands/session.ts
+// src/commands/delivery.ts
 var import_commander11 = require("commander");
+var DELIVERY_DESC = {
+  direct: "direct (Mode A) \u2014 ACN dials your public A2A endpoint over HTTP",
+  relay: "relay (Mode B) \u2014 hold an outbound WebSocket with `acn listen`; no public URL",
+  none: "none \u2014 pull/reject only (communication_policy is manifest or closed; not Mode A/B)"
+};
 function requireAgentId3() {
+  const config = loadConfig();
+  if (!config.api_key) {
+    console.error(
+      "No API key found. Run `acn join` first or `acn config set api-key <key>`."
+    );
+    process.exit(1);
+  }
+  if (!config.agent_id) {
+    console.error(
+      "No agent ID found. Run `acn join` first or `acn config set agent-id <id>`."
+    );
+    process.exit(1);
+  }
+  return config.agent_id;
+}
+function formatDelivery(d) {
+  const lines = [
+    `Delivery : ${DELIVERY_DESC[d.delivery] ?? d.delivery}`,
+    `Policy   : ${d.communication_mode ?? "?"}  (reception \u2014 not the same as delivery)`,
+    `Endpoint : ${d.endpoint ?? "(none)"}`
+  ];
+  if (d.a2a_handshake_ok === false) {
+    lines.push("A2A probe: false \u2014 URL reachable but not JSON-RPC; fix the path");
+  } else if (d.a2a_handshake_ok === true) {
+    lines.push("A2A probe: ok");
+  }
+  if (d.next_step_hint) {
+    lines.push("", d.next_step_hint);
+  }
+  return lines.join("\n");
+}
+function deliveryCommand() {
+  const cmd = new import_commander11.Command("delivery").description(
+    "Inbound delivery transport (Mode A direct / Mode B relay). Orthogonal to reception policy (`acn inbox mode`)."
+  );
+  cmd.command("get").description("Show derived delivery transport (direct | relay | none)").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (opts) => {
+    const agentId = opts.agentId ?? requireAgentId3();
+    try {
+      const res = await acnGet(`/agents/${agentId}/delivery`);
+      output(res, formatDelivery(res));
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  cmd.command("set <transport>").description(
+    "Switch delivery without re-registering: relay (Mode B) or direct (Mode A). Requires push reception policy (open / allowlist)."
+  ).option(
+    "-e, --endpoint <url>",
+    "Required for direct: public A2A JSON-RPC URL (e.g. https://host/a2a)"
+  ).option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(
+    async (transport, opts) => {
+      const agentId = opts.agentId ?? requireAgentId3();
+      const normalized = transport.trim().toLowerCase();
+      if (normalized !== "relay" && normalized !== "direct") {
+        console.error(
+          `Unknown transport "${transport}". Use: relay | direct`
+        );
+        process.exit(1);
+      }
+      if (normalized === "direct" && !opts.endpoint) {
+        console.error(
+          "direct requires --endpoint <url> (full A2A path, e.g. https://host/a2a)."
+        );
+        process.exit(1);
+      }
+      if (normalized === "relay" && opts.endpoint) {
+        console.error(
+          "relay must not include --endpoint (clear the public URL; use `acn listen`)."
+        );
+        process.exit(1);
+      }
+      const body = normalized === "relay" ? { delivery: "relay" } : { delivery: "direct", endpoint: opts.endpoint };
+      try {
+        const res = await acnPatch(
+          `/agents/${agentId}/delivery`,
+          body
+        );
+        const followUp = res.delivery === "relay" ? [
+          "",
+          "Next: keep a local A2A handler up, then:",
+          "  acn listen --forward http://localhost:PORT"
+        ] : [];
+        output(res, [formatDelivery(res), ...followUp].join("\n"));
+      } catch (err) {
+        handleError(err);
+      }
+    }
+  );
+  return cmd;
+}
+
+// src/commands/session.ts
+var import_commander12 = require("commander");
+function requireAgentId4() {
   const config = loadConfig();
   if (!config.api_key) {
     console.error("No API key found. Run `acn join` first or `acn config set api-key <key>`.");
@@ -1555,12 +1765,12 @@ function formatEntry2(s, index) {
   return lines.join("\n");
 }
 function sessionCommand() {
-  const cmd = new import_commander11.Command("session").description(
+  const cmd = new import_commander12.Command("session").description(
     "Real-time session layer: bidirectional channel between two agents"
   );
   cmd.command("invite <target_agent_id>").description("Invite an agent to a real-time session").option("--ttl-seconds <s>", "Session TTL in seconds (60\u20131800, default 300)", parseInt).option("--metadata <json>", "Optional JSON object attached to the invitation (max 4KB)").action(
     async (targetId, opts) => {
-      requireAgentId3();
+      requireAgentId4();
       try {
         const body = {};
         if (opts.ttlSeconds !== void 0) body.ttl_seconds = opts.ttlSeconds;
@@ -1581,7 +1791,7 @@ ${formatEntry2(res)}`
     }
   );
   cmd.command("accept <session_id>").description("Accept a pending session invitation (invitee only)").action(async (sessionId) => {
-    requireAgentId3();
+    requireAgentId4();
     try {
       const res = await acnPost(`/sessions/${sessionId}/accept`);
       output(res, `Session accepted.
@@ -1591,7 +1801,7 @@ ${formatEntry2(res)}`);
     }
   });
   cmd.command("reject <session_id>").description("Reject a pending session invitation (invitee only)").action(async (sessionId) => {
-    requireAgentId3();
+    requireAgentId4();
     try {
       const res = await acnPost(`/sessions/${sessionId}/reject`);
       output(res, `Session rejected.
@@ -1601,7 +1811,7 @@ ${formatEntry2(res)}`);
     }
   });
   cmd.command("close <session_id>").description("Close an active session (either party may close)").action(async (sessionId) => {
-    requireAgentId3();
+    requireAgentId4();
     try {
       const res = await acnDelete(`/sessions/${sessionId}`);
       output(res, `Session closed.
@@ -1611,7 +1821,7 @@ ${formatEntry2(res)}`);
     }
   });
   cmd.command("pending").description("List pending session invitations addressed to you").action(async () => {
-    requireAgentId3();
+    requireAgentId4();
     try {
       const res = await acnGet("/sessions/pending");
       const sessions = res.sessions ?? [];
@@ -1633,8 +1843,8 @@ ${formatEntry2(res)}`);
 }
 
 // src/commands/subnet.ts
-var import_commander12 = require("commander");
-function requireAgentId4() {
+var import_commander13 = require("commander");
+function requireAgentId5() {
   const config = loadConfig();
   if (!config.api_key) {
     console.error("No API key found. Run `acn join` first or `acn config set api-key <key>`.");
@@ -1721,7 +1931,7 @@ function formatSubnet(s, index) {
   return lines.join("\n");
 }
 function subnetCommand() {
-  const cmd = new import_commander12.Command("subnet").description("Manage ACN subnets");
+  const cmd = new import_commander13.Command("subnet").description("Manage ACN subnets");
   cmd.command("list").description(
     "List subnets. Without --all/--parent shows only subnets you have joined."
   ).option("--all", "Show all public subnets on ACN (not just your own)").option(
@@ -1760,7 +1970,7 @@ function subnetCommand() {
 ` + subnets.map((s, i) => formatSubnet(s, i)).join("\n\n")
         );
       } else {
-        const agentId = opts.agentId ?? requireAgentId4();
+        const agentId = opts.agentId ?? requireAgentId5();
         const res = await acnGet(
           `/subnets/${agentId}/subnets`
         );
@@ -1799,7 +2009,7 @@ ${JSON.stringify(res.agents, null, 2)}`);
   cmd.command("join <subnet_id>").description(
     "Join a subnet. ADR-0004: branches on response shape (open/allowlist/auto-invite/pending)."
   ).option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (subnetId, opts) => {
-    const agentId = opts.agentId ?? requireAgentId4();
+    const agentId = opts.agentId ?? requireAgentId5();
     try {
       const res = await acnPost(
         `/agents/${agentId}/subnets/${subnetId}`
@@ -1810,7 +2020,7 @@ ${JSON.stringify(res.agents, null, 2)}`);
     }
   });
   cmd.command("leave <subnet_id>").description("Leave a subnet").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (subnetId, opts) => {
-    const agentId = opts.agentId ?? requireAgentId4();
+    const agentId = opts.agentId ?? requireAgentId5();
     try {
       const res = await acnDelete(
         `/agents/${agentId}/subnets/${subnetId}`
@@ -1938,7 +2148,7 @@ ${JSON.stringify(res.agents, null, 2)}`);
       handleError(err);
     }
   });
-  const requests = new import_commander12.Command("requests").description(
+  const requests = new import_commander13.Command("requests").description(
     "Manage join-requests for a subnet (ADR-0004)"
   );
   requests.command("list <subnet_id>").description(
@@ -1982,7 +2192,7 @@ ${JSON.stringify(res.agents, null, 2)}`);
   requests.command("pending").description(
     "Owner-side convenience: list pending join_requests across every subnet you own. Client-side aggregation \u2014 issues N+1 calls (one per owned subnet)."
   ).option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (opts) => {
-    const agentId = opts.agentId ?? requireAgentId4();
+    const agentId = opts.agentId ?? requireAgentId5();
     try {
       const subs = await acnGet(`/agents/${agentId}/subnets`);
       const subnetIds = subs.subnets ?? [];
@@ -2080,7 +2290,7 @@ ${JSON.stringify(res.agents, null, 2)}`);
     }
   );
   cmd.addCommand(requests);
-  const invitations = new import_commander12.Command("invitations").description(
+  const invitations = new import_commander13.Command("invitations").description(
     "Manage invitations on a subnet (ADR-0004)"
   );
   invitations.command("send <subnet_id>").description(
@@ -2135,7 +2345,7 @@ ${JSON.stringify(res.agents, null, 2)}`);
   invitations.command("pending").description(
     "Invitee view: list pending invitations addressed to you across all subnets (backed by GET /agents/{aid}/subnet-invitations)."
   ).option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (opts) => {
-    const agentId = opts.agentId ?? requireAgentId4();
+    const agentId = opts.agentId ?? requireAgentId5();
     try {
       const res = await acnGet(
         `/agents/${agentId}/subnet-invitations`
@@ -2216,7 +2426,7 @@ ${JSON.stringify(res.agents, null, 2)}`);
     }
   );
   cmd.addCommand(invitations);
-  const allowlist = new import_commander12.Command("allowlist").description(
+  const allowlist = new import_commander13.Command("allowlist").description(
     "Manage a subnet allowlist (ADR-0004)"
   );
   allowlist.command("list <subnet_id>").description("Owner-only: list allowlist entries for a subnet.").option("--limit <n>", "Page size (1-500, default 100)", "100").option("--offset <n>", "Page offset (default 0)", "0").action(
@@ -2284,7 +2494,7 @@ ${JSON.stringify(res.agents, null, 2)}`);
     }
   );
   cmd.addCommand(allowlist);
-  const harness = new import_commander12.Command("harness").description("Manage Org Harness webhook for a subnet");
+  const harness = new import_commander13.Command("harness").description("Manage Org Harness webhook for a subnet");
   harness.command("set <subnet_id>").description("Register an Org Harness webhook on a subnet you own").requiredOption("--url <url>", "Harness webhook URL (HTTPS)").option("--secret <secret>", "HMAC-SHA256 signing secret (recommended)").action(async (subnetId, opts) => {
     const config = loadConfig();
     if (!config.api_key) {
@@ -2326,9 +2536,198 @@ ${JSON.stringify(res.agents, null, 2)}`);
   return cmd;
 }
 
+// src/commands/org.ts
+var import_commander14 = require("commander");
+function formatOrg(o) {
+  const lines = [
+    `  ID       : ${o.org_id}`,
+    `  Name     : ${o.display_name}`,
+    `  Status   : ${o.status ?? "\u2014"}`,
+    `  Owner    : ${o.owner?.kind ?? "none"}${o.owner?.subject ? ` (${o.owner.subject})` : ""}`,
+    `  Steward  : ${o.steward_agent_id ?? "\u2014"}`,
+    `  Subnet   : ${o.fencing?.subnet_id ?? o.subnet_id ?? "\u2014"}`
+  ];
+  if (o.fencing?.join_policy) lines.push(`  Join     : ${o.fencing.join_policy}`);
+  if (o.harness_webhook?.registered) {
+    lines.push(`  Harness  : ${o.harness_webhook.url ?? "(registered)"}`);
+  }
+  return lines.join("\n");
+}
+function orgCommand() {
+  const cmd = new import_commander14.Command("org").description("Manage ACN organisations (Org Harness)");
+  cmd.command("create").description("Create an Org (binds/creates a subnet fence)").requiredOption("--name <name>", "Display name").option("--steward <agent_id>", "Steward agent (required for human JWT callers)").option("--subnet <slug>", "Bind existing subnet slug (must be owned by steward)").option("--join-policy <policy>", "open | approval", "open").option("--private", "Private subnet fence", false).option("--harness-url <url>", "Register Org Harness webhook on the fence subnet").option("--harness-secret <secret>", "HMAC secret for harness webhook").action(
+    async (opts) => {
+      try {
+        const body = {
+          display_name: opts.name,
+          is_private: Boolean(opts.private),
+          join_policy: opts.joinPolicy ?? "open"
+        };
+        if (opts.steward) body.steward_agent_id = opts.steward;
+        if (opts.subnet) body.subnet_id = opts.subnet;
+        if (opts.harnessUrl) body.harness_url = opts.harnessUrl;
+        if (opts.harnessSecret) body.harness_secret = opts.harnessSecret;
+        const org = await acnPost("/orgs", body);
+        output(org, formatOrg(org));
+      } catch (err) {
+        handleError(err);
+      }
+    }
+  );
+  cmd.command("show <orgId>").description("Show Org details").action(async (orgId) => {
+    try {
+      const org = await acnGet(`/orgs/${orgId}`);
+      output(org, formatOrg(org));
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  cmd.command("update <orgId>").description("Update Org charter / plugins / display name").option("--name <name>", "New display name").option("--charter <json>", "Charter JSON object").option("--plugins <json>", "Plugins JSON object (merged)").action(
+    async (orgId, opts) => {
+      try {
+        const body = {};
+        if (opts.name) body.display_name = opts.name;
+        if (opts.charter) body.charter = JSON.parse(opts.charter);
+        if (opts.plugins) body.plugins = JSON.parse(opts.plugins);
+        const org = await acnPatch(`/orgs/${orgId}`, body);
+        output(org, formatOrg(org));
+      } catch (err) {
+        handleError(err);
+      }
+    }
+  );
+  const members = cmd.command("members").description("Manage Org members");
+  members.command("list <orgId>").description("List active members (marks degraded vs subnet fence)").action(async (orgId) => {
+    try {
+      const res = await acnGet(`/orgs/${orgId}/members`);
+      const text = (res.members ?? []).map((m) => {
+        const flags = [];
+        if (m.acn?.degraded) flags.push("degraded");
+        if (m.acn && !m.acn.subnet_member) flags.push("not-in-subnet");
+        const flagStr = flags.length ? `  [${flags.join(",")}]` : "";
+        return `  ${m.agent_id}  role=${m.role}  status=${m.status}${flagStr}`;
+      }).join("\n");
+      const header = res.degraded_count || res.fence_missing ? `  (degraded=${res.degraded_count} fence_missing=${res.fence_missing})
+` : "";
+      output(res, header + (text || "  (no members)"));
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  members.command("add <orgId> <agentId>").description("Add an agent member").option("--role <role>", "Member role", "worker").action(async (orgId, agentId, opts) => {
+    try {
+      const m = await acnPost(`/orgs/${orgId}/members`, {
+        agent_id: agentId,
+        role: opts.role
+      });
+      output(m, `Added ${m.agent_id} as ${m.role}`);
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  members.command("remove <orgId> <agentId>").description("Remove an agent member").action(async (orgId, agentId) => {
+    try {
+      const m = await acnDelete(`/orgs/${orgId}/members/${agentId}`);
+      output(m, `Removed ${m.agent_id}`);
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  cmd.command("claim <orgId>").description("Claim ownership of an unclaimed Org (created_by only)").option("--as <kind>", "human | agent").option("--subject <id>", "Owner subject (defaults to caller)").action(async (orgId, opts) => {
+    try {
+      const body = {};
+      if (opts.as) body.owner_kind = opts.as;
+      if (opts.subject) body.owner_subject = opts.subject;
+      const org = await acnPost(`/orgs/${orgId}/claim`, body);
+      output(org, formatOrg(org));
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  cmd.command("transfer <orgId>").description("Transfer Org ownership").requiredOption("--kind <kind>", "human | agent").requiredOption("--subject <id>", "New owner subject").action(async (orgId, opts) => {
+    try {
+      const org = await acnPost(`/orgs/${orgId}/transfer`, {
+        new_owner_kind: opts.kind,
+        new_owner_subject: opts.subject
+      });
+      output(org, formatOrg(org));
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  cmd.command("release <orgId>").description("Release Org ownership back to none").action(async (orgId) => {
+    try {
+      const org = await acnPost(`/orgs/${orgId}/release`, {});
+      output(org, formatOrg(org));
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  cmd.command("dissolve <orgId>").description("Dissolve an Org (owner or created_by when unclaimed)").action(async (orgId) => {
+    try {
+      const org = await acnPost(`/orgs/${orgId}/dissolve`, {});
+      output(org, formatOrg(org));
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  const work = cmd.command("work").description("Minimal Org work queue");
+  work.command("list <orgId>").description("List work items").option("--open", "Only open (todo / in_progress)", false).action(async (orgId, opts) => {
+    try {
+      const q = opts.open ? "?open_only=true" : "";
+      const res = await acnGet(
+        `/orgs/${orgId}/work${q}`
+      );
+      const text = (res.work ?? []).map(
+        (w) => `  ${w.work_id}  [${w.status}]  ${w.title}` + (w.assignee_agent_id ? `  \u2192 ${w.assignee_agent_id}` : "")
+      ).join("\n");
+      output(res, text || "  (no work)");
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  work.command("create <orgId>").description("Create a work item").requiredOption("--title <title>", "Work title").option("--assignee <agent_id>", "Assignee agent").action(async (orgId, opts) => {
+    try {
+      const body = { title: opts.title };
+      if (opts.assignee) body.assignee_agent_id = opts.assignee;
+      const w = await acnPost(`/orgs/${orgId}/work`, body);
+      output(w, `Created ${w.work_id}: ${w.title}`);
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  work.command("update <orgId> <workId>").description("Update work status").requiredOption("--status <status>", "todo | in_progress | done | cancelled").option("--assignee <agent_id>", "Assignee agent").action(
+    async (orgId, workId, opts) => {
+      try {
+        const body = { status: opts.status };
+        if (opts.assignee) body.assignee_agent_id = opts.assignee;
+        const w = await acnPatch(
+          `/orgs/${orgId}/work/${workId}`,
+          body
+        );
+        output(w, `Updated ${w.work_id} \u2192 ${w.status}`);
+      } catch (err) {
+        handleError(err);
+      }
+    }
+  );
+  cmd.command("tick <orgId>").description("Thin Loop tick (lists open work, emits org.loop_tick)").action(async (orgId) => {
+    try {
+      const res = await acnPost(
+        `/orgs/${orgId}/loop/tick`,
+        {}
+      );
+      output(res, `Loop tick: ${res.open_count} open work item(s)`);
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  return cmd;
+}
+
 // src/commands/follow.ts
-var import_commander13 = require("commander");
-function requireAgentId5() {
+var import_commander15 = require("commander");
+function requireAgentId6() {
   const config = loadConfig();
   if (!config.api_key) {
     console.error("No API key found. Run `acn join` first or `acn config set api-key <key>`.");
@@ -2350,9 +2749,9 @@ function formatAgent2(a, i) {
   ].join("\n");
 }
 function followCommand() {
-  const cmd = new import_commander13.Command("follow").description("Follow/unfollow agents and inspect follow graph");
+  const cmd = new import_commander15.Command("follow").description("Follow/unfollow agents and inspect follow graph");
   cmd.command("add <target_id>").description("Follow another agent").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (targetId, opts) => {
-    const agentId = opts.agentId ?? requireAgentId5();
+    const agentId = opts.agentId ?? requireAgentId6();
     try {
       const res = await acnPost(
         `/agents/${agentId}/follows/${targetId}`
@@ -2364,7 +2763,7 @@ function followCommand() {
     }
   });
   cmd.command("remove <target_id>").description("Unfollow an agent").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (targetId, opts) => {
-    const agentId = opts.agentId ?? requireAgentId5();
+    const agentId = opts.agentId ?? requireAgentId6();
     try {
       const res = await acnDelete(
         `/agents/${agentId}/follows/${targetId}`
@@ -2376,7 +2775,7 @@ function followCommand() {
     }
   });
   cmd.command("list").description("List agents you follow").option("--limit <n>", "Max results", parseInt).option("--offset <n>", "Pagination offset", parseInt).option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (opts) => {
-    const agentId = opts.agentId ?? requireAgentId5();
+    const agentId = opts.agentId ?? requireAgentId6();
     try {
       const params = {};
       if (opts.limit !== void 0) params.limit = opts.limit;
@@ -2401,7 +2800,7 @@ function followCommand() {
     }
   });
   cmd.command("followers").description("List agents that follow you").option("--limit <n>", "Max results", parseInt).option("--offset <n>", "Pagination offset", parseInt).option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (opts) => {
-    const agentId = opts.agentId ?? requireAgentId5();
+    const agentId = opts.agentId ?? requireAgentId6();
     try {
       const params = {};
       if (opts.limit !== void 0) params.limit = opts.limit;
@@ -2426,7 +2825,7 @@ function followCommand() {
     }
   });
   cmd.command("check <target_id>").description("Check whether you are following a specific agent").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (targetId, opts) => {
-    const agentId = opts.agentId ?? requireAgentId5();
+    const agentId = opts.agentId ?? requireAgentId6();
     try {
       const res = await acnGet(
         `/agents/${agentId}/follows/${targetId}`
@@ -2441,8 +2840,8 @@ function followCommand() {
 }
 
 // src/commands/wallet.ts
-var import_commander14 = require("commander");
-function requireAgentId6() {
+var import_commander16 = require("commander");
+function requireAgentId7() {
   const config = loadConfig();
   if (!config.api_key) {
     console.error("No API key found. Run `acn join` first or `acn config set api-key <key>`.");
@@ -2458,7 +2857,7 @@ function parseCsv(value) {
   return value.split(",").map((s) => s.trim()).filter(Boolean);
 }
 async function showWalletInfo(opts) {
-  const agentId = opts.agentId ?? requireAgentId6();
+  const agentId = opts.agentId ?? requireAgentId7();
   try {
     const res = await acnGet(`/agents/${agentId}/wallets`);
     const lines = [`Agent  : ${res.agent_id}`];
@@ -2484,7 +2883,7 @@ async function showWalletInfo(opts) {
   }
 }
 function walletCommand() {
-  const cmd = new import_commander14.Command("wallet").description("View and manage agent's wallet & payment info");
+  const cmd = new import_commander16.Command("wallet").description("View and manage agent's wallet & payment info");
   cmd.command("info", { isDefault: true }).description("Show wallet, payment methods, pricing, and ERC-8004 status").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(showWalletInfo);
   cmd.command("set-capability").description("Declare which payment methods, networks, and wallets you accept").requiredOption(
     "--methods <csv>",
@@ -2494,7 +2893,7 @@ function walletCommand() {
     `Wallet addresses by network, JSON, e.g. '{"ethereum":"0x..."}'`
   ).option("--no-accepts", "Disable accepting payments (default: enabled)").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(
     async (opts) => {
-      const agentId = opts.agentId ?? requireAgentId6();
+      const agentId = opts.agentId ?? requireAgentId7();
       let walletMap = {};
       if (opts.wallets) {
         try {
@@ -2529,7 +2928,7 @@ function walletCommand() {
   );
   cmd.command("set-pricing").description("Set OpenAI-style per-million-token pricing for your agent (USD)").requiredOption("--input <usd>", "USD per 1M input tokens").requiredOption("--output <usd>", "USD per 1M output tokens").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(
     async (opts) => {
-      const agentId = opts.agentId ?? requireAgentId6();
+      const agentId = opts.agentId ?? requireAgentId7();
       const inputPrice = Number(opts.input);
       const outputPrice = Number(opts.output);
       if (!Number.isFinite(inputPrice) || inputPrice < 0) {
@@ -2557,7 +2956,7 @@ function walletCommand() {
     }
   );
   cmd.command("tasks").description("List the payment tasks the current agent is involved in").option("--status <s>", "Filter by status (e.g. created, payment_confirmed, task_completed)").option("--limit <n>", "Max number of tasks to return (default 50)").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (opts) => {
-    const agentId = opts.agentId ?? requireAgentId6();
+    const agentId = opts.agentId ?? requireAgentId7();
     const params = {};
     if (opts.status) params.status = opts.status;
     if (opts.limit !== void 0) {
@@ -2597,7 +2996,7 @@ function walletCommand() {
     }
   });
   cmd.command("stats").description("Show the current agent's payment statistics").option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(async (opts) => {
-    const agentId = opts.agentId ?? requireAgentId6();
+    const agentId = opts.agentId ?? requireAgentId7();
     try {
       const res = await acnGet(`/payments/stats/${agentId}`);
       const lines = [`Stats for ${agentId}:`];
@@ -2663,8 +3062,8 @@ function walletCommand() {
 }
 
 // src/commands/pay.ts
-var import_commander15 = require("commander");
-function requireAgentId7() {
+var import_commander17 = require("commander");
+function requireAgentId8() {
   const config = loadConfig();
   if (!config.api_key) {
     console.error("No API key found. Run `acn join` first or `acn config set api-key <key>`.");
@@ -2677,11 +3076,11 @@ function requireAgentId7() {
   return config.agent_id;
 }
 function payCommand() {
-  const cmd = new import_commander15.Command("pay").description("Manage payment tasks between agents");
-  const createCmd = new import_commander15.Command("create").description("Create a payment task to another agent");
+  const cmd = new import_commander17.Command("pay").description("Manage payment tasks between agents");
+  const createCmd = new import_commander17.Command("create").description("Create a payment task to another agent");
   createCmd.requiredOption("--to <agent>", "Recipient agent ID").requiredOption("--amount <n>", "Payment amount (positive number)").requiredOption("--currency <c>", "Currency code, e.g. USD, USDC").requiredOption("--method <m>", "Payment method, e.g. usdc, eth, platform_credits").requiredOption("--network <n>", "Network, e.g. ethereum, base, solana").option("--description <text>", "Free-text description for the payment task").option("--metadata <json>", "Additional metadata as JSON object").action(
     async (opts) => {
-      const fromAgent = requireAgentId7();
+      const fromAgent = requireAgentId8();
       const amount = Number(opts.amount);
       if (!Number.isFinite(amount) || amount <= 0) {
         console.error("--amount must be a positive number.");
@@ -2724,7 +3123,7 @@ function payCommand() {
       }
     }
   );
-  const confirmCmd = new import_commander15.Command("confirm").description(
+  const confirmCmd = new import_commander17.Command("confirm").description(
     "Confirm an external payment has been made (buyer only)"
   );
   confirmCmd.requiredOption("--task-id <id>", "Payment task ID to confirm").requiredOption(
@@ -2746,11 +3145,11 @@ function payCommand() {
       handleError(err);
     }
   });
-  const statusCmd = new import_commander15.Command("status").description(
+  const statusCmd = new import_commander17.Command("status").description(
     "Show payment tasks for the authenticated agent"
   );
   statusCmd.option("--status <s>", "Filter by status (e.g. created, payment_confirmed)").option("--limit <n>", "Max results (default 50)", "50").action(async (opts) => {
-    const agentId = requireAgentId7();
+    const agentId = requireAgentId8();
     try {
       const res = await acnGet(
         `/payments/tasks/agent/${agentId}`,
@@ -2769,7 +3168,7 @@ function payCommand() {
 
 // src/index.ts
 var { version } = require_package();
-var program = new import_commander16.Command();
+var program = new import_commander18.Command();
 program.name("acn").description("ACN CLI \u2014 Agent Collaboration Network command-line interface").version(version).option("--json", "Output raw JSON (useful for agent parsing)").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.json) setJsonMode(true);
@@ -2784,8 +3183,10 @@ program.addCommand(messageCommand());
 program.addCommand(notifyCommand());
 program.addCommand(inboxCommand());
 program.addCommand(listenCommand());
+program.addCommand(deliveryCommand());
 program.addCommand(sessionCommand());
 program.addCommand(subnetCommand());
+program.addCommand(orgCommand());
 program.addCommand(followCommand());
 program.addCommand(walletCommand());
 program.addCommand(payCommand());

package/package.json

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