felo-ai 0.2.4 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "felo-ai",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Felo AI CLI - real-time search and PPT generation from the terminal",
   "type": "module",
   "main": "src/cli.js",

package/src/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { createRequire } from 'module';
 import { Command } from 'commander';

package/src/slides.js

@@ -1,22 +1,26 @@
-import { getApiKey, fetchWithTimeoutAndRetry, NO_KEY_MESSAGE } from './search.js';
+import {
+  getApiKey,
+  fetchWithTimeoutAndRetry,
+  NO_KEY_MESSAGE,
+} from "./search.js";
 
-const DEFAULT_API_BASE = 'https://openapi.felo.ai';
+const DEFAULT_API_BASE = "https://openapi.felo.ai";
 const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
 const POLL_INTERVAL_MS = 10_000;
 const MAX_POLL_TIMEOUT_MS = 1_200_000; // 20 minutes max wait
 
-const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 const STATUS_LINE_PAD = 50;
 
 /** API base URL (default https://openapi.felo.ai). Override via FELO_API_BASE env or config if needed. */
 async function getApiBase() {
   let base = process.env.FELO_API_BASE?.trim();
   if (!base) {
-    const { getConfigValue } = await import('./config.js');
-    const v = await getConfigValue('FELO_API_BASE');
-    base = typeof v === 'string' ? v.trim() : '';
+    const { getConfigValue } = await import("./config.js");
+    const v = await getConfigValue("FELO_API_BASE");
+    base = typeof v === "string" ? v.trim() : "";
   }
-  const normalized = (base || DEFAULT_API_BASE).replace(/\/$/, '');
+  const normalized = (base || DEFAULT_API_BASE).replace(/\/$/, "");
   return normalized;
 }
 
@@ -24,19 +28,21 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-/** Write a single overwritable status line: spinner + elapsed. Call clearStatusLine() before next stdout. */
-function writeStatusLine(spinnerFrame, elapsedSec) {
+/** Write status line: spinner + elapsed. When overwrite is true use \\r (TTY); else use \\n so non-TTY still shows animation. */
+function writeStatusLine(spinnerFrame, elapsedSec, overwrite = true) {
   const s = `Generating slides... ${spinnerFrame} ${elapsedSec}s`;
-  const padded = s.padEnd(STATUS_LINE_PAD, ' ');
-  process.stderr.write(`\r${padded}`);
+  const padded = s.padEnd(STATUS_LINE_PAD, " ");
+  process.stderr.write(overwrite ? `\r${padded}` : `${padded}\n`);
 }
 
 function clearStatusLine() {
-  process.stderr.write(`\r${' '.repeat(STATUS_LINE_PAD)}\r`);
+  process.stderr.write(`\r${" ".repeat(STATUS_LINE_PAD)}\r`);
 }
 
 function normalizeTaskStatus(status) {
-  return String(status || '').trim().toUpperCase();
+  return String(status || "")
+    .trim()
+    .toUpperCase();
 }
 
 /**
@@ -48,11 +54,11 @@ async function createPptTask(apiKey, query, timeoutMs, apiBase) {
   const res = await fetchWithTimeoutAndRetry(
     url,
     {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Accept': 'application/json',
-        'Authorization': `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
+        Accept: "application/json",
+        Authorization: `Bearer ${apiKey}`,
+        "Content-Type": "application/json",
       },
       body: JSON.stringify({ query: query.trim() }),
     },
@@ -61,19 +67,20 @@ async function createPptTask(apiKey, query, timeoutMs, apiBase) {
 
   const data = await res.json().catch(() => ({}));
 
-  if (data.status === 'error') {
-    const msg = data.message || data.code || 'Unknown error';
+  if (data.status === "error") {
+    const msg = data.message || data.code || "Unknown error";
     throw new Error(msg);
   }
 
   if (!res.ok) {
-    const msg = data.message || data.error || res.statusText || `HTTP ${res.status}`;
+    const msg =
+      data.message || data.error || res.statusText || `HTTP ${res.status}`;
     throw new Error(msg);
   }
 
   const payload = data.data;
   if (!payload || !payload.task_id) {
-    throw new Error('Unexpected response: missing task_id');
+    throw new Error("Unexpected response: missing task_id");
   }
 
   return payload;
@@ -88,10 +95,10 @@ async function getTaskHistorical(apiKey, taskId, timeoutMs, apiBase) {
   const res = await fetchWithTimeoutAndRetry(
     url,
     {
-      method: 'GET',
+      method: "GET",
       headers: {
-        'Accept': 'application/json',
-        'Authorization': `Bearer ${apiKey}`,
+        Accept: "application/json",
+        Authorization: `Bearer ${apiKey}`,
       },
     },
     timeoutMs
@@ -99,19 +106,20 @@ async function getTaskHistorical(apiKey, taskId, timeoutMs, apiBase) {
 
   const data = await res.json().catch(() => ({}));
 
-  if (data.status === 'error') {
-    const msg = data.message || data.code || 'Unknown error';
+  if (data.status === "error") {
+    const msg = data.message || data.code || "Unknown error";
     throw new Error(msg);
   }
 
   if (!res.ok) {
-    const msg = data.message || data.error || res.statusText || `HTTP ${res.status}`;
+    const msg =
+      data.message || data.error || res.statusText || `HTTP ${res.status}`;
     throw new Error(msg);
   }
 
   const payload = data.data;
   if (!payload) {
-    throw new Error('Unexpected response: missing data');
+    throw new Error("Unexpected response: missing data");
   }
 
   return {
@@ -120,6 +128,7 @@ async function getTaskHistorical(apiKey, taskId, timeoutMs, apiBase) {
     ppt_biz_id: payload.ppt_biz_id,
     live_doc_url: payload.live_doc_url,
     live_doc_short_id: payload.live_doc_short_id ?? payload.livedoc_short_id,
+    error_message: payload.error_message,
   };
 }
 
@@ -141,64 +150,85 @@ export async function slides(query, options = {}) {
   try {
     const apiBase = await getApiBase();
 
-    process.stderr.write('Creating PPT task...\n');
+    process.stderr.write("Creating PPT task...\n");
 
-    const createResult = await createPptTask(apiKey, query, requestTimeoutMs, apiBase);
+    const createResult = await createPptTask(
+      apiKey,
+      query,
+      requestTimeoutMs,
+      apiBase
+    );
     const taskId = createResult.task_id;
 
     if (options.json && options.verbose) {
       process.stderr.write(`Task ID: ${taskId}\n`);
     }
 
-    const useLiveStatus =
-      process.stderr.isTTY && !options.verbose && !options.json;
+    // 默认显示 spinner 动画；仅在使用 -v/--json 时改为逐行状态输出
+    const useLiveStatus = !options.verbose && !options.json;
+    const canOverwriteLine = process.stderr.isTTY && useLiveStatus;
     if (!useLiveStatus) {
-      process.stderr.write('Generating slides (this may take a minute)...\n');
+      process.stderr.write("Generating slides (this may take a minute)...\n");
     }
 
     const startTime = Date.now();
     let lastStatus;
     let spinIndex = 0;
-    if (useLiveStatus) writeStatusLine(SPINNER_FRAMES[0], 0);
+    if (useLiveStatus) writeStatusLine(SPINNER_FRAMES[0], 0, canOverwriteLine);
 
     while (Date.now() - startTime < pollTimeoutMs) {
       await sleep(pollIntervalMs);
 
-      const historical = await getTaskHistorical(apiKey, taskId, requestTimeoutMs, apiBase);
+      const historical = await getTaskHistorical(
+        apiKey,
+        taskId,
+        requestTimeoutMs,
+        apiBase
+      );
       const normalizedStatus = normalizeTaskStatus(historical.task_status);
       lastStatus = normalizedStatus || historical.task_status;
 
       const elapsed = Math.floor((Date.now() - startTime) / 1000);
       if (useLiveStatus) {
         spinIndex = (spinIndex + 1) % SPINNER_FRAMES.length;
-        writeStatusLine(SPINNER_FRAMES[spinIndex], elapsed);
+        writeStatusLine(SPINNER_FRAMES[spinIndex], elapsed, canOverwriteLine);
       } else if (!options.verbose && !options.json) {
         process.stderr.write(`  Generating... ${elapsed}s\n`);
       }
 
-      const done = normalizedStatus === 'COMPLETED' || normalizedStatus === 'SUCCESS';
+      const done =
+        normalizedStatus === "COMPLETED" || normalizedStatus === "SUCCESS";
       if (done) {
-        if (useLiveStatus) clearStatusLine();
+        if (useLiveStatus && canOverwriteLine) clearStatusLine();
         const pptUrl =
           historical.ppt_url ||
-          (historical.ppt_biz_id ? `https://dev.felo.ai/slides/${historical.ppt_biz_id}` : null);
+          (historical.ppt_biz_id
+            ? `https://dev.felo.ai/slides/${historical.ppt_biz_id}`
+            : null);
         const liveDocUrl =
           historical.live_doc_url ||
-          (historical.live_doc_short_id ? `https://felo.ai/livedoc/${historical.live_doc_short_id}` : null) ||
-          (createResult.livedoc_short_id ? `https://felo.ai/livedoc/${createResult.livedoc_short_id}` : null);
+          (historical.live_doc_short_id
+            ? `https://felo.ai/livedoc/${historical.live_doc_short_id}`
+            : null) ||
+          (createResult.livedoc_short_id
+            ? `https://felo.ai/livedoc/${createResult.livedoc_short_id}`
+            : null);
         const url = pptUrl || liveDocUrl;
         if (options.json) {
           console.log(
             JSON.stringify(
               {
-                status: 'ok',
+                status: "ok",
                 data: {
                   task_id: taskId,
                   task_status: normalizedStatus || historical.task_status,
                   ppt_url: pptUrl,
-                  ppt_biz_id: historical.ppt_biz_id ?? createResult.ppt_business_id,
+                  ppt_biz_id:
+                    historical.ppt_biz_id ?? createResult.ppt_business_id,
                   live_doc_url: liveDocUrl,
-                  livedoc_short_id: historical.live_doc_short_id ?? createResult.livedoc_short_id,
+                  livedoc_short_id:
+                    historical.live_doc_short_id ??
+                    createResult.livedoc_short_id,
                   ppt_business_id: createResult.ppt_business_id,
                 },
               },
@@ -209,40 +239,94 @@ export async function slides(query, options = {}) {
         } else {
           if (url) {
             if (pptUrl && !options.json) {
-              process.stderr.write('PPT ready. Open this link to preview:\n');
+              process.stderr.write("PPT ready. Open this link to preview:\n");
             }
             console.log(pptUrl || liveDocUrl);
           } else {
             if (useLiveStatus) clearStatusLine();
-            console.error('Error: Completed but no ppt_url or live_doc_url in response');
+            console.error(
+              "Error: Completed but no ppt_url or live_doc_url in response"
+            );
             return 1;
           }
         }
         return 0;
       }
 
-      if (
-        normalizedStatus === 'FAILED' ||
-        normalizedStatus === 'ERROR'
-      ) {
-        if (useLiveStatus) clearStatusLine();
-        console.error(`Error: Task finished with status: ${normalizedStatus || historical.task_status}`);
+      const terminalErrorStatuses = [
+        "FAILED",
+        "PENDING",
+        "EXPIRED",
+        "CANCELED",
+      ];
+
+      if (terminalErrorStatuses.includes(normalizedStatus)) {
+        if (useLiveStatus && canOverwriteLine) clearStatusLine();
+
+        const liveDocUrl =
+          historical.live_doc_url ||
+          (historical.live_doc_short_id
+            ? `https://felo.ai/livedoc/${historical.live_doc_short_id}`
+            : null) ||
+          (createResult.livedoc_short_id
+            ? `https://felo.ai/livedoc/${createResult.livedoc_short_id}`
+            : null);
+
+        const errorMessage =
+          historical.error_message ||
+          `Task finished with status: ${
+            normalizedStatus || historical.task_status
+          }`;
+
+        if (options.json) {
+          console.log(
+            JSON.stringify(
+              {
+                status: "error",
+                data: {
+                  task_id: taskId,
+                  task_status: normalizedStatus || historical.task_status,
+                  live_doc_url: liveDocUrl,
+                  livedoc_short_id:
+                    historical.live_doc_short_id ??
+                    createResult.livedoc_short_id,
+                  error_message: errorMessage,
+                },
+              },
+              null,
+              2
+            )
+          );
+        } else {
+          if (liveDocUrl) {
+            console.log(liveDocUrl);
+          }
+          console.error(errorMessage);
+        }
+
         return 1;
       }
 
       if (options.verbose) {
-        process.stderr.write(`  Status: ${normalizedStatus || historical.task_status || 'UNKNOWN'}\n`);
+        process.stderr.write(
+          `  Status: ${
+            normalizedStatus || historical.task_status || "UNKNOWN"
+          }\n`
+        );
       }
     }
 
-    if (useLiveStatus) clearStatusLine();
+    if (useLiveStatus && canOverwriteLine) clearStatusLine();
     console.error(
-      `Error: Timed out after ${pollTimeoutMs / 1000}s. Last status: ${lastStatus ?? 'unknown'}`
+      `Error: Timed out after ${pollTimeoutMs / 1000}s. Last status: ${
+        lastStatus ?? "unknown"
+      }`
     );
     return 1;
   } catch (err) {
-    if (process.stderr.isTTY && !options.verbose && !options.json) clearStatusLine();
-    console.error('Error:', err.message || err);
+    if (process.stderr.isTTY && !options.verbose && !options.json)
+      clearStatusLine();
+    console.error("Error:", err.message || err);
     return 1;
   }
 }