@acnlabs/acn-cli 0.14.2 → 1.0.0

package/dist/index.js

@@ -31,7 +31,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@acnlabs/acn-cli",
-      version: "0.14.2",
+      version: "1.0.0",
       description: "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
       main: "dist/index.js",
       bin: {
@@ -1560,7 +1560,7 @@ function validateChatWritebackOptions(opts) {
   const hasUrl = Boolean(opts.chatCompleteUrl?.trim());
   const hasExec = Boolean(opts.chatCompleteExec?.trim());
   if (hasUrl === hasExec) {
-    return '--chat-writeback requires exactly one of --chat-complete-url or --chat-complete-exec (host returns JSON {"content":"..."}).';
+    return '--chat-writeback requires exactly one of --chat-complete-url or --chat-complete-exec (host returns JSON {"content":"..."} and optional usage).';
   }
   return null;
 }
@@ -1594,6 +1594,39 @@ function extractContent(payload) {
   }
   return null;
 }
+function asNonNegInt(v) {
+  if (typeof v === "number" && Number.isFinite(v) && v >= 0) {
+    return Math.floor(v);
+  }
+  if (typeof v === "string" && v.trim() !== "") {
+    const n = Number(v);
+    if (Number.isFinite(n) && n >= 0) return Math.floor(n);
+  }
+  return null;
+}
+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);
+  if (input === null && output2 === null) return void 0;
+  const out = {
+    input_tokens: input ?? 0,
+    output_tokens: output2 ?? 0
+  };
+  const ms = usageRec.meter_source;
+  if (ms === "peer_self" || ms === "gateway" || ms === "runtime_attested" || ms === "protocol") {
+    out.meter_source = ms;
+  }
+  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 } };
+}
 async function mintAgentJwt(opts, fetchFn = fetch) {
   const now = Math.floor(Date.now() / 1e3);
   if (cachedJwt && cachedJwt.agentId === opts.agentId && cachedJwt.expEpochSec > now + 60) {
@@ -1661,9 +1694,7 @@ async function completeViaHttp(event, opts, deps) {
     } catch {
       return { ok: false, reason: "complete_invalid_json" };
     }
-    const content = extractContent(parsed);
-    if (!content) return { ok: false, reason: "complete_missing_content" };
-    return { ok: true, content };
+    return parseCompletePayload(parsed);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     if (controller.signal.aborted || /abort|timeout/i.test(msg)) {
@@ -1711,12 +1742,7 @@ function completeViaExec(event, opts, deps) {
       const text = Buffer.concat(stdout).toString("utf-8").trim();
       try {
         const parsed = JSON.parse(text);
-        const content = extractContent(parsed);
-        if (!content) {
-          finish({ ok: false, reason: "complete_missing_content" });
-          return;
-        }
-        finish({ ok: true, content });
+        finish(parseCompletePayload(parsed));
       } catch {
         finish({ ok: false, reason: "complete_invalid_json" });
       }
@@ -1724,7 +1750,7 @@ function completeViaExec(event, opts, deps) {
     child.stdin?.end(body);
   });
 }
-async function postWriteback(event, content, opts, deps) {
+async function postWriteback(event, complete, opts, deps) {
   const chat = event.chat;
   if (!chat) return { ok: false, reason: "no_chat_envelope" };
   if (!isAllowedChatReplyPath(chat.chat_id, chat.reply_path)) {
@@ -1747,6 +1773,18 @@ async function postWriteback(event, content, opts, deps) {
     return { ok: false, reason: "reply_url_origin_mismatch" };
   }
   const timeoutMs = opts.writebackTimeoutMs ?? DEFAULT_WRITEBACK_TIMEOUT_MS;
+  const replyToId = chat.gateway_message_id ?? event.message_id;
+  const body = {
+    content: complete.content,
+    reply_to_id: replyToId
+  };
+  if (complete.usage) {
+    body.usage = {
+      input_tokens: complete.usage.input_tokens,
+      output_tokens: complete.usage.output_tokens,
+      meter_source: complete.usage.meter_source ?? "peer_self"
+    };
+  }
   const postOnce = async (token) => {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
@@ -1757,7 +1795,7 @@ async function postWriteback(event, content, opts, deps) {
           "content-type": "application/json",
           Authorization: `Bearer ${token}`
         },
-        body: JSON.stringify({ content }),
+        body: JSON.stringify(body),
         signal: controller.signal
       });
       if (res.status === 200 || res.status === 201) {
@@ -1813,15 +1851,16 @@ async function handleChatWriteback(event, opts, deps = {}) {
     );
     return { ok: false, reason: completed.reason };
   }
-  const written = await postWriteback(event, completed.content, opts, deps);
+  const written = await postWriteback(event, completed.result, opts, deps);
   if (!written.ok) {
     logFn(
       `[acn listen] chat_writeback_failed chat_id=${event.chat.chat_id} message_id=${event.message_id} reason=${written.reason}`
     );
     return written;
   }
+  const usageNote = completed.result.usage ? ` usage_in=${completed.result.usage.input_tokens} usage_out=${completed.result.usage.output_tokens}` : "";
   logFn(
-    `[acn listen] chat_writeback_ok chat_id=${event.chat.chat_id} message_id=${event.message_id} http=${written.httpStatus}`
+    `[acn listen] chat_writeback_ok chat_id=${event.chat.chat_id} message_id=${event.message_id} http=${written.httpStatus}${usageNote}`
   );
   return written;
 }

package/package.json

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