@acnlabs/acn-cli 1.0.11 → 1.0.12

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.11",
+      version: "1.0.12",
       description: "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
       main: "dist/index.js",
       bin: {
@@ -1761,6 +1761,144 @@ function canCompleteOfficialHop(opts) {
     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);
+}
+function isSseContentType(contentType) {
+  return contentType.toLowerCase().includes("text/event-stream");
+}
+async function pipeWebStream(body, res) {
+  const reader = body.getReader();
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      if (!value?.length) continue;
+      const ok = res.write(Buffer.from(value));
+      if (!ok) {
+        await new Promise((resolve) => res.once("drain", resolve));
+      }
+    }
+    res.end();
+  } catch (err) {
+    if (!res.writableEnded) res.destroy(err instanceof Error ? err : void 0);
+  } finally {
+    try {
+      reader.releaseLock();
+    } catch {
+    }
+  }
+}
+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 ct = upstream.headers.get("content-type") || "application/json";
+    const sse = isSseContentType(ct) && upstream.body != null;
+    const streamOk = body.stream === true && upstream.body != null && upstream.status < 400;
+    if (sse || streamOk) {
+      res.writeHead(upstream.status, {
+        "content-type": isSseContentType(ct) ? ct : "text/event-stream",
+        "cache-control": "no-cache",
+        connection: "keep-alive",
+        "x-accel-buffering": "no"
+      });
+      await pipeWebStream(upstream.body, res);
+      return;
+    }
+    const out = Buffer.from(await upstream.arrayBuffer());
+    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;
@@ -1976,7 +2114,7 @@ function completeInferenceEnv(event, opts, jwt, door) {
   }
   return { ...process.env, ...extra };
 }
-function completeInferenceHeaders(event, opts) {
+function completeInferenceHeaders(event, opts, jwt, door) {
   const headers = {
     "content-type": "application/json"
   };
@@ -1987,9 +2125,14 @@ function completeInferenceHeaders(event, opts) {
   if (chat?.host_inference_url) {
     headers["X-ACN-Host-Inference-Url"] = chat.host_inference_url;
   }
+  if (jwt) headers["X-ACN-Agent-Jwt"] = jwt;
+  if (door?.baseUrl && jwt) {
+    headers["X-ACN-OpenAI-Base-Url"] = door.baseUrl;
+    headers["X-ACN-OpenAI-Api-Key"] = jwt;
+  }
   return headers;
 }
-async function completeViaHttp(event, opts, deps) {
+async function completeViaHttp(event, opts, deps, jwt, door) {
   const fetchFn = deps.fetchFn ?? fetch;
   const timeoutMs = opts.completeTimeoutMs ?? DEFAULT_COMPLETE_TIMEOUT_MS;
   const controller = new AbortController();
@@ -1997,7 +2140,7 @@ async function completeViaHttp(event, opts, deps) {
   try {
     const res = await fetchFn(opts.completeUrl, {
       method: "POST",
-      headers: completeInferenceHeaders(event, opts),
+      headers: completeInferenceHeaders(event, opts, jwt, door),
       body: JSON.stringify(event),
       signal: controller.signal
     });
@@ -2085,6 +2228,9 @@ function officialCompleteFailureContent(reason, model) {
   if (mid && !officialV0SupportsModel(mid)) {
     return `Official v0 is a single completion and cannot run thinking/reasoning models (${mid}). Switch to a chat model such as kimi-k2.5.`;
   }
+  if (reason === "official_host_unseen") {
+    return "Official hop failed: Host did not see this hop. Complete must call OPENAI_BASE_URL (Host), not a BYO / TokenHub key.";
+  }
   return `Official hop failed (${reason}). Try kimi or another chat model.`;
 }
 async function completeOfficialViaHost(event, opts, deps, jwt) {
@@ -2153,6 +2299,73 @@ async function completeOfficialViaHost(event, opts, deps, jwt) {
     clearTimeout(timer);
   }
 }
+async function loadOfficialHostMeter(event, opts, deps, jwt) {
+  const chat = event.chat;
+  const base = asHostInferenceUrl(chat?.host_inference_url);
+  const hopId = chat?.hop_id?.trim();
+  if (!base || !hopId) return { ok: false, reason: "official_complete_skipped" };
+  const fetchFn = deps.fetchFn ?? fetch;
+  try {
+    const res = await fetchFn(`${base}/hops/${encodeURIComponent(hopId)}`, {
+      headers: {
+        authorization: `Bearer ${jwt}`,
+        "X-Hop-Id": hopId,
+        "X-Agent-Id": opts.agentId
+      }
+    });
+    if (res.status < 200 || res.status >= 300) {
+      return { ok: false, reason: `official_meter_http_${res.status}` };
+    }
+    let payload;
+    try {
+      payload = JSON.parse(await res.text());
+    } catch {
+      return { ok: false, reason: "official_meter_invalid_json" };
+    }
+    return { ok: true, seen: payload.seen === true };
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return { ok: false, reason: `official_meter_unreachable:${msg.slice(0, 80)}` };
+  }
+}
+async function completeOfficialViaAgent(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();
+  if (model && !officialV0SupportsModel(model)) {
+    return { ok: false, reason: "official_complete_unsupported_model" };
+  }
+  const logFn = deps.logFn ?? ((line) => console.error(line));
+  logFn(
+    `[acn listen] official_complete_via_agent chat_id=${chat.chat_id}` + (model ? ` model=${model}` : "")
+  );
+  const door = await startOfficialHopDoor({
+    hostInferenceUrl: chat.host_inference_url,
+    hopId: chat.hop_id,
+    agentId: opts.agentId,
+    jwt,
+    fetchFn: deps.fetchFn
+  });
+  if (!door) return { ok: false, reason: "official_door_failed" };
+  try {
+    const completed = opts.completeUrl ? await completeViaHttp(event, opts, deps, jwt, door) : await spawnCompleteExec(event, opts, deps, jwt, door);
+    if (!completed.ok) return completed;
+    const meter = await loadOfficialHostMeter(event, opts, deps, jwt);
+    if (!meter.ok) return meter;
+    if (!meter.seen) return { ok: false, reason: "official_host_unseen" };
+    return { ok: true, result: { content: completed.result.content } };
+  } finally {
+    await door.close();
+  }
+}
 async function completeViaExec(event, opts, deps, jwt) {
   return spawnCompleteExec(event, opts, deps, jwt);
 }
@@ -2299,7 +2512,11 @@ async function handleChatWriteback(event, opts, deps = {}) {
   }
   let completed;
   if (event.chat.inference_path === "official") {
-    completed = await completeOfficialViaHost(event, opts, deps, jwt);
+    if (opts.completeUrl || opts.completeExec) {
+      completed = await completeOfficialViaAgent(event, opts, deps, jwt);
+    } else {
+      completed = await completeOfficialViaHost(event, opts, deps, jwt);
+    }
   } else if (opts.completeUrl) {
     completed = await completeViaHttp(event, opts, deps);
   } else if (opts.completeExec) {
@@ -2545,7 +2762,7 @@ function formatWakeFailed(event, reason) {
 function formatDeduped(event) {
   return `[acn listen] deduped key=${dedupeKey(event)}`;
 }
-function dispatchLocalReceiver(correlationId, bodyText, opts, dedupeStore, send, deps = {}) {
+function dispatchLocalReceiver(correlationId, bodyText, opts, dedupeStore, send2, deps = {}) {
   const logFn = deps.logFn ?? ((line) => console.error(line));
   const result = processIncomingRequest(
     correlationId,
@@ -2554,7 +2771,7 @@ function dispatchLocalReceiver(correlationId, bodyText, opts, dedupeStore, send,
     dedupeStore,
     deps
   );
-  send(result.response);
+  send2(result.response);
   if (result.dedupeHit && result.event) {
     logFn(formatDeduped(result.event));
     return;
@@ -2615,7 +2832,7 @@ function errorResponse(id, status, detail) {
     body: JSON.stringify({ error: detail })
   };
 }
-async function dispatchA2aRequest(frame, opts, send, deps = {}) {
+async function dispatchA2aRequest(frame, opts, send2, deps = {}) {
   const bodyBuf = decodeBody(frame);
   try {
     if (opts.runtime) {
@@ -2625,7 +2842,7 @@ async function dispatchA2aRequest(frame, opts, send, deps = {}) {
         bodyBuf.toString("utf-8"),
         opts.runtime,
         store,
-        send,
+        send2,
         {
           fetchFn: deps.fetchFn,
           spawnFn: deps.spawnFn,
@@ -2635,17 +2852,17 @@ async function dispatchA2aRequest(frame, opts, send, deps = {}) {
       return;
     }
     if (opts.forward) {
-      await forwardToHttp(frame, bodyBuf, opts.forward, deps.fetchFn ?? fetch, send);
+      await forwardToHttp(frame, bodyBuf, opts.forward, deps.fetchFn ?? fetch, send2);
       return;
     }
     if (opts.exec) {
-      send(await runExec(frame, bodyBuf, opts.exec, deps.spawnFn ?? import_child_process3.spawn));
+      send2(await runExec(frame, bodyBuf, opts.exec, deps.spawnFn ?? import_child_process3.spawn));
       return;
     }
-    send(errorResponse(frame.id, 500, "no handler configured"));
+    send2(errorResponse(frame.id, 500, "no handler configured"));
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    send(errorResponse(frame.id, 502, `handler failed: ${msg}`));
+    send2(errorResponse(frame.id, 502, `handler failed: ${msg}`));
   }
 }
 function buildForwardHeaders(frame) {
@@ -2655,7 +2872,7 @@ function buildForwardHeaders(frame) {
   }
   return headers;
 }
-async function forwardToHttp(frame, bodyBuf, base, fetchFn, send) {
+async function forwardToHttp(frame, bodyBuf, base, fetchFn, send2) {
   const suffix = frame.path && frame.path !== "/" ? "/" + frame.path.replace(/^\//, "") : "";
   const targetUrl = base.replace(/\/$/, "") + suffix;
   const method = (frame.method ?? "POST").toUpperCase();
@@ -2673,7 +2890,7 @@ async function forwardToHttp(frame, bodyBuf, base, fetchFn, send) {
         const { done, value } = await reader.read();
         if (done) break;
         if (value && value.length > 0) {
-          send({
+          send2({
             type: "a2a_stream_chunk",
             id: frame.id,
             seq: seq++,
@@ -2682,17 +2899,17 @@ async function forwardToHttp(frame, bodyBuf, base, fetchFn, send) {
           });
         }
       }
-      send({ type: "a2a_stream_end", id: frame.id, status: res.status });
+      send2({ type: "a2a_stream_end", id: frame.id, status: res.status });
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
-      send({ type: "a2a_stream_end", id: frame.id, error: msg });
+      send2({ type: "a2a_stream_end", id: frame.id, error: msg });
     } finally {
       reader.releaseLock();
     }
     return;
   }
   const respText = await res.text();
-  send({
+  send2({
     type: "a2a_response",
     id: frame.id,
     status: res.status,
@@ -2803,12 +3020,12 @@ function runListener(cfg) {
       if (!frame || typeof frame !== "object") return;
       const f = frame;
       if (f.type === "a2a_request" && typeof f.id === "string") {
-        const send = (out) => {
+        const send2 = (out) => {
           if (ws.readyState === import_ws.default.OPEN) {
             ws.send(JSON.stringify(out));
           }
         };
-        void dispatchA2aRequest(f, cfg, send, { dedupeStore });
+        void dispatchA2aRequest(f, cfg, send2, { dedupeStore });
       }
     });
     ws.on("close", (code, reason) => {
@@ -2891,13 +3108,13 @@ function listenCommand() {
     "Deprecated/ignored: writeback now mints ACN agent JWT from api-key"
   ).option(
     "--chat-complete-url <url>",
-    "BYO complete URL (optional if official-only; mutually exclusive with --chat-complete-exec)"
+    "Complete URL (optional if official-only; mutually exclusive with --chat-complete-exec). Official hops open a Host door and require a Host invoice."
   ).option(
     "--chat-complete-exec <cmd>",
-    'BYO only (optional if official-only): stdin event \u2192 stdout {"content"}. Official hops complete via Host.'
+    'Complete exec (optional if official-only): stdin event \u2192 stdout {"content"}. Official hops with this flag open a Host door and require a Host invoice.'
   ).option(
     "--chat-complete-timeout <ms>",
-    `Complete timeout in ms (official default ${DEFAULT_OFFICIAL_COMPLETE_TIMEOUT_MS}; BYO default ${DEFAULT_COMPLETE_TIMEOUT_MS})`
+    `Complete timeout in ms (CLI-owned official default ${DEFAULT_OFFICIAL_COMPLETE_TIMEOUT_MS}; agent/BYO default ${DEFAULT_COMPLETE_TIMEOUT_MS})`
   ).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)"

package/package.json

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