@acnlabs/acn-cli 1.0.9 → 1.0.11

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.9",
+      version: "1.0.11",
       description: "Official CLI for ACN (Agent Collaboration Network) \u2014 zero-integration agent access",
       main: "dist/index.js",
       bin: {
@@ -1764,6 +1764,8 @@ function canCompleteOfficialHop(opts) {
 
 // src/commands/chat-writeback.ts
 var DEFAULT_COMPLETE_TIMEOUT_MS = 12e4;
+var DEFAULT_OFFICIAL_COMPLETE_TIMEOUT_MS = 28e3;
+var JWT_MINT_ATTEMPTS = 3;
 var DEFAULT_WRITEBACK_TIMEOUT_MS = 3e4;
 var DEFAULT_CHAT_JWT_AUDIENCE = "https://api.agentplanet.org";
 var cachedJwt = null;
@@ -1911,41 +1913,50 @@ async function mintAgentJwt(opts, fetchFn = fetch) {
     return { ok: true, token: cachedJwt.token };
   }
   const url = `${opts.acnBaseUrl.replace(/\/+$/, "")}/oauth/token`;
-  try {
-    const res = await fetchFn(url, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({
-        grant_type: "client_credentials",
-        client_id: opts.agentId,
-        client_secret: opts.apiKey,
-        audience: opts.audience
-      })
-    });
-    const text = await res.text();
-    if (res.status < 200 || res.status >= 300) {
-      return { ok: false, reason: `oauth_http_${res.status}` };
-    }
-    let parsed;
+  let lastReason = "oauth_failed";
+  for (let attempt = 1; attempt <= JWT_MINT_ATTEMPTS; attempt++) {
     try {
-      parsed = JSON.parse(text);
-    } catch {
-      return { ok: false, reason: "oauth_invalid_json" };
-    }
-    const rec = asRecord2(parsed);
-    const token = typeof rec?.access_token === "string" ? rec.access_token.trim() : "";
-    if (!token) return { ok: false, reason: "oauth_missing_access_token" };
-    const expiresIn = typeof rec?.expires_in === "number" && rec.expires_in > 0 ? rec.expires_in : 1800;
-    cachedJwt = {
-      token,
-      agentId: opts.agentId,
-      expEpochSec: now + expiresIn
-    };
-    return { ok: true, token };
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    return { ok: false, reason: msg.slice(0, 200) };
+      const res = await fetchFn(url, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({
+          grant_type: "client_credentials",
+          client_id: opts.agentId,
+          client_secret: opts.apiKey,
+          audience: opts.audience
+        })
+      });
+      const text = await res.text();
+      if (res.status < 200 || res.status >= 300) {
+        lastReason = `oauth_http_${res.status}`;
+      } else {
+        let parsed;
+        try {
+          parsed = JSON.parse(text);
+        } catch {
+          lastReason = "oauth_invalid_json";
+          continue;
+        }
+        const rec = asRecord2(parsed);
+        const token = typeof rec?.access_token === "string" ? rec.access_token.trim() : "";
+        if (!token) {
+          lastReason = "oauth_missing_access_token";
+          continue;
+        }
+        const expiresIn = typeof rec?.expires_in === "number" && rec.expires_in > 0 ? rec.expires_in : 1800;
+        cachedJwt = {
+          token,
+          agentId: opts.agentId,
+          expEpochSec: now + expiresIn
+        };
+        return { ok: true, token };
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      lastReason = msg.slice(0, 200);
+    }
   }
+  return { ok: false, reason: lastReason };
 }
 function clearAgentJwtCache() {
   cachedJwt = null;
@@ -2059,6 +2070,23 @@ function spawnCompleteExec(event, opts, deps, jwt, door) {
     child.stdin?.end(body);
   });
 }
+var OFFICIAL_V0_O_SERIES = /(^|\/)o[134](?:$|[-/:])/;
+function officialV0SupportsModel(modelId) {
+  const id = (modelId || "").trim().toLowerCase();
+  if (!id) return true;
+  if (id.includes("-think") || id.includes(":thinking") || id.includes("reasoning")) {
+    return false;
+  }
+  if (id.includes("deepseek-r1")) return false;
+  return !OFFICIAL_V0_O_SERIES.test(id);
+}
+function officialCompleteFailureContent(reason, model) {
+  const mid = (model || "").trim();
+  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.`;
+  }
+  return `Official hop failed (${reason}). Try kimi or another chat model.`;
+}
 async function completeOfficialViaHost(event, opts, deps, jwt) {
   const chat = event.chat;
   if (!chat) return { ok: false, reason: "no_chat_envelope" };
@@ -2073,13 +2101,16 @@ async function completeOfficialViaHost(event, opts, deps, jwt) {
   const model = chat.requested_model?.trim();
   const text = chat.user_text?.trim();
   if (!model) return { ok: false, reason: "official_complete_missing_model" };
+  if (!officialV0SupportsModel(model)) {
+    return { ok: false, reason: "official_complete_unsupported_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 timeoutMs = opts.completeTimeoutMs ?? DEFAULT_OFFICIAL_COMPLETE_TIMEOUT_MS;
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
@@ -2250,6 +2281,18 @@ async function handleChatWriteback(event, opts, deps = {}) {
       logFn(
         `[acn listen] official_jwt_failed chat_id=${event.chat.chat_id} reason=${minted.reason}`
       );
+      const written2 = await postWriteback(
+        event,
+        { content: officialCompleteFailureContent(minted.reason, event.chat.requested_model) },
+        opts,
+        deps
+      );
+      if (written2.ok) {
+        logFn(
+          `[acn listen] official_fail_writeback_ok chat_id=${event.chat.chat_id} message_id=${event.message_id} reason=${minted.reason}`
+        );
+        return written2;
+      }
       return { ok: false, reason: minted.reason };
     }
     jwt = minted.token;
@@ -2268,6 +2311,20 @@ async function handleChatWriteback(event, opts, deps = {}) {
     logFn(
       `[acn listen] chat_complete_failed chat_id=${event.chat.chat_id} message_id=${event.message_id} reason=${completed.reason}`
     );
+    if (event.chat.inference_path === "official") {
+      const written2 = await postWriteback(
+        event,
+        { content: officialCompleteFailureContent(completed.reason, event.chat.requested_model) },
+        opts,
+        deps
+      );
+      if (written2.ok) {
+        logFn(
+          `[acn listen] official_fail_writeback_ok chat_id=${event.chat.chat_id} message_id=${event.message_id} reason=${completed.reason}`
+        );
+        return written2;
+      }
+    }
     return { ok: false, reason: completed.reason };
   }
   const written = await postWriteback(event, completed.result, opts, deps);
@@ -2840,8 +2897,7 @@ function listenCommand() {
     '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})`,
-    String(DEFAULT_COMPLETE_TIMEOUT_MS)
+    `Complete timeout in ms (official default ${DEFAULT_OFFICIAL_COMPLETE_TIMEOUT_MS}; 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)"
@@ -2914,10 +2970,8 @@ function listenCommand() {
       }
       const wakeTimeoutMs = Number.parseInt(opts.wakeTimeout ?? "", 10);
       const dedupeTtlSec = Number.parseInt(opts.dedupeTtl ?? "", 10);
-      const chatCompleteTimeoutMs = Number.parseInt(
-        opts.chatCompleteTimeout ?? "",
-        10
-      );
+      const rawCompleteTimeout = opts.chatCompleteTimeout?.trim();
+      const chatCompleteTimeoutMs = rawCompleteTimeout ? Number.parseInt(rawCompleteTimeout, 10) : void 0;
       if (opts.runtime && (!Number.isFinite(wakeTimeoutMs) || wakeTimeoutMs <= 0)) {
         console.error("--wake-timeout must be a positive integer (ms).");
         process.exit(1);
@@ -2926,7 +2980,7 @@ function listenCommand() {
         console.error("--dedupe-ttl must be a positive integer (seconds).");
         process.exit(1);
       }
-      if (opts.chatWriteback && (!Number.isFinite(chatCompleteTimeoutMs) || chatCompleteTimeoutMs <= 0)) {
+      if (opts.chatWriteback && rawCompleteTimeout && (!Number.isFinite(chatCompleteTimeoutMs) || (chatCompleteTimeoutMs ?? 0) <= 0)) {
         console.error("--chat-complete-timeout must be a positive integer (ms).");
         process.exit(1);
       }

package/package.json

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