tuna-agent 0.1.154 → 0.1.156

package/dist/daemon/analyze-video-handler.js

@@ -116,6 +116,65 @@ function run(cmd, args, opts = {}) {
         p.on('close', (code) => code === 0 ? resolve({ out, err }) : reject(new Error(`${cmd} exit ${code}: ${err.slice(0, 500)}`)));
     });
 }
+// Modern Chrome UA — TikTok/Douyin reject unknown user-agents.
+const SRC_UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36';
+// Optional cookies for auth-gated sources (Facebook private/page videos,
+// some Douyin). YT_DLP_COOKIES = path to a Netscape cookies.txt; or
+// YT_DLP_COOKIES_FROM_BROWSER = a browser name yt-dlp can read cookies from.
+function cookieArgs() {
+    if (process.env.YT_DLP_COOKIES)
+        return ['--cookies', process.env.YT_DLP_COOKIES];
+    if (process.env.YT_DLP_COOKIES_FROM_BROWSER)
+        return ['--cookies-from-browser', process.env.YT_DLP_COOKIES_FROM_BROWSER];
+    return [];
+}
+function detectPlatform(url) {
+    let h = '';
+    try {
+        h = new URL(url).hostname.toLowerCase();
+    }
+    catch { /* malformed → 'other' */ }
+    if (/(^|\.)youtube\.com$|(^|\.)youtu\.be$/.test(h))
+        return 'youtube';
+    if (/(^|\.)tiktok\.com$/.test(h))
+        return 'tiktok';
+    if (/douyin\.com$|iesdouyin\.com$/.test(h))
+        return 'douyin';
+    if (/facebook\.com$|fb\.watch$|(^|\.)fb\.com$/.test(h))
+        return 'facebook';
+    return 'other';
+}
+// Download a source video across YouTube / TikTok / Douyin / Facebook.
+// yt-dlp supports all of them, but a single rigid `-f` that works for
+// YouTube fails on the others, so try a tolerant 720p-capped format then
+// fall back to letting yt-dlp pick. UA + optional cookies harden the
+// non-YouTube extractors (FB private/page + Douyin need cookies).
+async function downloadSourceVideo(url, dest) {
+    const platform = detectPlatform(url);
+    const common = [
+        '--no-playlist', '--no-warnings', '--retries', '3', '--fragment-retries', '3',
+        '--user-agent', SRC_UA, ...cookieArgs(), '-o', dest, url,
+    ];
+    const attempts = [
+        ['-f', 'bv*[height<=720]+ba/b[height<=720]/best', ...common],
+        ['-f', 'best/mp4', ...common], // let yt-dlp choose (TikTok/Douyin/FB quirks)
+    ];
+    let lastErr;
+    for (let i = 0; i < attempts.length; i++) {
+        try {
+            await run(YT_DLP, attempts[i]);
+            return;
+        }
+        catch (e) {
+            lastErr = e;
+            console.warn(`[analyze_video] yt-dlp attempt ${i + 1}/${attempts.length} failed (${platform}): ${String(e?.message || e).slice(0, 220)}`);
+        }
+    }
+    const hint = (platform === 'facebook' || platform === 'douyin')
+        ? ' — FB private/page & some Douyin need cookies (set YT_DLP_COOKIES)'
+        : '';
+    throw new Error(`yt-dlp failed for ${platform} after ${attempts.length} attempts${hint}: ${String(lastErr?.message || lastErr).slice(0, 300)}`);
+}
 async function whisperTranscribe(audioPath) {
     if (!OPENAI_KEY)
         throw new Error('OPENAI_API_KEY not set');
@@ -450,7 +509,7 @@ export async function analyzeVideo(url, onProgress) {
             // analyze of the same URL never reads a half-written file.
             const dlTmp = path.join(CACHE_DIR, `${urlHash}.dl-${crypto.randomBytes(4).toString('hex')}.mp4`);
             try {
-                await run(YT_DLP, ['-f', 'best[height<=720]/best', '-o', dlTmp, '--no-playlist', '--quiet', url]);
+                await downloadSourceVideo(url, dlTmp);
                 await fs.rename(dlTmp, videoPath);
             }
             catch (e) {
@@ -462,7 +521,7 @@ export async function analyzeVideo(url, onProgress) {
         // clone idea gets a real name instead of "Clone: www.youtube.com".
         let source_title = '';
         try {
-            const t = await run(YT_DLP, ['--skip-download', '--no-warnings', '--no-playlist', '--print', '%(title)s', url]);
+            const t = await run(YT_DLP, ['--skip-download', '--no-warnings', '--no-playlist', '--user-agent', SRC_UA, ...cookieArgs(), '--print', '%(title)s', url]);
             source_title = (t.out || '').trim().split('\n')[0].slice(0, 200);
         }
         catch { /* title is best-effort — analysis still proceeds without it */ }

package/dist/daemon/extension-handlers.js

@@ -118,21 +118,26 @@ export async function handleClaudePrompt(ws, code, taskId, prompt, systemPrompt,
     }
 }
 // ─── Handler: claude_prompt_stream (prompt → streamed text + JSON result) ────
-// Track active stream tasks by code so we can abort previous ones
+// Track active stream tasks by taskId (UNIQUE per request). Was keyed by
+// `code` (the shared pair code) which made concurrent claude_prompt_stream
+// calls abort each other — fatal for the batched clone pool (5 parallel
+// chunks → siblings killed → batches hang at 0). taskId is unique so streams
+// run independently; a superseded request gets a fresh taskId anyway.
 const _activeStreamTasks = new Map();
 export async function handleClaudePromptStream(ws, code, taskId, prompt, systemPrompt) {
     console.log(`[claude_prompt_stream] Received: ${prompt.substring(0, 100)}...`);
-    // Kill previous stream task for same code (e.g. user clicked Regenerate again)
-    const prev = _activeStreamTasks.get(code);
+    // Per-taskId (unique): never aborts a concurrent sibling. (Re-clicked
+    // Regenerate arrives with a new taskId; the old one finishes on its own.)
+    const prev = _activeStreamTasks.get(taskId);
     if (prev) {
-        console.log(`[claude_prompt_stream] Aborting previous task for code=${code}`);
+        console.log(`[claude_prompt_stream] Aborting previous task for taskId=${taskId}`);
         prev.abort();
     }
     const abortController = new AbortController();
-    _activeStreamTasks.set(code, abortController);
+    _activeStreamTasks.set(taskId, abortController);
     if (!hasContentCreator()) {
         const error = 'content-creator agent not found on this machine';
-        _activeStreamTasks.delete(code);
+        _activeStreamTasks.delete(taskId);
         ws.sendExtensionDone(code, taskId, { error });
         return;
     }
@@ -190,11 +195,11 @@ export async function handleClaudePromptStream(ws, code, taskId, prompt, systemP
                 }
                 catch { }
         }
-        _activeStreamTasks.delete(code);
+        _activeStreamTasks.delete(taskId);
         ws.sendExtensionDone(code, taskId, { result: parsed, raw: text });
     }
     catch (err) {
-        _activeStreamTasks.delete(code);
+        _activeStreamTasks.delete(taskId);
         if (abortController.signal.aborted) {
             console.log(`[claude_prompt_stream] Aborted (replaced by new task)`);
             return; // Don't send error — new task is already running

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tuna-agent",
-  "version": "0.1.154",
+  "version": "0.1.156",
   "description": "Tuna Agent - Run AI coding tasks on your machine",
   "bin": {
     "tuna-agent": "dist/cli/index.js"