clipbait 1.4.1 → 1.6.0

package/README.md

@@ -31,4 +31,19 @@ npx clipbait status <jobId>           # get finished clip URLs
 
 Auth via `CLIPBAIT_API_KEY` env var or `~/.clipbait.json`. Requires Node 18+.
 
-Prefer MCP? Point your agent at `https://app.clipbait.ai/api/mcp/<your_api_key>`.
+## MCP server (Claude Desktop, Cursor, Cline, Windsurf)
+This package is also an MCP server. `npx clipbait@latest` auto-configures **Claude Code**. For other clients, add this to their MCP config:
+```json
+{
+  "mcpServers": {
+    "clipbait": {
+      "command": "npx",
+      "args": ["-y", "clipbait@latest", "mcp"],
+      "env": { "CLIPBAIT_API_KEY": "cbk_live_your_key_here" }
+    }
+  }
+}
+```
+Tools: `generate_clips`, `get_job`, `list_recent_clips`, `get_credits`, `start_live_autoclip`, `probe_video`, and **`download_clip`** (saves a finished clip to your `~/Downloads`).
+
+Using **ChatGPT / claude.ai** (URL connectors, no local process)? Point them at the hosted MCP instead: `https://app.clipbait.ai/api/mcp/<your_api_key>`.

package/index.js

@@ -68,6 +68,34 @@ function prompt(question) {
   return new Promise((resolve) => rl.question(question, (a) => { rl.close(); resolve(a); }));
 }
 
+// Register the Clipbait MCP server by editing Claude Code's config directly.
+// This is the reliable path: the `claude` CLI often isn't on PATH (agents,
+// sandboxes), but the config file is always the source of truth. Claude Code
+// reads MCP servers from ~/.claude.json under projects[cwd].mcpServers (local
+// scope) and, when present, a top-level mcpServers (user scope) — we write
+// both so it shows up regardless of which directory Claude opens in.
+function writeMcpConfig(mcpUrl) {
+  const cfgPath = path.join(os.homedir(), ".claude.json");
+  let cfg;
+  try { cfg = JSON.parse(fs.readFileSync(cfgPath, "utf8")); }
+  catch { return false; } // no/unreadable config → caller prints manual steps
+  const entry = { type: "http", url: mcpUrl };
+  cfg.mcpServers = cfg.mcpServers || {};
+  cfg.mcpServers.clipbait = entry;
+  const cwd = process.cwd();
+  cfg.projects = cfg.projects || {};
+  cfg.projects[cwd] = cfg.projects[cwd] || {};
+  cfg.projects[cwd].mcpServers = cfg.projects[cwd].mcpServers || {};
+  cfg.projects[cwd].mcpServers.clipbait = entry;
+  try {
+    // Atomic write (temp + rename) so a failure can't corrupt the config.
+    const tmp = cfgPath + ".clipbait.tmp";
+    fs.writeFileSync(tmp, JSON.stringify(cfg, null, 2));
+    fs.renameSync(tmp, cfgPath);
+    return true;
+  } catch { return false; }
+}
+
 // The /clipbait Claude Code slash command. Installed by setup so users can type
 // "/clipbait <url>" and let Claude drive the whole clip pipeline.
 const SLASH_COMMAND = `---
@@ -119,22 +147,96 @@ async function runSetup(providedKey) {
   fs.writeFileSync(path.join(cmdDir, "clipbait.md"), SLASH_COMMAND);
   console.log("✓ Installed the /clipbait command for Claude Code");
 
-  // 2) Register the MCP server with Claude Code (if the `claude` CLI exists).
-  const { spawnSync } = require("child_process");
-  const r = spawnSync("claude", ["mcp", "add", "--transport", "http", "clipbait", mcpUrl], { stdio: "ignore" });
-  if (!r.error && r.status === 0) {
+  // 2) Register the MCP server with Claude Code. Prefer editing the config
+  // file directly (works everywhere); fall back to the `claude` CLI, then to
+  // printing manual steps.
+  if (writeMcpConfig(mcpUrl)) {
     console.log("✓ Connected the Clipbait MCP server to Claude Code");
   } else {
-    console.log("• Couldn't auto-connect the MCP server (Claude Code CLI not found). Run this once:");
-    console.log("    claude mcp add --transport http clipbait " + mcpUrl);
+    const { spawnSync } = require("child_process");
+    const r = spawnSync("claude", ["mcp", "add", "--transport", "http", "clipbait", mcpUrl], { stdio: "ignore" });
+    if (!r.error && r.status === 0) {
+      console.log("✓ Connected the Clipbait MCP server to Claude Code");
+    } else {
+      console.log("• Couldn't auto-connect the MCP server. Add it manually:");
+      console.log("    claude mcp add --transport http clipbait " + mcpUrl);
+    }
   }
 
   console.log("\n🎬 Done! Restart Claude Code, then type:\n    /clipbait https://youtube.com/watch?v=…\n");
 }
 
+// Download a clip URL to ~/Downloads and return the saved path. Presigned
+// storage URLs need no auth; our own proxy URLs need the key — only send the
+// key to clipbait.ai hosts so we never leak it to third-party storage.
+async function downloadToFile(url, filename) {
+  const dir = path.join(os.homedir(), "Downloads");
+  try { fs.mkdirSync(dir, { recursive: true }); } catch { /* ignore */ }
+  const dest = path.join(dir, filename);
+  const headers = /(^|\.)clipbait\.ai/i.test(new URL(url).host) ? { "X-API-Key": loadKey() } : {};
+  const res = await fetch(url, { headers });
+  if (!res.ok) throw new Error(`download failed: HTTP ${res.status}`);
+  const len = Number(res.headers.get("content-length") || 0);
+  if (len > 500 * 1024 * 1024) throw new Error("clip is larger than 500 MB");
+  fs.writeFileSync(dest, Buffer.from(await res.arrayBuffer()));
+  return dest;
+}
+
+// Local stdio MCP server. Lets Claude Desktop, Cursor, Cline, Windsurf, etc.
+// drive Clipbait via `npx clipbait mcp`. Tools proxy the REST API; download_clip
+// runs locally so it can save to disk (a remote MCP can't). NEVER write to
+// stdout here — it's the MCP transport; diagnostics go to stderr only.
+async function runMcpServer() {
+  if (!loadKey()) { console.error("No API key. Set CLIPBAIT_API_KEY or run: npx clipbait <cbk_live_...>"); process.exit(1); }
+  const { McpServer } = require("@modelcontextprotocol/sdk/server/mcp.js");
+  const { StdioServerTransport } = require("@modelcontextprotocol/sdk/server/stdio.js");
+  const { z } = require("zod");
+  const server = new McpServer({ name: "clipbait", version: require("./package.json").version });
+  const ok = (t) => ({ content: [{ type: "text", text: t }] });
+  const fail = (e) => ({ content: [{ type: "text", text: "Error: " + (e.message || String(e)) }], isError: true });
+
+  server.tool("generate_clips", "Generate short vertical viral clips from a long video (YouTube, Twitch VOD, Rumble, Ganjing). Returns a job id; poll get_job.",
+    { videoUrl: z.string(), aspectRatio: z.enum(["9:16", "16:9"]).optional(), maxClips: z.number().int().min(1).max(20).optional() },
+    async (a) => { try { const d = await api("POST", "/clips/generate", { videoUrl: a.videoUrl, aspectRatio: a.aspectRatio || "9:16", maxClips: a.maxClips || 9 }); return ok(`Clip job started: ${d.jobId}${d.duplicate ? " (duplicate of a recent job — no extra credits)" : ""}. Poll get_job("${d.jobId}").`); } catch (e) { return fail(e); } });
+
+  server.tool("get_job", "Check a clip job's status and get finished clip URLs.", { jobId: z.string() },
+    async (a) => { try { const d = await api("GET", "/clips/status/" + a.jobId); const clips = (d.clips || []).map((x, i) => `#${i + 1} ${x.hook || ""} — ${x.url || "(rendering)"}`).join("\n"); return ok(`Status: ${d.status} (${d.progress ?? 0}%)\n${clips || "No clips yet."}`); } catch (e) { return fail(e); } });
+
+  server.tool("list_recent_clips", "List your recent clip jobs and how many clips each produced.", {},
+    async () => { try { const d = await api("GET", "/clips/jobs"); const jobs = (d.jobs || d || []).slice(0, 10).map((j) => `${j._id} · ${j.status} · ${(j.clips || []).length} clips · ${j.videoTitle || j.streamerName || ""}`).join("\n"); return ok(jobs || "No jobs yet."); } catch (e) { return fail(e); } });
+
+  server.tool("get_credits", "Check remaining Clipbait credits and plan before starting a job (1 credit ≈ 1 minute of source video).", {},
+    async () => { try { const d = await api("GET", "/clips/credits"); return ok(`Plan: ${d.plan}. Credits remaining: ${d.credits_remaining}${d.credits_total ? ` of ${d.credits_total}` : ""}.`); } catch (e) { return fail(e); } });
+
+  server.tool("start_live_autoclip", "Start continuous auto-clipping of a LIVE Twitch stream (Pro). Clips are generated automatically as viral moments happen.",
+    { channelUrl: z.string(), cadenceMin: z.number().int().optional() },
+    async (a) => { try { const d = await api("POST", "/live/start", { videoUrl: a.channelUrl, cadenceMin: a.cadenceMin || 7 }); return ok(`Live auto-clipping started (${d.liveSessionId || d.session?._id || "?"}).`); } catch (e) { return fail(e); } });
+
+  server.tool("probe_video", "Get a video's duration before clipping.", { url: z.string() },
+    async (a) => { try { const d = await api("POST", "/clips/probe-url", { url: a.url }); return ok(d.durationSeconds != null ? `Duration: ${d.durationSeconds}s (~${Math.round(d.durationSeconds / 60)} min)` : "Duration unknown for this platform."); } catch (e) { return fail(e); } });
+
+  server.tool("download_clip", "Save a finished clip to the user's ~/Downloads folder and return the file path. Call after get_job shows the job is complete.",
+    { jobId: z.string(), clipIndex: z.number().int().min(1).optional().describe("1-based, default 1") },
+    async (a) => {
+      try {
+        const d = await api("GET", "/clips/status/" + a.jobId);
+        const clips = d.clips || [];
+        if (!clips.length) return fail(new Error("No clips are ready for this job yet."));
+        const idx = (a.clipIndex || 1) - 1;
+        const clip = clips[idx];
+        if (!clip || !clip.url) return fail(new Error(`Clip #${a.clipIndex || 1} isn't available.`));
+        const p = await downloadToFile(clip.url, `clipbait-${a.jobId}-${idx + 1}.mp4`);
+        return ok(`Saved to ${p}`);
+      } catch (e) { return fail(e); }
+    });
+
+  await server.connect(new StdioServerTransport());
+}
+
 const HELP = `clipbait — AI clip generation
 
   npx clipbait@latest                                 set up Claude Code (recommended)
+  clipbait mcp                                         run the stdio MCP server (for Claude Desktop/Cursor/Cline)
   clipbait login <apiKey>                             just save your API key
   clipbait generate <url> [--aspect 9:16] [--type talking_head] [--max 9]
   clipbait status <jobId>                             check a job + get clip URLs
@@ -159,6 +261,7 @@ Auth: CLIPBAIT_API_KEY env var or ~/.clipbait.json (via 'clipbait login').`;
       console.log("✓ Saved API key to " + CFG);
       return;
     }
+    if (cmd === "mcp") { await runMcpServer(); return; } // stdio MCP server for local clients
     if (cmd === "help" || cmd === "--help" || cmd === "-h") { console.log(HELP); return; }
 
     if (!loadKey()) {

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "clipbait",
-  "version": "1.4.1",
-  "description": "Clipbait CLI — turn any video into viral clips, and auto-clip live streams, from your terminal or AI agent.",
+  "version": "1.6.0",
+  "description": "Clipbait CLI + MCP server — turn any video into viral clips, and auto-clip live streams, from your terminal or any AI agent.",
   "bin": { "clipbait": "index.js" },
   "type": "commonjs",
   "engines": { "node": ">=18" },
-  "keywords": ["clipbait", "clips", "video", "ai", "agent", "cli", "twitch", "shorts"],
+  "keywords": ["clipbait", "clips", "video", "ai", "agent", "mcp", "cli", "twitch", "shorts"],
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.12.0",
+    "zod": "^3.25.0"
+  },
   "license": "MIT"
 }