@acnlabs/acn-cli 1.0.1 → 1.0.3

package/dist/index.js

@@ -31,7 +31,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@acnlabs/acn-cli",
-      version: "1.0.1",
+      version: "1.0.3",
       description: "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
       main: "dist/index.js",
       bin: {
@@ -429,27 +429,129 @@ function joinCommand() {
 
 // src/commands/heartbeat.ts
 var import_commander3 = require("commander");
+
+// src/commands/model-heartbeat.ts
+function resolvePreferredModel(opts) {
+  const env = opts?.env ?? process.env;
+  const fromFlag = opts?.model?.trim();
+  if (fromFlag) return fromFlag.slice(0, 200);
+  const fromEnv = env.ACN_PREFERRED_MODEL?.trim();
+  if (fromEnv) return fromEnv.slice(0, 200);
+  return void 0;
+}
+function resolveSupportedModels(opts) {
+  if (opts?.clear) return [];
+  const env = opts?.env ?? process.env;
+  const raw = (opts?.models?.trim() || env.ACN_SUPPORTED_MODELS?.trim() || "").trim();
+  if (!raw) return void 0;
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const part of raw.split(/[,;\s]+/)) {
+    const mid = part.trim().slice(0, 200);
+    if (!mid) continue;
+    const key = mid.toLowerCase();
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(mid);
+    if (out.length >= 50) break;
+  }
+  return out.length ? out : void 0;
+}
+async function postAgentHeartbeat(opts) {
+  const fetchFn = opts.fetchFn ?? fetch;
+  const origin = opts.baseUrl.replace(/\/+$/, "");
+  const url = `${origin}/api/v1/agents/${opts.agentId}/heartbeat`;
+  const headers = {
+    Authorization: `Bearer ${opts.apiKey}`,
+    "Content-Type": "application/json"
+  };
+  const payload = {};
+  if (opts.preferredModel && opts.preferredModel.trim()) {
+    payload.preferred_model = opts.preferredModel.trim().slice(0, 200);
+  }
+  if (opts.supportedModels != null) {
+    payload.supported_models = opts.supportedModels;
+  }
+  const body = Object.keys(payload).length ? JSON.stringify(payload) : void 0;
+  try {
+    const res = await fetchFn(url, { method: "POST", headers, body });
+    if (!res.ok) {
+      return { ok: false, reason: `http_${res.status}` };
+    }
+    let preferred;
+    let supported;
+    try {
+      const json = await res.json();
+      preferred = json.preferred_model;
+      supported = json.supported_models;
+    } catch {
+      preferred = opts.preferredModel ?? null;
+      supported = opts.supportedModels ?? null;
+    }
+    return { ok: true, preferred_model: preferred, supported_models: supported };
+  } catch (err) {
+    return {
+      ok: false,
+      reason: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+function formatModelHeartbeatLog(opts) {
+  const preferred = (opts.preferred ?? "").trim();
+  const supported = opts.supported ?? [];
+  const bits = [
+    preferred ? `preferred_model=${preferred}` : "",
+    supported.length ? `supported_models=${supported.join(",")}` : ""
+  ].filter(Boolean);
+  return bits.length ? ` ${bits.join(" ")}` : "";
+}
+
+// src/commands/heartbeat.ts
 function heartbeatCommand() {
   return new import_commander3.Command("heartbeat").description("Send a heartbeat to keep this agent online").option("-i, --agent-id <id>", "Agent ID (defaults to value in ~/.acn/config.json)").option(
     "-m, --model <modelId>",
     "Declare runtime model (Host Catalog id) for Host Pricing prefill \u2014 self-reported (env: ACN_PREFERRED_MODEL)"
-  ).action(async (opts) => {
-    const config = loadConfig();
-    const agentId = opts.agentId ?? config.agent_id;
-    if (!agentId) {
-      console.error("No agent ID found. Run `acn join` first or pass --agent-id.");
-      process.exit(1);
-    }
-    try {
-      const model = opts.model && opts.model.trim() || process.env.ACN_PREFERRED_MODEL?.trim() || "";
-      const body = model ? { preferred_model: model.slice(0, 200) } : void 0;
-      const res = await acnPost(`/agents/${agentId}/heartbeat`, body);
-      const modelNote = res.preferred_model ? ` (preferred_model=${res.preferred_model})` : "";
-      output(res, `Heartbeat sent for agent ${agentId}${modelNote}`);
-    } catch (err) {
-      handleError(err);
+  ).option(
+    "--supported-models <ids>",
+    "Comma-separated models this runtime can run (Interfaze composer; env: ACN_SUPPORTED_MODELS)"
+  ).option(
+    "--clear-supported-models",
+    "Clear metadata.supported_models on the server (sends empty list)"
+  ).action(
+    async (opts) => {
+      const config = loadConfig();
+      const agentId = opts.agentId ?? config.agent_id;
+      if (!agentId) {
+        console.error("No agent ID found. Run `acn join` first or pass --agent-id.");
+        process.exit(1);
+      }
+      try {
+        if (opts.clearSupportedModels && opts.supportedModels?.trim()) {
+          console.error(
+            "Use either --supported-models or --clear-supported-models, not both."
+          );
+          process.exit(1);
+        }
+        const preferred = resolvePreferredModel({ model: opts.model });
+        const supported = resolveSupportedModels({
+          models: opts.supportedModels,
+          clear: !!opts.clearSupportedModels
+        });
+        const body = {};
+        if (preferred) body.preferred_model = preferred;
+        if (supported !== void 0) body.supported_models = supported;
+        const res = await acnPost(`/agents/${agentId}/heartbeat`, Object.keys(body).length ? body : void 0);
+        const notes = [
+          res.preferred_model ? `preferred_model=${res.preferred_model}` : "",
+          res.supported_models != null ? `supported_models=${res.supported_models.join(",") || "(cleared)"}` : ""
+        ].filter(Boolean);
+        const modelNote = notes.length ? ` (${notes.join(" ")})` : "";
+        output(res, `Heartbeat sent for agent ${agentId}${modelNote}`);
+      } catch (err) {
+        handleError(err);
+      }
     }
-  });
+  );
 }
 
 // src/commands/rotate-key.ts
@@ -1480,12 +1582,23 @@ function extractChatEnvelope(message) {
   if (!chatId || !replyPath) return null;
   if (replyChannel !== CHAT_REPLY_CHANNEL) return null;
   if (!isAllowedChatReplyPath(chatId, replyPath)) return null;
+  const requested = asNonEmptyString(ap.requested_model);
+  let maxOut = null;
+  const rawMax = ap.max_output_tokens;
+  if (typeof rawMax === "number" && Number.isFinite(rawMax) && rawMax > 0) {
+    maxOut = Math.floor(rawMax);
+  } else if (typeof rawMax === "string" && rawMax.trim()) {
+    const n = Number.parseInt(rawMax.trim(), 10);
+    if (Number.isFinite(n) && n > 0) maxOut = n;
+  }
   return {
     chat_id: chatId,
     reply_path: replyPath,
     reply_channel: CHAT_REPLY_CHANNEL,
     gateway_message_id: asNonEmptyString(ap.message_id) ?? asNonEmptyString(ap.messageId),
-    user_text: extractUserText(message)
+    user_text: extractUserText(message),
+    requested_model: requested ? requested.slice(0, 200) : null,
+    max_output_tokens: maxOut
   };
 }
 function normalizeEvent(body, opts = {}) {
@@ -1628,8 +1741,8 @@ function extractUsage(payload) {
   const rec = asRecord2(payload);
   if (!rec) return void 0;
   const usageRec = asRecord2(rec.usage) ?? rec;
-  const input = asNonNegInt(usageRec.input_tokens) ?? asNonNegInt(usageRec.prompt_tokens);
-  const output2 = asNonNegInt(usageRec.output_tokens) ?? asNonNegInt(usageRec.completion_tokens);
+  const input = asNonNegInt(usageRec.input_tokens) ?? asNonNegInt(usageRec.prompt_tokens) ?? asNonNegInt(usageRec.input);
+  const output2 = asNonNegInt(usageRec.output_tokens) ?? asNonNegInt(usageRec.completion_tokens) ?? asNonNegInt(usageRec.output);
   if (input === null && output2 === null) return void 0;
   const out = {
     input_tokens: input ?? 0,
@@ -1641,6 +1754,18 @@ function extractUsage(payload) {
   }
   const modelId = extractModelId(payload);
   if (modelId) out.model_id = modelId;
+  const reasoning = asNonNegInt(usageRec.reasoning_tokens) ?? asNonNegInt(usageRec.reasoningTokens);
+  const cacheRead = asNonNegInt(usageRec.cache_read_tokens) ?? asNonNegInt(usageRec.cacheRead);
+  const cacheWrite = asNonNegInt(usageRec.cache_write_tokens) ?? asNonNegInt(usageRec.cacheWrite);
+  const total = asNonNegInt(usageRec.total_tokens) ?? asNonNegInt(usageRec.total);
+  const duration = asNonNegInt(usageRec.duration_ms) ?? asNonNegInt(usageRec.durationMs) ?? asNonNegInt(rec.duration_ms) ?? asNonNegInt(rec.durationMs);
+  const provider = typeof usageRec.provider === "string" && usageRec.provider.trim() || typeof rec.provider === "string" && rec.provider.trim() || "";
+  if (reasoning !== null) out.reasoning_tokens = reasoning;
+  if (cacheRead !== null) out.cache_read_tokens = cacheRead;
+  if (cacheWrite !== null) out.cache_write_tokens = cacheWrite;
+  if (total !== null) out.total_tokens = total;
+  if (duration !== null) out.duration_ms = duration;
+  if (provider) out.provider = provider.slice(0, 80);
   return out;
 }
 function parseCompletePayload(payload) {
@@ -1813,6 +1938,24 @@ async function postWriteback(event, complete, opts, deps) {
     if (complete.usage.model_id) {
       usageBody.model_id = complete.usage.model_id;
     }
+    if (complete.usage.reasoning_tokens != null) {
+      usageBody.reasoning_tokens = complete.usage.reasoning_tokens;
+    }
+    if (complete.usage.cache_read_tokens != null) {
+      usageBody.cache_read_tokens = complete.usage.cache_read_tokens;
+    }
+    if (complete.usage.cache_write_tokens != null) {
+      usageBody.cache_write_tokens = complete.usage.cache_write_tokens;
+    }
+    if (complete.usage.total_tokens != null) {
+      usageBody.total_tokens = complete.usage.total_tokens;
+    }
+    if (complete.usage.duration_ms != null) {
+      usageBody.duration_ms = complete.usage.duration_ms;
+    }
+    if (complete.usage.provider) {
+      usageBody.provider = complete.usage.provider;
+    }
     body.usage = usageBody;
   } else if (complete.modelId) {
     body.usage = { model_id: complete.modelId };
@@ -2297,43 +2440,6 @@ var KEEPALIVE_INTERVAL_MS = 3e4;
 var MODEL_HEARTBEAT_INTERVAL_MS = 15 * 6e4;
 var INITIAL_BACKOFF_MS = 1e3;
 var MAX_BACKOFF_MS = 3e4;
-function resolvePreferredModel(opts) {
-  const env = opts?.env ?? process.env;
-  const fromFlag = opts?.model?.trim();
-  if (fromFlag) return fromFlag.slice(0, 200);
-  const fromEnv = env.ACN_PREFERRED_MODEL?.trim();
-  if (fromEnv) return fromEnv.slice(0, 200);
-  return void 0;
-}
-async function postAgentHeartbeat(opts) {
-  const fetchFn = opts.fetchFn ?? fetch;
-  const origin = opts.baseUrl.replace(/\/+$/, "");
-  const url = `${origin}/api/v1/agents/${opts.agentId}/heartbeat`;
-  const headers = {
-    Authorization: `Bearer ${opts.apiKey}`,
-    "Content-Type": "application/json"
-  };
-  const body = opts.preferredModel && opts.preferredModel.trim() ? JSON.stringify({ preferred_model: opts.preferredModel.trim().slice(0, 200) }) : void 0;
-  try {
-    const res = await fetchFn(url, { method: "POST", headers, body });
-    if (!res.ok) {
-      return { ok: false, reason: `http_${res.status}` };
-    }
-    let preferred;
-    try {
-      const json = await res.json();
-      preferred = json.preferred_model;
-    } catch {
-      preferred = opts.preferredModel ?? null;
-    }
-    return { ok: true, preferred_model: preferred };
-  } catch (err) {
-    return {
-      ok: false,
-      reason: err instanceof Error ? err.message : String(err)
-    };
-  }
-}
 function runListener(cfg) {
   const wsUrl = toWebsocketUrl(cfg.baseUrl, cfg.agentId);
   let backoff = INITIAL_BACKOFF_MS;
@@ -2346,25 +2452,32 @@ function runListener(cfg) {
     let keepalive;
     let modelHeartbeat;
     const sendModelHeartbeat = () => {
-      if (!cfg.preferredModel || stopped) return;
+      if (stopped) return;
+      if (!cfg.preferredModel && cfg.supportedModels === void 0) return;
       void postAgentHeartbeat({
         baseUrl: cfg.baseUrl,
         agentId: cfg.agentId,
         apiKey: cfg.apiKey,
-        preferredModel: cfg.preferredModel
+        preferredModel: cfg.preferredModel,
+        supportedModels: cfg.supportedModels
       }).then((r) => {
         if (!r.ok) {
-          console.error(`[acn listen] preferred_model heartbeat failed: ${r.reason}`);
+          console.error(`[acn listen] model heartbeat failed: ${r.reason}`);
           return;
         }
-        console.error(
-          `[acn listen] preferred_model heartbeat ok model=${r.preferred_model ?? cfg.preferredModel}`
-        );
+        const note = formatModelHeartbeatLog({
+          preferred: r.preferred_model ?? cfg.preferredModel,
+          supported: r.supported_models ?? cfg.supportedModels
+        });
+        console.error(`[acn listen] model heartbeat ok${note}`);
       });
     };
     ws.on("open", () => {
       const mode = cfg.runtime ? `runtime=${cfg.runtime.runtime}` : cfg.forward ? `forward=${cfg.forward}` : `exec`;
-      const modelNote = cfg.preferredModel ? ` preferred_model=${cfg.preferredModel}` : "";
+      const modelNote = formatModelHeartbeatLog({
+        preferred: cfg.preferredModel,
+        supported: cfg.supportedModels
+      });
       console.error(
         `[acn listen] connected as ${cfg.agentId} \u2192 ${wsUrl} (${mode})${modelNote}`
       );
@@ -2374,7 +2487,7 @@ function runListener(cfg) {
           ws.send(JSON.stringify({ type: "ping" }));
         }
       }, KEEPALIVE_INTERVAL_MS);
-      if (cfg.preferredModel) {
+      if (cfg.preferredModel || cfg.supportedModels !== void 0) {
         sendModelHeartbeat();
         modelHeartbeat = setInterval(sendModelHeartbeat, MODEL_HEARTBEAT_INTERVAL_MS);
       }
@@ -2488,6 +2601,12 @@ function listenCommand() {
   ).option("-i, --agent-id <id>", "Agent ID (defaults to config)").option(
     "-m, --model <modelId>",
     "Declare runtime model (Host Catalog id) on connect + every 15m via REST heartbeat (self-reported; env: ACN_PREFERRED_MODEL)"
+  ).option(
+    "--supported-models <ids>",
+    "Comma-separated Host Catalog model ids this runtime can run (Interfaze composer dropdown; env: ACN_SUPPORTED_MODELS)"
+  ).option(
+    "--clear-supported-models",
+    "Clear metadata.supported_models on the server (sends empty list)"
   ).action(
     (opts) => {
       const config = loadConfig();
@@ -2579,11 +2698,22 @@ function listenCommand() {
         audience: process.env.ACN_CHAT_JWT_AUDIENCE?.trim() || process.env.AGENTPLANET_JWT_AUDIENCE?.trim()
       });
       const preferredModel = resolvePreferredModel({ model: opts.model });
+      if (opts.clearSupportedModels && opts.supportedModels?.trim()) {
+        console.error(
+          "Use either --supported-models or --clear-supported-models, not both."
+        );
+        process.exit(1);
+      }
+      const supportedModels = resolveSupportedModels({
+        models: opts.supportedModels,
+        clear: !!opts.clearSupportedModels
+      });
       runListener({
         agentId,
         apiKey,
         baseUrl: config.base_url,
         preferredModel,
+        supportedModels,
         forward: opts.forward,
         exec: opts.exec,
         runtime: opts.runtime ? {

package/package.json

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