@acnlabs/acn-cli 1.0.0 → 1.0.2

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.0",
+      version: "1.0.2",
       description: "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
       main: "dist/index.js",
       bin: {
@@ -429,21 +429,129 @@ function joinCommand() {
 
 // src/commands/heartbeat.ts
 var import_commander3 = require("commander");
-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)").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);
+
+// 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 res = await acnPost(`/agents/${agentId}/heartbeat`);
-      output(res, `Heartbeat sent for agent ${agentId}`);
-    } catch (err) {
-      handleError(err);
+      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)"
+  ).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
@@ -1474,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 = {}) {
@@ -1604,6 +1723,20 @@ function asNonNegInt(v) {
   }
   return null;
 }
+function extractModelId(payload) {
+  const rec = asRecord2(payload);
+  if (!rec) return void 0;
+  const usageRec = asRecord2(rec.usage);
+  for (const raw of [
+    usageRec?.model_id,
+    usageRec?.model,
+    rec.model_id,
+    rec.model
+  ]) {
+    if (typeof raw === "string" && raw.trim()) return raw.trim().slice(0, 200);
+  }
+  return void 0;
+}
 function extractUsage(payload) {
   const rec = asRecord2(payload);
   if (!rec) return void 0;
@@ -1619,13 +1752,19 @@ function extractUsage(payload) {
   if (ms === "peer_self" || ms === "gateway" || ms === "runtime_attested" || ms === "protocol") {
     out.meter_source = ms;
   }
+  const modelId = extractModelId(payload);
+  if (modelId) out.model_id = modelId;
   return out;
 }
 function parseCompletePayload(payload) {
   const content = extractContent(payload);
   if (!content) return { ok: false, reason: "complete_missing_content" };
   const usage = extractUsage(payload);
-  return { ok: true, result: usage ? { content, usage } : { content } };
+  const modelId = extractModelId(payload);
+  const result = { content };
+  if (usage) result.usage = usage;
+  else if (modelId) result.modelId = modelId;
+  return { ok: true, result };
 }
 async function mintAgentJwt(opts, fetchFn = fetch) {
   const now = Math.floor(Date.now() / 1e3);
@@ -1779,11 +1918,17 @@ async function postWriteback(event, complete, opts, deps) {
     reply_to_id: replyToId
   };
   if (complete.usage) {
-    body.usage = {
+    const usageBody = {
       input_tokens: complete.usage.input_tokens,
       output_tokens: complete.usage.output_tokens,
       meter_source: complete.usage.meter_source ?? "peer_self"
     };
+    if (complete.usage.model_id) {
+      usageBody.model_id = complete.usage.model_id;
+    }
+    body.usage = usageBody;
+  } else if (complete.modelId) {
+    body.usage = { model_id: complete.modelId };
   }
   const postOnce = async (token) => {
     const controller = new AbortController();
@@ -2262,6 +2407,7 @@ function rawToString(data) {
   return Buffer.from(data).toString("utf-8");
 }
 var KEEPALIVE_INTERVAL_MS = 3e4;
+var MODEL_HEARTBEAT_INTERVAL_MS = 15 * 6e4;
 var INITIAL_BACKOFF_MS = 1e3;
 var MAX_BACKOFF_MS = 3e4;
 function runListener(cfg) {
@@ -2274,15 +2420,47 @@ function runListener(cfg) {
       headers: { Authorization: `Bearer ${cfg.apiKey}` }
     });
     let keepalive;
+    let modelHeartbeat;
+    const sendModelHeartbeat = () => {
+      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,
+        supportedModels: cfg.supportedModels
+      }).then((r) => {
+        if (!r.ok) {
+          console.error(`[acn listen] model heartbeat failed: ${r.reason}`);
+          return;
+        }
+        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`;
-      console.error(`[acn listen] connected as ${cfg.agentId} \u2192 ${wsUrl} (${mode})`);
+      const modelNote = formatModelHeartbeatLog({
+        preferred: cfg.preferredModel,
+        supported: cfg.supportedModels
+      });
+      console.error(
+        `[acn listen] connected as ${cfg.agentId} \u2192 ${wsUrl} (${mode})${modelNote}`
+      );
       backoff = INITIAL_BACKOFF_MS;
       keepalive = setInterval(() => {
         if (ws.readyState === import_ws.default.OPEN) {
           ws.send(JSON.stringify({ type: "ping" }));
         }
       }, KEEPALIVE_INTERVAL_MS);
+      if (cfg.preferredModel || cfg.supportedModels !== void 0) {
+        sendModelHeartbeat();
+        modelHeartbeat = setInterval(sendModelHeartbeat, MODEL_HEARTBEAT_INTERVAL_MS);
+      }
     });
     ws.on("message", (data) => {
       let frame;
@@ -2304,6 +2482,7 @@ function runListener(cfg) {
     });
     ws.on("close", (code, reason) => {
       if (keepalive) clearInterval(keepalive);
+      if (modelHeartbeat) clearInterval(modelHeartbeat);
       if (stopped) return;
       if (code === 4401 || code === 4403 || code === 4429) {
         console.error(
@@ -2389,7 +2568,16 @@ function listenCommand() {
     "--chat-complete-timeout <ms>",
     `Host complete timeout in ms (default ${DEFAULT_COMPLETE_TIMEOUT_MS})`,
     String(DEFAULT_COMPLETE_TIMEOUT_MS)
-  ).option("-i, --agent-id <id>", "Agent ID (defaults to config)").action(
+  ).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();
       const apiKey = config.api_key;
@@ -2479,10 +2667,23 @@ function listenCommand() {
         agentId,
         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,7 +1,7 @@
 {
   "name": "@acnlabs/acn-cli",
-  "version": "1.0.0",
-  "description": "Official CLI for ACN (Agent Collaboration Network) — zero-integration agent access",
+  "version": "1.0.2",
+  "description": "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
   "main": "dist/index.js",
   "bin": {
     "acn": "dist/index.js"