@acnlabs/acn-cli 1.0.8 → 1.0.9

package/README.md

@@ -112,7 +112,8 @@ acn listen --runtime http \
 
 `--chat-token` is deprecated/ignored. Task / Org wakes still use `--wake-url` /
 `--wake-exec`. Chat envelopes skip wake and use the complete → writeback path
-instead.
+instead. CLI **1.0.9+** completes official hops via Host; `--chat-complete-*`
+is BYO only and may be omitted for official-only.
 
 **Coverage:** only traffic that arrives over the Mode B relay. Open Task Pool
 rows that were never pushed as A2A still need `acn tasks list` / reconcile.

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.8",
+      version: "1.0.9",
       description: "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
       main: "dist/index.js",
       bin: {
@@ -1756,112 +1756,11 @@ var DedupeStore = class {
 
 // src/commands/official-hop-door.ts
 var import_node_http = __toESM(require("http"));
-function shouldOpenOfficialDoor(opts) {
+function canCompleteOfficialHop(opts) {
   return Boolean(
     opts.inferencePath === "official" && opts.hopId?.trim() && asHostInferenceUrl(opts.hostInferenceUrl) && opts.jwt?.trim()
   );
 }
-function readBody(req) {
-  return new Promise((resolve, reject) => {
-    const chunks = [];
-    req.on("data", (c) => chunks.push(Buffer.from(c)));
-    req.on("end", () => resolve(Buffer.concat(chunks)));
-    req.on("error", reject);
-  });
-}
-function send(res, status, body, contentType = "application/json") {
-  res.writeHead(status, {
-    "content-type": contentType,
-    "content-length": String(body.length)
-  });
-  res.end(body);
-}
-async function handleDoorRequest(req, res, opts) {
-  const path = (req.url ?? "").split("?")[0];
-  if (req.method !== "POST" || path !== "/v1/chat/completions" && path !== "/chat/completions") {
-    send(res, 404, Buffer.from('{"error":"not_found"}'));
-    return;
-  }
-  let payload;
-  try {
-    const raw = await readBody(req);
-    payload = JSON.parse(raw.length ? raw.toString("utf-8") : "{}");
-  } catch {
-    send(res, 400, Buffer.from('{"error":"invalid_json"}'));
-    return;
-  }
-  if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
-    send(res, 400, Buffer.from('{"error":"invalid_json"}'));
-    return;
-  }
-  const body = { ...payload };
-  delete body.agent_id;
-  body.hop_id = opts.hopId;
-  const headers = {
-    authorization: `Bearer ${opts.jwt}`,
-    "content-type": "application/json",
-    "X-Hop-Id": opts.hopId
-  };
-  if (opts.agentId) headers["X-Agent-Id"] = opts.agentId;
-  try {
-    const upstream = await opts.fetchFn(opts.upstream, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(body)
-    });
-    const out = Buffer.from(await upstream.arrayBuffer());
-    const ct = upstream.headers.get("content-type") || "application/json";
-    send(res, upstream.status, out, ct);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    send(
-      res,
-      502,
-      Buffer.from(JSON.stringify({ error: `upstream_unreachable:${msg.slice(0, 120)}` }))
-    );
-  }
-}
-function closeServer(server) {
-  return new Promise((resolve) => {
-    server.closeAllConnections?.();
-    server.close(() => resolve());
-  });
-}
-async function startOfficialHopDoor(opts) {
-  const dest = asHostInferenceUrl(opts.hostInferenceUrl);
-  const hopId = opts.hopId.trim();
-  const jwt = opts.jwt.trim();
-  if (!dest || !hopId || !jwt) return null;
-  const fetchFn = opts.fetchFn ?? fetch;
-  const upstream = `${dest}/chat/completions`;
-  const server = import_node_http.default.createServer((req, res) => {
-    void handleDoorRequest(req, res, {
-      upstream,
-      hopId,
-      agentId: opts.agentId,
-      jwt,
-      fetchFn
-    });
-  });
-  try {
-    await new Promise((resolve, reject) => {
-      server.once("error", reject);
-      server.listen(0, "127.0.0.1", () => resolve());
-    });
-  } catch {
-    return null;
-  }
-  const addr = server.address();
-  const port = typeof addr === "object" && addr ? addr.port : 0;
-  if (!port) {
-    await closeServer(server);
-    return null;
-  }
-  return {
-    baseUrl: `http://127.0.0.1:${port}/v1`,
-    close: () => closeServer(server)
-  };
-}
 
 // src/commands/chat-writeback.ts
 var DEFAULT_COMPLETE_TIMEOUT_MS = 12e4;
@@ -1884,8 +1783,8 @@ 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":"..."} and optional usage).';
+  if (hasUrl && hasExec) {
+    return "--chat-writeback: --chat-complete-url and --chat-complete-exec are mutually exclusive (omit both for official-only; BYO hops need exactly one).";
   }
   return null;
 }
@@ -1919,6 +1818,28 @@ function extractContent(payload) {
   }
   return null;
 }
+function extractChatCompletionContent(payload) {
+  const rec = asRecord2(payload);
+  if (!rec) return null;
+  const choices = rec.choices;
+  if (Array.isArray(choices) && choices.length > 0) {
+    const first = asRecord2(choices[0]);
+    if (first) {
+      const msg = asRecord2(first.message);
+      const fromMsg = msg?.content;
+      if (typeof fromMsg === "string" && fromMsg.trim()) {
+        const t = fromMsg.trim();
+        if (t.toLowerCase() !== "accepted") return t;
+      }
+      const fromText = first.text;
+      if (typeof fromText === "string" && fromText.trim()) {
+        const t = fromText.trim();
+        if (t.toLowerCase() !== "accepted") return t;
+      }
+    }
+  }
+  return extractContent(payload);
+}
 function asNonNegInt(v) {
   if (typeof v === "number" && Number.isFinite(v) && v >= 0) {
     return Math.floor(v);
@@ -2138,44 +2059,72 @@ function spawnCompleteExec(event, opts, deps, jwt, door) {
     child.stdin?.end(body);
   });
 }
-async function completeViaExec(event, opts, deps, jwt) {
-  let door = null;
+async function completeOfficialViaHost(event, opts, deps, jwt) {
+  const chat = event.chat;
+  if (!chat) return { ok: false, reason: "no_chat_envelope" };
+  if (!canCompleteOfficialHop({
+    inferencePath: chat.inference_path,
+    hopId: chat.hop_id,
+    hostInferenceUrl: chat.host_inference_url,
+    jwt
+  })) {
+    return { ok: false, reason: "official_complete_skipped" };
+  }
+  const model = chat.requested_model?.trim();
+  const text = chat.user_text?.trim();
+  if (!model) return { ok: false, reason: "official_complete_missing_model" };
+  if (!text) return { ok: false, reason: "official_complete_missing_text" };
   const logFn = deps.logFn ?? ((line) => console.error(line));
+  logFn(
+    `[acn listen] official_complete chat_id=${chat.chat_id} model=${model}`
+  );
+  const fetchFn = deps.fetchFn ?? fetch;
+  const timeoutMs = opts.completeTimeoutMs ?? DEFAULT_COMPLETE_TIMEOUT_MS;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    if (shouldOpenOfficialDoor({
-      inferencePath: event.chat?.inference_path,
-      hopId: event.chat?.hop_id,
-      hostInferenceUrl: event.chat?.host_inference_url,
-      jwt
-    })) {
-      try {
-        door = await startOfficialHopDoor({
-          hostInferenceUrl: event.chat.host_inference_url,
-          hopId: event.chat.hop_id,
-          agentId: opts.agentId,
-          jwt,
-          fetchFn: deps.fetchFn
-        });
-      } catch {
-        door = null;
-      }
-      if (door) {
-        logFn(
-          `[acn listen] official_door chat_id=${event.chat.chat_id} base=${door.baseUrl}`
-        );
-      } else {
-        logFn(
-          `[acn listen] official_door_skipped chat_id=${event.chat.chat_id}`
-        );
-      }
+    const res = await fetchFn(`${chat.host_inference_url}/chat/completions`, {
+      method: "POST",
+      headers: {
+        authorization: `Bearer ${jwt}`,
+        "content-type": "application/json",
+        "X-Hop-Id": chat.hop_id,
+        "X-Agent-Id": opts.agentId
+      },
+      body: JSON.stringify({
+        model,
+        messages: [{ role: "user", content: text }],
+        hop_id: chat.hop_id,
+        ...chat.max_output_tokens && chat.max_output_tokens > 0 ? { max_tokens: chat.max_output_tokens } : {}
+      }),
+      signal: controller.signal
+    });
+    const raw = await res.text();
+    if (res.status < 200 || res.status >= 300) {
+      return { ok: false, reason: `official_complete_http_${res.status}` };
     }
-    return await spawnCompleteExec(event, opts, deps, jwt, door);
-  } finally {
-    if (door) {
-      await door.close().catch(() => void 0);
+    let payload;
+    try {
+      payload = JSON.parse(raw);
+    } catch {
+      return { ok: false, reason: "official_complete_invalid_json" };
+    }
+    const content = extractChatCompletionContent(payload);
+    if (!content) return { ok: false, reason: "official_complete_missing_content" };
+    return { ok: true, result: { content } };
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (controller.signal.aborted || /abort|timeout/i.test(msg)) {
+      return { ok: false, reason: "official_complete_timeout" };
     }
+    return { ok: false, reason: msg.slice(0, 200) };
+  } finally {
+    clearTimeout(timer);
   }
 }
+async function completeViaExec(event, opts, deps, jwt) {
+  return spawnCompleteExec(event, opts, deps, jwt);
+}
 async function postWriteback(event, complete, opts, deps) {
   const chat = event.chat;
   if (!chat) return { ok: false, reason: "no_chat_envelope" };
@@ -2295,11 +2244,26 @@ async function handleChatWriteback(event, opts, deps = {}) {
   const logFn = deps.logFn ?? ((line) => console.error(line));
   if (!event.chat) return { ok: false, reason: "no_chat_envelope" };
   let jwt = null;
-  if (event.chat.inference_path === "official" && opts.completeExec) {
+  if (event.chat.inference_path === "official") {
     const minted = await mintAgentJwt(opts, deps.fetchFn ?? fetch);
-    if (minted.ok) jwt = minted.token;
+    if (!minted.ok) {
+      logFn(
+        `[acn listen] official_jwt_failed chat_id=${event.chat.chat_id} reason=${minted.reason}`
+      );
+      return { ok: false, reason: minted.reason };
+    }
+    jwt = minted.token;
+  }
+  let completed;
+  if (event.chat.inference_path === "official") {
+    completed = await completeOfficialViaHost(event, opts, deps, jwt);
+  } else if (opts.completeUrl) {
+    completed = await completeViaHttp(event, opts, deps);
+  } else if (opts.completeExec) {
+    completed = await completeViaExec(event, opts, deps, jwt);
+  } else {
+    completed = { ok: false, reason: "byo_complete_missing" };
   }
-  const completed = opts.completeUrl ? await completeViaHttp(event, opts, deps) : await completeViaExec(event, opts, deps, jwt);
   if (!completed.ok) {
     logFn(
       `[acn listen] chat_complete_failed chat_id=${event.chat.chat_id} message_id=${event.message_id} reason=${completed.reason}`
@@ -2524,7 +2488,7 @@ function formatWakeFailed(event, reason) {
 function formatDeduped(event) {
   return `[acn listen] deduped key=${dedupeKey(event)}`;
 }
-function dispatchLocalReceiver(correlationId, bodyText, opts, dedupeStore, send2, deps = {}) {
+function dispatchLocalReceiver(correlationId, bodyText, opts, dedupeStore, send, deps = {}) {
   const logFn = deps.logFn ?? ((line) => console.error(line));
   const result = processIncomingRequest(
     correlationId,
@@ -2533,7 +2497,7 @@ function dispatchLocalReceiver(correlationId, bodyText, opts, dedupeStore, send2
     dedupeStore,
     deps
   );
-  send2(result.response);
+  send(result.response);
   if (result.dedupeHit && result.event) {
     logFn(formatDeduped(result.event));
     return;
@@ -2594,7 +2558,7 @@ function errorResponse(id, status, detail) {
     body: JSON.stringify({ error: detail })
   };
 }
-async function dispatchA2aRequest(frame, opts, send2, deps = {}) {
+async function dispatchA2aRequest(frame, opts, send, deps = {}) {
   const bodyBuf = decodeBody(frame);
   try {
     if (opts.runtime) {
@@ -2604,7 +2568,7 @@ async function dispatchA2aRequest(frame, opts, send2, deps = {}) {
         bodyBuf.toString("utf-8"),
         opts.runtime,
         store,
-        send2,
+        send,
         {
           fetchFn: deps.fetchFn,
           spawnFn: deps.spawnFn,
@@ -2614,17 +2578,17 @@ async function dispatchA2aRequest(frame, opts, send2, deps = {}) {
       return;
     }
     if (opts.forward) {
-      await forwardToHttp(frame, bodyBuf, opts.forward, deps.fetchFn ?? fetch, send2);
+      await forwardToHttp(frame, bodyBuf, opts.forward, deps.fetchFn ?? fetch, send);
       return;
     }
     if (opts.exec) {
-      send2(await runExec(frame, bodyBuf, opts.exec, deps.spawnFn ?? import_child_process3.spawn));
+      send(await runExec(frame, bodyBuf, opts.exec, deps.spawnFn ?? import_child_process3.spawn));
       return;
     }
-    send2(errorResponse(frame.id, 500, "no handler configured"));
+    send(errorResponse(frame.id, 500, "no handler configured"));
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    send2(errorResponse(frame.id, 502, `handler failed: ${msg}`));
+    send(errorResponse(frame.id, 502, `handler failed: ${msg}`));
   }
 }
 function buildForwardHeaders(frame) {
@@ -2634,7 +2598,7 @@ function buildForwardHeaders(frame) {
   }
   return headers;
 }
-async function forwardToHttp(frame, bodyBuf, base, fetchFn, send2) {
+async function forwardToHttp(frame, bodyBuf, base, fetchFn, send) {
   const suffix = frame.path && frame.path !== "/" ? "/" + frame.path.replace(/^\//, "") : "";
   const targetUrl = base.replace(/\/$/, "") + suffix;
   const method = (frame.method ?? "POST").toUpperCase();
@@ -2652,7 +2616,7 @@ async function forwardToHttp(frame, bodyBuf, base, fetchFn, send2) {
         const { done, value } = await reader.read();
         if (done) break;
         if (value && value.length > 0) {
-          send2({
+          send({
             type: "a2a_stream_chunk",
             id: frame.id,
             seq: seq++,
@@ -2661,17 +2625,17 @@ async function forwardToHttp(frame, bodyBuf, base, fetchFn, send2) {
           });
         }
       }
-      send2({ type: "a2a_stream_end", id: frame.id, status: res.status });
+      send({ type: "a2a_stream_end", id: frame.id, status: res.status });
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
-      send2({ type: "a2a_stream_end", id: frame.id, error: msg });
+      send({ type: "a2a_stream_end", id: frame.id, error: msg });
     } finally {
       reader.releaseLock();
     }
     return;
   }
   const respText = await res.text();
-  send2({
+  send({
     type: "a2a_response",
     id: frame.id,
     status: res.status,
@@ -2782,12 +2746,12 @@ function runListener(cfg) {
       if (!frame || typeof frame !== "object") return;
       const f = frame;
       if (f.type === "a2a_request" && typeof f.id === "string") {
-        const send2 = (out) => {
+        const send = (out) => {
           if (ws.readyState === import_ws.default.OPEN) {
             ws.send(JSON.stringify(out));
           }
         };
-        void dispatchA2aRequest(f, cfg, send2, { dedupeStore });
+        void dispatchA2aRequest(f, cfg, send, { dedupeStore });
       }
     });
     ws.on("close", (code, reason) => {
@@ -2870,10 +2834,10 @@ function listenCommand() {
     "Deprecated/ignored: writeback now mints ACN agent JWT from api-key"
   ).option(
     "--chat-complete-url <url>",
-    'POST NormalizedEvent \u2192 JSON {"content":"..."} (mutually exclusive with --chat-complete-exec)'
+    "BYO complete URL (optional if official-only; mutually exclusive with --chat-complete-exec)"
   ).option(
     "--chat-complete-exec <cmd>",
-    'Shell: event JSON on stdin \u2192 stdout JSON {"content":"..."}'
+    'BYO only (optional if official-only): stdin event \u2192 stdout {"content"}. Official hops complete via Host.'
   ).option(
     "--chat-complete-timeout <ms>",
     `Host complete timeout in ms (default ${DEFAULT_COMPLETE_TIMEOUT_MS})`,

package/package.json

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