echopai 2.8.0 → 2.8.1

package/dist/bin.js

@@ -3430,6 +3430,22 @@ function buildHttpHeaders(ctx) {
 function resolveRequestId(serverHeader, clientGenerated) {
   return serverHeader && serverHeader.length > 0 ? serverHeader : clientGenerated;
 }
+var DEFAULT_REQUEST_TIMEOUT_MS = 30000;
+var WHOAMI_TIMEOUT_MS = 8000;
+async function fetchWithTimeout(fn, url, init, timeoutMs = DEFAULT_REQUEST_TIMEOUT_MS) {
+  const ac = new AbortController;
+  const timer = setTimeout(() => ac.abort(), timeoutMs);
+  try {
+    return await fn(url, { ...init, signal: ac.signal });
+  } catch (e) {
+    if (ac.signal.aborted) {
+      throw new Error(`request timed out after ${timeoutMs}ms: ${url}`);
+    }
+    throw e;
+  } finally {
+    clearTimeout(timer);
+  }
+}
 
 // src/runtime/trace.ts
 import {
@@ -3560,7 +3576,10 @@ async function paginate(op, initialParams, ctx, write = writeStdout) {
       process.stderr.write(`> [page ${pages + 1}] ${op.method} ${url}
 `);
     }
-    const res = await fetchFn(url, { method: op.method, headers });
+    const res = await fetchWithTimeout(fetchFn, url, {
+      method: op.method,
+      headers
+    });
     const body = await res.text();
     let json = null;
     try {
@@ -3700,7 +3719,7 @@ import os2 from "node:os";
 import path2 from "node:path";
 
 // src/version.ts
-var CLI_VERSION = "2.8.0";
+var CLI_VERSION = "2.8.1";
 
 // src/runtime/update_check.ts
 var UPDATE_CACHE_PATH = path2.join(os2.homedir(), ".config", "echopai", "update_cache.json");
@@ -3943,7 +3962,7 @@ async function invoke(op, args, ctx) {
   const startedAt = Date.now();
   let res;
   try {
-    res = await fetch(url, init);
+    res = await fetchWithTimeout(fetch, url, init);
   } catch (e) {
     trace(op, { exit_code: 2, error_code: "network_error" });
     writeError("network_error", e instanceof Error ? e.message : String(e), 2);
@@ -4172,7 +4191,7 @@ async function getWhoami(ctx, opts) {
   if (inflight && inflight.key === key) {
     return inflight.promise;
   }
-  const promise = doFetch(ctx, opts?.fetchImpl).then((resp) => {
+  const promise = doFetch(ctx, opts?.fetchImpl, opts?.requestTimeoutMs).then((resp) => {
     cache = { key, resp, expiresAt: Date.now() + ttlMs };
     return resp;
   }).finally(() => {
@@ -4182,7 +4201,7 @@ async function getWhoami(ctx, opts) {
   inflight = { key, promise };
   return promise;
 }
-async function doFetch(ctx, fetchImpl) {
+async function doFetch(ctx, fetchImpl, requestTimeoutMs = WHOAMI_TIMEOUT_MS) {
   const fn = fetchImpl ?? fetch;
   const url = ctx.baseUrl.replace(/\/+$/, "") + "/v1/auth/whoami";
   const { headers, requestId: clientRequestId } = buildHttpHeaders({
@@ -4192,7 +4211,7 @@ async function doFetch(ctx, fetchImpl) {
   });
   let res;
   try {
-    res = await fn(url, { method: "GET", headers });
+    res = await fetchWithTimeout(fn, url, { method: "GET", headers }, requestTimeoutMs);
   } catch (e) {
     throw new CallApiError({
       code: "network_error",
@@ -4338,7 +4357,7 @@ async function callOp(op, args, ctx) {
   const startedAt = Date.now();
   let res;
   try {
-    res = await fetchFn(url, init);
+    res = await fetchWithTimeout(fetchFn, url, init);
   } catch (e) {
     throw new CallApiError({
       code: "network_error",
@@ -6606,24 +6625,51 @@ function buildMcpCommand() {
       }
       throw e;
     }
-    let whoami;
-    try {
-      whoami = await getWhoami({
-        baseUrl: creds.baseUrl,
-        bearer: creds.key,
-        cliVersion: CLI_VERSION,
-        channel: "mcp"
-      });
-    } catch (e) {
-      process.stderr.write(`[mcp] whoami failed: ${e instanceof Error ? e.message : String(e)}
+    const WHOAMI_MAX_ATTEMPTS = 3;
+    const WHOAMI_BACKOFF_MS = [500, 1500];
+    const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+    let whoami = null;
+    let lastErr = null;
+    for (let attempt = 1;attempt <= WHOAMI_MAX_ATTEMPTS; attempt++) {
+      try {
+        whoami = await getWhoami({
+          baseUrl: creds.baseUrl,
+          bearer: creds.key,
+          cliVersion: CLI_VERSION,
+          channel: "mcp"
+        });
+        break;
+      } catch (e) {
+        lastErr = e;
+        const status = e instanceof CallApiError ? e.httpStatus : undefined;
+        const code = e instanceof CallApiError ? e.code : undefined;
+        const isAuthError = status === 401 || status === 403 || code === "auth_missing" || code === "forbidden";
+        if (isAuthError) {
+          process.stderr.write(`[mcp] whoami auth failed${status ? ` (HTTP ${status})` : ""}: ` + `${e instanceof Error ? e.message : String(e)}
+` + "[mcp] hint: key 失效或无权限，请 `echopai login` 或检查 ECHOPAI_KEY。\n");
+          process.exit(1);
+        }
+        if (attempt < WHOAMI_MAX_ATTEMPTS) {
+          const backoffMs = WHOAMI_BACKOFF_MS[attempt - 1] ?? 1500;
+          process.stderr.write(`[mcp] whoami attempt ${attempt}/${WHOAMI_MAX_ATTEMPTS} failed ` + `(${e instanceof Error ? e.message : String(e)}); ` + `retrying in ${backoffMs}ms
 `);
-      process.exit(1);
+          await sleep(backoffMs);
+        }
+      }
     }
-    const tokenScopes = new Set(whoami.scopes);
-    const availableVerbs = filterAvailableVerbs(ALL_VERB_SPECS, tokenScopes);
-    process.stderr.write(`[mcp] kind=${whoami.kind} scopes=[${whoami.scopes.join(",")}]
+    let availableVerbs;
+    if (whoami) {
+      const tokenScopes = new Set(whoami.scopes);
+      availableVerbs = filterAvailableVerbs(ALL_VERB_SPECS, tokenScopes);
+      process.stderr.write(`[mcp] kind=${whoami.kind} scopes=[${whoami.scopes.join(",")}]
 ` + `[mcp] exposing ${availableVerbs.length}/${ALL_VERB_SPECS.length} curated verbs as MCP tools
 `);
+    } else {
+      availableVerbs = [...ALL_VERB_SPECS];
+      process.stderr.write(`[mcp] whoami failed after ${WHOAMI_MAX_ATTEMPTS} attempts: ` + `${lastErr instanceof Error ? lastErr.message : String(lastErr)}
+` + `[mcp] degraded start: exposing all ${availableVerbs.length} curated verbs; ` + `scopes enforced per-call by the server
+`);
+    }
     const server = new McpServer({
       name: "echopai",
       version: CLI_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echopai",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "Command-line interface for the EchoPai Open Platform: stock-market data, news, analyst views, sentiment, signals, backtests.",
   "license": "MIT",
   "homepage": "https://echopai.com",