@officexapp/vidfarm-devcli 0.21.11 → 0.21.14

package/dist/src/devcli/cost-mode.js

@@ -87,8 +87,12 @@ export function resolveCostMode(values) {
 }
 export const COST_MODE_BLURB = {
     minimize: "Minimize costs — stay on FREE local compute wherever possible (local render, " +
-        "local TTS/STT, local greenscreen/matting, reused clips + HTML motion). Billed " +
-        "cloud/AI generation is refused unless you re-confirm it (--yes).",
+        "local TTS/STT, local greenscreen/matting, reused clips + HTML motion). For assets, " +
+        'reach for the free stock catalog first — vidfarm media search "<meaning>" --type ' +
+        "bgm|sfx|image|vector|icon|video. Check the KEYLESS sources first: Openverse (CC/CC0 " +
+        "music, SFX, images) and iconify (icons) need no account at all. A free Pixabay key adds " +
+        "photos/vectors/stock-video and may already be saved (check vidfarm provider-keys). " +
+        "Billed cloud/AI generation is refused unless you re-confirm it (--yes).",
     hybrid: "Hybrid (recommended) — free where it's free, spend AI credits only where they " +
         "clearly win (a hero shot, a voice you can't fake locally). Billed ops run but " +
         "each prints its cost so nothing is a surprise.",
@@ -104,9 +108,14 @@ export function costModeSummaryLine(resolved) {
 export function costModeExplainer() {
     return [
         "How much do you want Vidfarm to spend on AI credits?",
-        "  • minimize — cheapest: free local compute, no surprise AI spend.",
+        "  • minimize — cheapest: free local compute + free stock media, no surprise AI spend.",
         "  • hybrid   — recommended: free where free, pay AI only where it clearly wins.",
-        "  • pure-ai  — best quality: use AI image/video/voice/music freely."
+        "  • pure-ai  — best quality: use AI image/video/voice/music freely.",
+        "Tip: before paying to generate music/SFX/images/video, try the free stock catalog —",
+        '  vidfarm media search "<meaning>" --type bgm|sfx|image|vector|icon|video.',
+        "  Check the keyless sources first — Openverse (CC/CC0 music, SFX, images) and iconify (icons)",
+        "  need no account. A free Pixabay key adds photos/vectors/stock-video (it may already be saved —",
+        "  check `vidfarm provider-keys` or vidfarm.cc/settings/developer; add via `vidfarm add-provider-key pixabay <key>`)."
     ].join("\n");
 }
 export class CostModeBlockedError extends Error {

package/dist/src/devcli/doctor.js

@@ -16,6 +16,8 @@ import { detectLocalAgent } from "../services/clip-curation/index.js";
 import { hasFfmpeg, resolveFfmpeg, resolveFfprobe } from "../services/clip-curation/ffmpeg.js";
 import { resolveHyperframesCli } from "./hyperframes-cli.js";
 import { resolveSkillsRoot } from "./skills.js";
+import { readStoredAuth } from "./auth-store.js";
+import { scanLocalServers, reapProcesses } from "./process-scan.js";
 const GREEN = "\x1b[32m";
 const RED = "\x1b[31m";
 const YELLOW = "\x1b[33m";
@@ -108,10 +110,14 @@ export async function runDoctorCommand(argv) {
         options: {
             host: { type: "string", default: "https://vidfarm.cc" },
             "api-key": { type: "string" },
-            json: { type: "boolean", default: false }
+            json: { type: "boolean", default: false },
+            // Reap orphaned local serve/preview processes (running from a deleted
+            // package path) so their squatted ports are reclaimed.
+            "kill-orphans": { type: "boolean", default: false }
         }
     });
     const json = Boolean(parsed.values.json);
+    const killOrphans = Boolean(parsed.values["kill-orphans"]);
     const checks = [];
     const add = (name, level, detail) => checks.push({ name, level, detail });
     // 1. Node version.
@@ -129,14 +135,21 @@ export async function runDoctorCommand(argv) {
     // 4. Chrome for the in-process render (stills / serve local render).
     const chrome = detectChromeForRender();
     add("chrome", chrome.found ? "ok" : "warn", chrome.found ? chrome.detail : `${chrome.detail} — local render/stills will try to download one on first run`);
-    // 5. Vidfarm cloud auth.
-    const apiKey = parsed.values["api-key"] ?? process.env.VIDFARM_API_KEY;
+    // 5. Vidfarm cloud auth — --api-key / env, else the persisted `vidfarm login`
+    // (auth-store), which is how most users authenticate. Without the store
+    // lookup a logged-in user got a false "VIDFARM_API_KEY not set" warning.
+    const storedAuth = readStoredAuth();
+    const explicitKey = parsed.values["api-key"] ?? process.env.VIDFARM_API_KEY;
+    const apiKey = explicitKey ?? storedAuth?.apiKey;
     if (apiKey) {
-        const who = await fetchWhoami(String(parsed.values.host).replace(/\/+$/, ""), apiKey);
-        add("vidfarm auth", who.ok ? "ok" : "warn", who.ok ? who.detail : `${who.detail} — serve will fall back to local browse mode`);
+        // A stored login was minted for its own host; only an explicit key uses --host.
+        const host = explicitKey ? String(parsed.values.host).replace(/\/+$/, "") : (storedAuth?.host ?? String(parsed.values.host)).replace(/\/+$/, "");
+        const who = await fetchWhoami(host, apiKey);
+        const source = explicitKey ? "" : " (persisted `vidfarm login`)";
+        add("vidfarm auth", who.ok ? "ok" : "warn", who.ok ? `${who.detail}${source}` : `${who.detail} — serve will fall back to local browse mode`);
     }
     else {
-        add("vidfarm auth", "warn", "VIDFARM_API_KEY not set — serve will fall back to local browse mode; cloud catalog/bulk routes need it");
+        add("vidfarm auth", "warn", "no login found — run `vidfarm login` (or set VIDFARM_API_KEY); serve will fall back to local browse mode, cloud catalog/bulk routes need it");
     }
     // 6. Provider keys in env (BYOK local-first engines).
     const presentKeys = PROVIDER_KEY_ENV_VARS.filter((name) => process.env[name]?.trim());
@@ -157,9 +170,52 @@ export async function runDoctorCommand(argv) {
     add("env cloud ARNs/URLs", poisoned.length > 0 ? "warn" : "ok", poisoned.length > 0
         ? `${poisoned.join(", ")} set — outside \`vidfarm serve\` these route local work to cloud infra (serve blanks them itself)`
         : "no stray cloud ARNs/URLs in env");
-    // 9. Port 3000 (default serve port).
-    const portBusy = await isPortInUse(3000);
-    add("port 3000", portBusy ? "warn" : "ok", portBusy ? "in use — a serve box may already be running (or pass --port to serve)" : "free");
+    // 9. Local serve/preview processes — concurrency map + orphan reaping.
+    // Customers run several local video jobs at once; a renamed/pruned devcli can
+    // also leave an orphaned server squatting a port forever (the "Waiting for
+    // preview server…" hang). List them, flag orphans, and optionally reap.
+    const scan = scanLocalServers();
+    let reapedSummary = "";
+    if (killOrphans && scan.supported) {
+        const orphans = scan.servers.filter((s) => s.orphaned && !s.isSelf);
+        if (orphans.length > 0) {
+            const results = await reapProcesses(orphans.map((s) => s.pid));
+            const killedPids = new Set(results.filter((r) => r.killed).map((r) => r.pid));
+            const survivors = results.filter((r) => !r.killed);
+            reapedSummary = `reaped ${killedPids.size}/${orphans.length} orphaned server(s): ${orphans.map((s) => `pid ${s.pid}${s.port ? `:${s.port}` : ""}`).join(", ")}`;
+            if (survivors.length > 0) {
+                reapedSummary += ` (could not kill: ${survivors.map((r) => `pid ${r.pid}${r.error ? ` — ${r.error}` : ""}`).join(", ")})`;
+            }
+            // Drop the confirmed-dead rows so the report reflects the fix.
+            scan.servers = scan.servers.filter((s) => !killedPids.has(s.pid));
+        }
+        else {
+            reapedSummary = "no orphaned servers to reap";
+        }
+    }
+    const describeServer = (s) => `${s.kind}${s.port ? ` :${s.port}` : ""} pid ${s.pid}${s.isSelf ? " (self)" : ""}${s.orphaned ? " ⚠ORPHAN (binary deleted)" : ""}`;
+    if (!scan.supported) {
+        add("local servers", "ok", scan.note ?? "scan unavailable");
+    }
+    else {
+        const others = scan.servers.filter((s) => !s.isSelf);
+        const orphanCount = others.filter((s) => s.orphaned).length;
+        // 3000 is only serve's DEFAULT start port (serve auto-advances past a busy
+        // one) — a busy 3000 is informational, and we can't be sure whose it is.
+        const portBusy = await isPortInUse(3000);
+        const port3000Note = portBusy && !others.some((s) => s.port === 3000)
+            ? "; default port 3000 is in use by another process (serve auto-advances to the next free port)"
+            : "";
+        const detail = others.length === 0
+            ? `none running${port3000Note}`
+            : `${others.length} running — ${others.map(describeServer).join("; ")}${port3000Note}`;
+        const suffix = orphanCount > 0 && !killOrphans
+            ? ` — run \`vidfarm doctor --kill-orphans\` to reclaim their ports`
+            : reapedSummary
+                ? ` — ${reapedSummary}`
+                : "";
+        add("local servers", orphanCount > 0 ? "warn" : "ok", detail + suffix);
+    }
     // 10. HeyGen credential file — vidfarm never uses it.
     const heygenCredentials = path.join(homedir(), ".heygen", "credentials");
     if (existsSync(heygenCredentials) || existsSync(path.join(homedir(), ".heygen", "credentials.json"))) {