felo-ai 0.2.4 → 0.2.6

package/src/cli.js

@@ -1,13 +1,15 @@
 #!/usr/bin/env node
 
-import { createRequire } from 'module';
-import { Command } from 'commander';
-import { search } from './search.js';
-import { slides } from './slides.js';
-import * as config from './config.js';
+import { createRequire } from "module";
+import { Command } from "commander";
+import { search } from "./search.js";
+import { slides } from "./slides.js";
+import { webExtract } from "./webExtract.js";
+import { youtubeSubtitling } from "./youtubeSubtitling.js";
+import * as config from "./config.js";
 
 const require = createRequire(import.meta.url);
-const pkg = require('../package.json');
+const pkg = require("../package.json");
 
 /** Delay (ms) before process.exit to let Windows libuv finish handle cleanup. */
 const EXIT_DELAY_MS = 50;
@@ -22,13 +24,13 @@ function flushStdioThenExit(code) {
   const doExit = () => setTimeout(() => process.exit(code), EXIT_DELAY_MS);
   const flushStderr = () => {
     if (process.stderr?.writable && !process.stderr.destroyed) {
-      process.stderr.write('', () => doExit());
+      process.stderr.write("", () => doExit());
     } else {
       doExit();
     }
   };
   if (process.stdout?.writable && !process.stdout.destroyed) {
-    process.stdout.write('', () => flushStderr());
+    process.stdout.write("", () => flushStderr());
   } else {
     flushStderr();
   }
@@ -37,17 +39,17 @@ function flushStdioThenExit(code) {
 const program = new Command();
 
 program
-  .name('felo')
-  .description('Felo AI CLI - real-time search from the terminal')
+  .name("felo")
+  .description("Felo AI CLI - real-time search from the terminal")
   .version(pkg.version);
 
 program
-  .command('search')
-  .description('Search for current information (weather, news, docs, etc.)')
-  .argument('<query>', 'search query')
-  .option('-j, --json', 'output raw JSON')
-  .option('-v, --verbose', 'show query analysis and sources')
-  .option('-t, --timeout <seconds>', 'request timeout in seconds', '60')
+  .command("search")
+  .description("Search for current information (weather, news, docs, etc.)")
+  .argument("<query>", "search query")
+  .option("-j, --json", "output raw JSON")
+  .option("-v, --verbose", "show query analysis and sources")
+  .option("-t, --timeout <seconds>", "request timeout in seconds", "60")
   .action(async (query, opts) => {
     const timeoutMs = parseInt(opts.timeout, 10) * 1000;
     const code = await search(query, {
@@ -60,13 +62,26 @@ program
   });
 
 program
-  .command('slides')
-  .description('Generate PPT/slides from a prompt (async task, outputs live doc URL when done)')
-  .argument('<query>', 'PPT generation prompt (e.g. "Felo, 2 pages" or "Introduction to React")')
-  .option('-j, --json', 'output raw JSON with task_id and live_doc_url')
-  .option('-v, --verbose', 'show polling status')
-  .option('-t, --timeout <seconds>', 'request timeout in seconds for each API call', '60')
-  .option('--poll-timeout <seconds>', 'max seconds to wait for task completion', '1200')
+  .command("slides")
+  .description(
+    "Generate PPT/slides from a prompt (async task, outputs live doc URL when done)"
+  )
+  .argument(
+    "<query>",
+    'PPT generation prompt (e.g. "Felo, 2 pages" or "Introduction to React")'
+  )
+  .option("-j, --json", "output raw JSON with task_id and live_doc_url")
+  .option("-v, --verbose", "show polling status")
+  .option(
+    "-t, --timeout <seconds>",
+    "request timeout in seconds for each API call",
+    "60"
+  )
+  .option(
+    "--poll-timeout <seconds>",
+    "max seconds to wait for task completion",
+    "1200"
+  )
   .action(async (query, opts) => {
     const timeoutMs = parseInt(opts.timeout, 10) * 1000;
     const pollTimeoutMs = parseInt(opts.pollTimeout, 10) * 1000 || 1_200_000;
@@ -81,97 +96,156 @@ program
   });
 
 const configCmd = program
-  .command('config')
-  .description('Manage persisted config (e.g. FELO_API_KEY). Stored in ~/.felo/config.json');
+  .command("config")
+  .description(
+    "Manage persisted config (e.g. FELO_API_KEY). Stored in ~/.felo/config.json"
+  );
 
 configCmd
-  .command('set <key> <value>')
-  .description('Set a config value (e.g. felo config set FELO_API_KEY your-key)')
+  .command("set <key> <value>")
+  .description(
+    "Set a config value (e.g. felo config set FELO_API_KEY your-key)"
+  )
   .action(async (key, value) => {
     try {
       await config.setConfig(key, value);
       console.log(`Set ${key}`);
       flushStdioThenExit(0);
     } catch (e) {
-      console.error('Error:', e.message);
+      console.error("Error:", e.message);
       flushStdioThenExit(1);
     }
   });
 
 configCmd
-  .command('get <key>')
-  .description('Get a config value (sensitive keys are masked)')
+  .command("get <key>")
+  .description("Get a config value (sensitive keys are masked)")
   .action(async (key) => {
     try {
       const value = await config.getConfigValue(key);
       if (value === undefined || value === null) {
-        console.log('(not set)');
+        console.log("(not set)");
       } else {
         console.log(config.maskValueForDisplay(key, value));
       }
       flushStdioThenExit(0);
     } catch (e) {
-      console.error('Error:', e.message);
+      console.error("Error:", e.message);
       flushStdioThenExit(1);
     }
   });
 
 configCmd
-  .command('list')
-  .description('List all config keys (values are hidden)')
+  .command("list")
+  .description("List all config keys (values are hidden)")
   .action(async () => {
     try {
       const c = await config.listConfig();
       const keys = Object.keys(c);
       if (keys.length === 0) {
-        console.log('No config set. Use: felo config set FELO_API_KEY <key>');
+        console.log("No config set. Use: felo config set FELO_API_KEY <key>");
       } else {
         keys.forEach((k) => console.log(k));
       }
       flushStdioThenExit(0);
     } catch (e) {
-      console.error('Error:', e.message);
+      console.error("Error:", e.message);
       flushStdioThenExit(1);
     }
   });
 
 configCmd
-  .command('unset <key>')
-  .description('Remove a config value')
+  .command("unset <key>")
+  .description("Remove a config value")
   .action(async (key) => {
     try {
       await config.unsetConfig(key);
       console.log(`Unset ${key}`);
       flushStdioThenExit(0);
     } catch (e) {
-      console.error('Error:', e.message);
+      console.error("Error:", e.message);
       flushStdioThenExit(1);
     }
   });
 
 configCmd
-  .command('path')
-  .description('Show config file path')
+  .command("path")
+  .description("Show config file path")
   .action(() => {
     console.log(config.getConfigPath());
     flushStdioThenExit(0);
   });
 
 program
-  .command('summarize')
-  .description('Summarize text or URL (coming when API is available)')
-  .argument('[input]', 'text or URL to summarize')
+  .command("web-extract")
+  .description("Extract webpage content from a URL (markdown, text, or html)")
+  .requiredOption("-u, --url <url>", "page URL to extract")
+  .option(
+    "-f, --format <format>",
+    "output format: html, text, markdown",
+    "markdown"
+  )
+  .option(
+    "--target-selector <selector>",
+    "CSS selector for target element only"
+  )
+  .option(
+    "--wait-for-selector <selector>",
+    "wait for selector before extracting"
+  )
+  .option("--readability", "use readability (main content only)")
+  .option("--crawl-mode <mode>", "crawl mode: fast or fine", "fast")
+  .option("-t, --timeout <seconds>", "request timeout in seconds", "60")
+  .option("-j, --json", "output full API response as JSON")
+  .action(async (opts) => {
+    const timeoutMs = parseInt(opts.timeout, 10) * 1000;
+    const code = await webExtract({
+      url: opts.url,
+      format: opts.format,
+      targetSelector: opts.targetSelector,
+      waitForSelector: opts.waitForSelector,
+      readability: opts.readability,
+      crawlMode: opts.crawlMode,
+      timeoutMs: Number.isNaN(timeoutMs) ? 60000 : timeoutMs,
+      json: opts.json,
+    });
+    process.exitCode = code;
+    flushStdioThenExit(code);
+  });
+
+program
+  .command("youtube-subtitling")
+  .description("Fetch YouTube video subtitles/captions by video URL or ID")
+  .requiredOption("-v, --video-code <url-or-id>", "YouTube video URL or video ID (e.g. https://youtube.com/watch?v=ID)")
+  .option("-l, --language <code>", "Subtitle language (e.g. en, zh-CN)")
+  .option("--with-time", "Include start/duration per segment")
+  .option("-j, --json", "Output full API response as JSON")
+  .action(async (opts) => {
+    const code = await youtubeSubtitling({
+      videoCode: opts.videoCode,
+      language: opts.language,
+      withTime: opts.withTime,
+      json: opts.json,
+    });
+    process.exitCode = code;
+    flushStdioThenExit(code);
+  });
+
+program
+  .command("summarize")
+  .description("Summarize text or URL (coming when API is available)")
+  .argument("[input]", "text or URL to summarize")
   .action(() => {
-    console.error('summarize: not yet implemented. Use felo search for now.');
+    console.error("summarize: not yet implemented. Use felo search for now.");
     flushStdioThenExit(1);
   });
 
 program
-  .command('translate')
-  .description('Translate text (coming when API is available)')
-  .argument('[text]', 'text to translate')
+  .command("translate")
+  .description("Translate text (coming when API is available)")
+  .argument("[text]", "text to translate")
   .action(() => {
-    console.error('translate: not yet implemented. Use felo search for now.');
+    console.error("translate: not yet implemented. Use felo search for now.");
     flushStdioThenExit(1);
   });
 

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;
   }
 }