publishport-opencli 1.8.5-pp.2 → 1.8.5-pp.21

package/clis/suno/auth.js

@@ -1,21 +1,4 @@
-import { AuthRequiredError, CommandExecutionError } from '@jackwener/opencli/errors';
-import { registerSiteAuthCommands } from '../_shared/site-auth.js';
-
-async function hasSunoClerkCookie(page) {
-  const cookies = await page.getCookies({ url: 'https://clerk.suno.com' });
-  // Clerk sets __client for anonymous sessions too; __session (the session JWT)
-  // is present only when authenticated, so gate on it to avoid navigating away
-  // mid-login.
-  return cookies.some(c => c.name === '__session' && c.value);
-}
-
-async function verifySunoIdentity(page) {
-  if (!await hasSunoClerkCookie(page)) {
-    throw new AuthRequiredError('suno.com', 'Suno Clerk __session/__client cookie missing');
-  }
-  await page.goto('https://suno.com/');
-  await page.wait(2);
-  const probe = await page.evaluate(`(async () => {
+import{AuthRequiredError as D,CommandExecutionError as F}from"@jackwener/opencli/errors";import{registerSiteAuthCommands as K}from"../_shared/site-auth.js";async function G(B){return(await B.getCookies({url:"https://clerk.suno.com"})).some((H)=>H.name==="__session"&&H.value)}async function J(B){if(!await G(B))throw new D("suno.com","Suno Clerk __session/__client cookie missing");await B.goto("https://suno.com/");await B.wait(2);const z=await B.evaluate(`(async () => {
     try {
       const r = await fetch('https://clerk.suno.com/v1/client?_clerk_js_version=5', {
         credentials: 'include',
@@ -39,25 +22,4 @@ async function verifySunoIdentity(page) {
     } catch (e) {
       return { kind: 'exception', detail: String(e && e.message || e) };
     }
-  })()`);
-  if (probe?.kind === 'auth') throw new AuthRequiredError('suno.com', probe.detail);
-  if (probe?.kind === 'http') throw new CommandExecutionError(`HTTP ${probe.httpStatus} from clerk.suno.com`);
-  if (probe?.kind === 'exception') throw new CommandExecutionError(`Suno whoami failed: ${probe.detail}`);
-  if (!probe?.ok) throw new CommandExecutionError(`Unexpected Suno probe: ${JSON.stringify(probe)}`);
-  return { user_id: probe.user_id, name: probe.name };
-}
-
-registerSiteAuthCommands({
-  site: 'suno',
-  domain: 'suno.com',
-  loginUrl: 'https://suno.com/?sign-in=true',
-  columns: ['user_id', 'name'],
-  quickCheck: hasSunoClerkCookie,
-  verify: verifySunoIdentity,
-  poll: async (page) => {
-    if (!await hasSunoClerkCookie(page)) {
-      throw new AuthRequiredError('suno.com', 'Waiting for Suno Clerk __session/__client cookie');
-    }
-    return verifySunoIdentity(page);
-  },
-});
+  })()`);if(z?.kind==="auth")throw new D("suno.com",z.detail);if(z?.kind==="http")throw new F(`HTTP ${z.httpStatus} from clerk.suno.com`);if(z?.kind==="exception")throw new F(`Suno whoami failed: ${z.detail}`);if(!z?.ok)throw new F(`Unexpected Suno probe: ${JSON.stringify(z)}`);return{user_id:z.user_id,name:z.name}}K({site:"suno",domain:"suno.com",loginUrl:"https://suno.com/?sign-in=true",columns:["user_id","name"],quickCheck:G,verify:J,poll:async(B)=>{if(!await G(B))throw new D("suno.com","Waiting for Suno Clerk __session/__client cookie");return J(B)}});

package/clis/suno/download.js

@@ -1,140 +1,17 @@
-/**
- * `opencli suno download <clip-id>` — download an already-generated clip in
- * one or more formats. Useful for grabbing assets from songs created via the
- * Suno web UI or earlier opencli runs without re-generating.
- *
- * WAV downloads still trigger Suno's per-download billing (the same charge
- * the web UI's "Download → WAV" flow makes).
- */
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError, CommandExecutionError, EmptyResultError } from '@jackwener/opencli/errors';
-import {
-    STUDIO_API,
-    SUNO_DOMAIN,
-    SUNO_URL,
-    downloadSunoClip,
-    ensureSunoSession,
-    normalizeBooleanFlag,
-    parseFormats,
-    resolveSunoOutputDir,
-    unwrapEvaluateResult,
-} from './utils.js';
-
-import * as os from 'node:os';
-
-function displayPath(filePath) {
-    if (!filePath) return '-';
-    const home = os.homedir();
-    return filePath.startsWith(home) ? `~${filePath.slice(home.length)}` : filePath;
-}
-
-function parseClipId(value) {
-    const raw = String(value || '').trim();
-    if (!raw) throw new ArgumentError('clip-id required (UUID or /song/<id> URL)');
-    const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-    if (uuidPattern.test(raw)) return raw.toLowerCase();
-    try {
-        const parsed = new URL(raw);
-        const pathMatch = parsed.pathname.match(/^\/song\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\/?$/i);
-        if (parsed.protocol === 'https:' && parsed.hostname === 'suno.com' && pathMatch) {
-            return pathMatch[1].toLowerCase();
-        }
-    } catch {}
-    throw new ArgumentError(`Invalid clip-id: ${raw}`, 'Pass a UUID or a https://suno.com/song/<uuid> URL.');
-}
-
-export const downloadCommand = cli({
-    site: 'suno',
-    name: 'download',
-    access: 'write',
-    description: 'Download an existing Suno clip (MP3 + optional WAV/M4A/video) by id',
-    domain: SUNO_DOMAIN,
-    strategy: Strategy.COOKIE,
-    browser: true,
-    siteSession: 'persistent',
-    navigateBefore: false,
-    defaultFormat: 'plain',
-    args: [
-        { name: 'clip', positional: true, required: true, help: 'Clip UUID or https://suno.com/song/<id> URL' },
-        { name: 'formats', help: 'Comma-separated formats: mp3, m4a, wav, video, cover, metadata. Default: mp3,metadata' },
-        { name: 'op', help: 'Output directory (default: ~/Music/suno)' },
-        { name: 'confirm-paid', type: 'boolean', default: false, help: 'Required to allow paid downloads (wav). Without it, paid formats are skipped with a warning.' },
-    ],
-    columns: ['status', 'clip', 'title', 'files', 'link'],
-    func: async (page, kwargs) => {
-        const clipId = parseClipId(kwargs.clip);
-        const requestedFormats = parseFormats(kwargs.formats);
-        const confirmPaid = normalizeBooleanFlag(kwargs['confirm-paid']);
-        const PAID_FORMATS = new Set(['wav']);
-        const skippedPaid = [];
-        const formats = requestedFormats.filter(f => {
-            if (PAID_FORMATS.has(f) && !confirmPaid) {
-                skippedPaid.push(f);
-                return false;
-            }
-            return true;
-        });
-        if (!formats.length) {
-            throw new ArgumentError('All requested formats require --confirm-paid true', 'Add --confirm-paid true or include a free format such as mp3 or metadata.');
-        }
-        const outputDir = resolveSunoOutputDir(kwargs.op);
-
-        const session = await ensureSunoSession(page);
-        const deviceId = session.deviceId;
-
-        // Pull the clip object from feed/v3 so audio_url/media_urls/has_stem are current.
-        const feedRes = unwrapEvaluateResult(await page.evaluate(`(async () => {
+import{cli as N,Strategy as D}from"@jackwener/opencli/registry";import{ArgumentError as b,CommandExecutionError as Y,EmptyResultError as C}from"@jackwener/opencli/errors";import{STUDIO_API as U,SUNO_DOMAIN as v,SUNO_URL as B,downloadSunoClip as y,ensureSunoSession as A,normalizeBooleanFlag as O,parseFormats as _,resolveSunoOutputDir as R,unwrapEvaluateResult as I}from"./utils.js";import*as S from"node:os";function E(J){if(!J)return"-";const H=S.homedir();return J.startsWith(H)?`~${J.slice(H.length)}`:J}function k(J){const H=String(J||"").trim();if(!H)throw new b("clip-id required (UUID or /song/<id> URL)");if(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(H))return H.toLowerCase();try{const V=new URL(H),W=V.pathname.match(/^\/song\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\/?$/i);if(V.protocol==="https:"&&V.hostname==="suno.com"&&W)return W[1].toLowerCase()}catch{}throw new b(`Invalid clip-id: ${H}`,"Pass a UUID or a https://suno.com/song/<uuid> URL.")}export const downloadCommand=N({site:"suno",name:"download",access:"write",description:"Download an existing Suno clip (MP3 + optional WAV/M4A/video) by id",domain:v,strategy:D.COOKIE,browser:!0,siteSession:"persistent",navigateBefore:!1,defaultFormat:"plain",args:[{name:"clip",positional:!0,required:!0,help:"Clip UUID or https://suno.com/song/<id> URL"},{name:"formats",help:"Comma-separated formats: mp3, m4a, wav, video, cover, metadata. Default: mp3,metadata"},{name:"op",help:"Output directory (default: ~/Music/suno)"},{name:"confirm-paid",type:"boolean",default:!1,help:"Required to allow paid downloads (wav). Without it, paid formats are skipped with a warning."}],columns:["status","clip","title","files","link"],func:async(J,H)=>{const K=k(H.clip),V=_(H.formats),W=O(H["confirm-paid"]),L=new Set(["wav"]),Z=[],q=V.filter((G)=>{if(L.has(G)&&!W){Z.push(G);return!1}return!0});if(!q.length)throw new b("All requested formats require --confirm-paid true","Add --confirm-paid true or include a free format such as mp3 or metadata.");const T=R(H.op),z=(await A(J)).deviceId,X=I(await J.evaluate(`(async () => {
             const browserToken = JSON.stringify({ token: btoa(JSON.stringify({ timestamp: Date.now() })) });
-            const res = await fetch('${STUDIO_API}/api/feed/v3', {
+            const res = await fetch('${U}/api/feed/v3', {
                 method: 'POST',
                 headers: {
                     'Authorization': 'Bearer ' + (await window.Clerk.session.getToken()),
                     'browser-token': browserToken,
-                    'device-id': ${JSON.stringify(deviceId)},
+                    'device-id': ${JSON.stringify(z)},
                     'Content-Type': 'application/json',
                 },
-                body: JSON.stringify({ clip_ids: ['${clipId}'] }),
+                body: JSON.stringify({ clip_ids: ['${K}'] }),
             });
             if (!res.ok) return { ok: false, error: 'HTTP ' + res.status };
             const payload = await res.json().catch(() => null);
             if (!payload || !Array.isArray(payload.clips)) return { ok: false, error: 'malformed clips payload' };
             return { ok: true, clips: payload.clips };
-        })()`));
-
-        if (!feedRes?.ok) {
-            throw new CommandExecutionError(`Suno feed lookup failed: ${feedRes?.error || 'unknown'}`);
-        }
-        if (!Array.isArray(feedRes.clips)) {
-            throw new CommandExecutionError('Suno feed lookup returned malformed clips payload');
-        }
-        const clip = feedRes.clips.find(c => c.id === clipId);
-        if (!clip) {
-            throw new EmptyResultError('suno download', `Clip ${clipId} not found in your account. Confirm at ${SUNO_URL}/song/${clipId}.`);
-        }
-        if (clip.status !== 'complete') {
-            throw new CommandExecutionError(`Clip ${clipId} status is "${clip.status}" — not complete yet. Retry once generation finishes.`);
-        }
-
-        const result = await downloadSunoClip(page, clip, outputDir, formats, deviceId);
-        if (!result.written.some(w => w.ok)) {
-            throw new CommandExecutionError(`Suno download wrote no files for clip ${clipId}`);
-        }
-        const link = `${SUNO_URL}/song/${clip.id}`;
-        const writtenSummary = result.written
-            .map(w => w.ok ? `${w.format}:${displayPath(w.file)}` : `${w.format}:✗(${w.reason})`)
-            .join(' | ');
-        const skippedSummary = skippedPaid.length
-            ? ` | skipped(needs --confirm-paid):${skippedPaid.join(',')}`
-            : '';
-        const fileSummary = `${writtenSummary}${skippedSummary}`;
-        const anyFailed = result.written.some(w => !w.ok);
-
-        return [{
-            status: anyFailed ? '⚠ partial' : '✅ saved',
-            clip: clip.id.slice(0, 8),
-            title: clip.title || '(untitled)',
-            files: `📁 ${fileSummary}`,
-            link: `🔗 ${link}`,
-        }];
-    },
-});
+        })()`));if(!X?.ok)throw new Y(`Suno feed lookup failed: ${X?.error||"unknown"}`);if(!Array.isArray(X.clips))throw new Y("Suno feed lookup returned malformed clips payload");const Q=X.clips.find((G)=>G.id===K);if(!Q)throw new C("suno download",`Clip ${K} not found in your account. Confirm at ${B}/song/${K}.`);if(Q.status!=="complete")throw new Y(`Clip ${K} status is "${Q.status}" — not complete yet. Retry once generation finishes.`);const $=await y(J,Q,T,q,z);if(!$.written.some((G)=>G.ok))throw new Y(`Suno download wrote no files for clip ${K}`);const j=`${B}/song/${Q.id}`,x=$.written.map((G)=>G.ok?`${G.format}:${E(G.file)}`:`${G.format}:✗(${G.reason})`).join(" | "),F=Z.length?` | skipped(needs --confirm-paid):${Z.join(",")}`:"",M=`${x}${F}`;return[{status:$.written.some((G)=>!G.ok)?"⚠ partial":"✅ saved",clip:Q.id.slice(0,8),title:Q.title||"(untitled)",files:`\uD83D\uDCC1 ${M}`,link:`\uD83D\uDD17 ${j}`}]}});

package/clis/suno/generate.js

@@ -1,231 +1,4 @@
-/**
- * `opencli suno generate` — submit a Suno music-generation request, wait for
- * both clips to finish, and download selected formats locally.
- *
- * Targets the /api/generate/v2-web/ endpoint (cookie auth). Each generation
- * returns 2 candidate clips by design — both are downloaded so the caller
- * can A/B them.
- *
- * Modes:
- *   - Custom (when --lyrics is provided): API receives prompt(lyrics)+tags
- *     +title+negative_tags. Use this for professional control over lyrics,
- *     structure metatags, style, and exclusions.
- *   - Simple (default): API receives a description in `prompt`; Suno picks
- *     the lyrics, tags, and title.
- *
- * Creative knobs (--weirdness / --style-weight) map directly to the
- * `metadata.control_sliders` the web UI exposes.
- */
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError, CommandExecutionError } from '@jackwener/opencli/errors';
-import {
-    DEFAULT_SUNO_MODEL,
-    SUNO_DOMAIN,
-    SUNO_MODELS,
-    SUNO_URL,
-    checkSunoCaptcha,
-    clampSlider,
-    downloadSunoClip,
-    ensureSunoSession,
-    normalizeBooleanFlag,
-    parseFormats,
-    pollSunoClips,
-    requirePositiveInt,
-    resolveSunoOutputDir,
-    submitSunoGeneration,
-} from './utils.js';
-
-import * as crypto from 'node:crypto';
-import * as os from 'node:os';
-
-function displayPath(filePath) {
-    if (!filePath) return '-';
-    const home = os.homedir();
-    return filePath.startsWith(home) ? `~${filePath.slice(home.length)}` : filePath;
-}
-
-export const generateCommand = cli({
-    site: 'suno',
-    name: 'generate',
-    access: 'write',
-    description: 'Generate music with Suno (V5.5 chirp-fenix by default) and download clips locally',
-    domain: SUNO_DOMAIN,
-    strategy: Strategy.COOKIE,
-    browser: true,
-    siteSession: 'persistent',
-    navigateBefore: false,
-    defaultFormat: 'plain',
-    args: [
-        { name: 'prompt', positional: true, required: false, help: 'Simple-mode description (ignored when --lyrics is provided)' },
-        { name: 'lyrics', help: 'Custom-mode lyrics (with [Verse]/[Chorus] metatags). Triggers Custom mode.' },
-        { name: 'tags', help: 'Custom-mode style tags (genre, BPM, instruments...). Used with --lyrics.' },
-        { name: 'negative-tags', help: 'Custom-mode style exclusions (e.g. "no vocals, no autotune"). Used with --lyrics.' },
-        { name: 'title', help: 'Song title (default: auto-derived from prompt)' },
-        { name: 'instrumental', type: 'boolean', default: false, help: 'No vocals' },
-        { name: 'model', help: `Model id: ${SUNO_MODELS.join(', ')}. Default: ${DEFAULT_SUNO_MODEL}` },
-        { name: 'weirdness', help: 'Creative weirdness slider (0..1). Default: 0.5' },
-        { name: 'style-weight', help: 'Style adherence slider (0..1). Default: 0.5' },
-        { name: 'formats', help: 'Comma-separated download formats: mp3, m4a, wav, video, cover, metadata. Default: mp3,metadata' },
-        { name: 'op', help: 'Output directory (default: ~/Music/suno)' },
-        { name: 'timeout', type: 'int', default: 300, help: 'Max seconds to wait for clips to finish (default: 300)' },
-        { name: 'sd', type: 'boolean', default: false, help: 'Skip download; only print clip ids and Suno URLs' },
-        { name: 'confirm-paid', type: 'boolean', default: false, help: 'Required to allow paid downloads (wav). Without it, paid formats are skipped with a warning.' },
-    ],
-    columns: ['status', 'clip', 'title', 'files', 'link'],
-    func: async (page, kwargs) => {
-        const lyrics = kwargs.lyrics ? String(kwargs.lyrics) : '';
-        const tags = kwargs.tags ? String(kwargs.tags) : '';
-        const negativeTags = kwargs['negative-tags'] ? String(kwargs['negative-tags']) : '';
-        const description = kwargs.prompt ? String(kwargs.prompt) : '';
-        const titleArg = kwargs.title ? String(kwargs.title) : '';
-        const model = kwargs.model ? String(kwargs.model).trim() : DEFAULT_SUNO_MODEL;
-        if (!SUNO_MODELS.includes(model)) {
-            throw new ArgumentError(`Unsupported --model "${model}"`, `Choices: ${SUNO_MODELS.join(', ')}`);
-        }
-
-        const isCustom = lyrics.trim() !== '';
-        if (!isCustom && !description.trim()) {
-            throw new ArgumentError(
-                'Either provide a Simple-mode prompt as the positional argument, or pass --lyrics for Custom mode.',
-                'Examples:\n  opencli suno generate "lo-fi study beat, 80 bpm"\n  opencli suno generate --lyrics "[Verse]\\n..." --tags "synthwave, 120 bpm"',
-            );
-        }
-        if (!isCustom && (tags || negativeTags)) {
-            throw new ArgumentError('--tags and --negative-tags only apply in Custom mode (alongside --lyrics).');
-        }
-
-        const requestedFormats = parseFormats(kwargs.formats);
-        const confirmPaid = normalizeBooleanFlag(kwargs['confirm-paid']);
-        const skipDownload = normalizeBooleanFlag(kwargs.sd);
-        const PAID_FORMATS = new Set(['wav']);
-        const skippedPaid = [];
-        const formats = requestedFormats.filter(f => {
-            if (PAID_FORMATS.has(f) && !confirmPaid) {
-                skippedPaid.push(f);
-                return false;
-            }
-            return true;
-        });
-        if (!skipDownload && !formats.length) {
-            throw new ArgumentError('All requested formats require --confirm-paid true', 'Add --confirm-paid true or include a free format such as mp3 or metadata.');
-        }
-        const outputDir = resolveSunoOutputDir(kwargs.op);
-        const timeout = requirePositiveInt(kwargs.timeout, '--timeout');
-        const makeInstrumental = normalizeBooleanFlag(kwargs.instrumental);
-        const weirdness = clampSlider(kwargs.weirdness, '--weirdness', 0.5);
-        const styleWeight = clampSlider(kwargs['style-weight'], '--style-weight', 0.5);
-
-        // Title: required by API. Auto-derive from first 60 chars of source prompt if not provided.
-        const titleSource = titleArg || (isCustom ? (tags || lyrics.split('\n')[0]) : description);
-        const title = titleSource.replace(/\s+/g, ' ').trim().slice(0, 60) || 'Untitled';
-
-        const session = await ensureSunoSession(page);
-        if (!session.planId) {
-            throw new CommandExecutionError(
-                `Suno generation needs a resolved plan id for the user_tier field, but billing/info did not surface one for this account (subscription_type=${session.planKey}). Verify the account is active at ${SUNO_URL}/account, then retry.`,
-            );
-        }
-        const deviceId = session.deviceId;
-        const captcha = await checkSunoCaptcha(page, deviceId);
-        if (!captcha?.ok) {
-            throw new CommandExecutionError(
-                `Suno captcha pre-flight failed${captcha?.status ? ` (HTTP ${captcha.status})` : ''}.`,
-                `Open ${SUNO_URL}/create in Chrome and verify the account is ready, then retry.`,
-            );
-        }
-        if (captcha?.required) {
-            throw new CommandExecutionError(
-                'Suno requires a CAPTCHA challenge for this account/IP right now.',
-                `Open ${SUNO_URL}/create in Chrome, solve a Create challenge once, then retry.`,
-            );
-        }
-        if (session.totalCreditsAvailable < 10) {
-            const b = session.breakdown;
-            throw new CommandExecutionError(
-                `Suno generation needs ~10 credits; you have ${session.totalCreditsAvailable} (monthly ${b.monthlyRemaining}/${b.monthlyLimit} + packs ${b.purchasedPacks} + leftover ${b.pack}). Top up at ${SUNO_URL}/account.`,
-            );
-        }
-
-        const transactionUuid = crypto.randomUUID();
-        const createSessionToken = crypto.randomUUID();
-
-        const submission = await submitSunoGeneration(page, {
-            mode: isCustom ? 'custom' : 'simple',
-            model,
-            title,
-            lyrics,
-            tags,
-            negativeTags,
-            description,
-            makeInstrumental,
-            weirdness,
-            styleWeight,
-            userTier: session.planId,
-            createSessionToken,
-            transactionUuid,
-            deviceId,
-        });
-
-        if (!Array.isArray(submission.clips)) {
-            throw new CommandExecutionError('Suno generation returned malformed clips payload.');
-        }
-        const clipIds = submission.clips.map(c => c?.id);
-        if (clipIds.some(id => !id)) {
-            throw new CommandExecutionError('Suno generation returned malformed clip identity.');
-        }
-        if (!clipIds.length) {
-            throw new CommandExecutionError('Suno accepted the request but returned no clip ids.');
-        }
-
-        const clips = await pollSunoClips(page, clipIds, timeout, deviceId);
-        const completed = clips.filter(c => c.status === 'complete');
-        if (!completed.length) {
-            const errors = clips.map(c => `${c.id.slice(0, 8)}:${c.status}`).join(', ');
-            throw new CommandExecutionError(`All Suno clips failed (${errors}). Open ${SUNO_URL}/song/${clipIds[0]} to inspect.`);
-        }
-
-        const rows = [];
-        for (const clip of clips) {
-            const link = `${SUNO_URL}/song/${clip.id}`;
-            if (clip.status !== 'complete') {
-                rows.push({
-                    status: `❌ ${clip.status}`,
-                    clip: clip.id.slice(0, 8),
-                    title: clip.title || '(untitled)',
-                    files: '-',
-                    link: `🔗 ${link}`,
-                });
-                continue;
-            }
-            if (skipDownload) {
-                rows.push({
-                    status: '🎵 generated',
-                    clip: clip.id.slice(0, 8),
-                    title: clip.title || '(untitled)',
-                    files: '📁 -',
-                    link: `🔗 ${link}`,
-                });
-                continue;
-            }
-            const result = await downloadSunoClip(page, clip, outputDir, formats, deviceId);
-            if (!result.written.some(w => w.ok)) {
-                throw new CommandExecutionError(`Suno download wrote no files for clip ${clip.id}`);
-            }
-            const writtenSummary = result.written
-                .map(w => w.ok ? `${w.format}:${displayPath(w.file)}` : `${w.format}:✗(${w.reason})`)
-                .join(' | ');
-            const skippedSummary = skippedPaid.length
-                ? ` | skipped(needs --confirm-paid):${skippedPaid.join(',')}`
-                : '';
-            const anyFailed = result.written.some(w => !w.ok);
-            rows.push({
-                status: anyFailed ? '⚠ partial' : '✅ saved',
-                clip: clip.id.slice(0, 8),
-                title: clip.title || '(untitled)',
-                files: `📁 ${writtenSummary}${skippedSummary}`,
-                link: `🔗 ${link}`,
-            });
-        }
-        return rows;
-    },
-});
+import{cli as c,Strategy as n}from"@jackwener/opencli/registry";import{ArgumentError as z,CommandExecutionError as V}from"@jackwener/opencli/errors";import{DEFAULT_SUNO_MODEL as y,SUNO_DOMAIN as t,SUNO_MODELS as v,SUNO_URL as Z,checkSunoCaptcha as o,clampSlider as _,downloadSunoClip as i,ensureSunoSession as e,normalizeBooleanFlag as A,parseFormats as a,pollSunoClips as s,requirePositiveInt as r,resolveSunoOutputDir as HH,submitSunoGeneration as JH}from"./utils.js";import*as C from"node:crypto";import*as KH from"node:os";function QH(K){if(!K)return"-";const J=KH.homedir();return K.startsWith(J)?`~${K.slice(J.length)}`:K}export const generateCommand=c({site:"suno",name:"generate",access:"write",description:"Generate music with Suno (V5.5 chirp-fenix by default) and download clips locally",domain:t,strategy:n.COOKIE,browser:!0,siteSession:"persistent",navigateBefore:!1,defaultFormat:"plain",args:[{name:"prompt",positional:!0,required:!1,help:"Simple-mode description (ignored when --lyrics is provided)"},{name:"lyrics",help:"Custom-mode lyrics (with [Verse]/[Chorus] metatags). Triggers Custom mode."},{name:"tags",help:"Custom-mode style tags (genre, BPM, instruments...). Used with --lyrics."},{name:"negative-tags",help:'Custom-mode style exclusions (e.g. "no vocals, no autotune"). Used with --lyrics.'},{name:"title",help:"Song title (default: auto-derived from prompt)"},{name:"instrumental",type:"boolean",default:!1,help:"No vocals"},{name:"model",help:`Model id: ${v.join(", ")}. Default: ${y}`},{name:"weirdness",help:"Creative weirdness slider (0..1). Default: 0.5"},{name:"style-weight",help:"Style adherence slider (0..1). Default: 0.5"},{name:"formats",help:"Comma-separated download formats: mp3, m4a, wav, video, cover, metadata. Default: mp3,metadata"},{name:"op",help:"Output directory (default: ~/Music/suno)"},{name:"timeout",type:"int",default:300,help:"Max seconds to wait for clips to finish (default: 300)"},{name:"sd",type:"boolean",default:!1,help:"Skip download; only print clip ids and Suno URLs"},{name:"confirm-paid",type:"boolean",default:!1,help:"Required to allow paid downloads (wav). Without it, paid formats are skipped with a warning."}],columns:["status","clip","title","files","link"],func:async(K,J)=>{const B=J.lyrics?String(J.lyrics):"",M=J.tags?String(J.tags):"",D=J["negative-tags"]?String(J["negative-tags"]):"",R=J.prompt?String(J.prompt):"",P=J.title?String(J.title):"",T=J.model?String(J.model).trim():y;if(!v.includes(T))throw new z(`Unsupported --model "${T}"`,`Choices: ${v.join(", ")}`);const $=B.trim()!=="";if(!$&&!R.trim())throw new z("Either provide a Simple-mode prompt as the positional argument, or pass --lyrics for Custom mode.",`Examples:
+  opencli suno generate "lo-fi study beat, 80 bpm"
+  opencli suno generate --lyrics "[Verse]\\n..." --tags "synthwave, 120 bpm"`);if(!$&&(M||D))throw new z("--tags and --negative-tags only apply in Custom mode (alongside --lyrics).");const f=a(J.formats),h=A(J["confirm-paid"]),I=A(J.sd),O=new Set(["wav"]),b=[],L=f.filter((H)=>{if(O.has(H)&&!h){b.push(H);return!1}return!0});if(!I&&!L.length)throw new z("All requested formats require --confirm-paid true","Add --confirm-paid true or include a free format such as mp3 or metadata.");const U=HH(J.op),E=r(J.timeout,"--timeout"),S=A(J.instrumental),u=_(J.weirdness,"--weirdness",0.5),m=_(J["style-weight"],"--style-weight",0.5),d=(P||($?M||B.split(`
+`)[0]:R)).replace(/\s+/g," ").trim().slice(0,60)||"Untitled",X=await e(K);if(!X.planId)throw new V(`Suno generation needs a resolved plan id for the user_tier field, but billing/info did not surface one for this account (subscription_type=${X.planKey}). Verify the account is active at ${Z}/account, then retry.`);const G=X.deviceId,W=await o(K,G);if(!W?.ok)throw new V(`Suno captcha pre-flight failed${W?.status?` (HTTP ${W.status})`:""}.`,`Open ${Z}/create in Chrome and verify the account is ready, then retry.`);if(W?.required)throw new V("Suno requires a CAPTCHA challenge for this account/IP right now.",`Open ${Z}/create in Chrome, solve a Create challenge once, then retry.`);if(X.totalCreditsAvailable<10){const H=X.breakdown;throw new V(`Suno generation needs ~10 credits; you have ${X.totalCreditsAvailable} (monthly ${H.monthlyRemaining}/${H.monthlyLimit} + packs ${H.purchasedPacks} + leftover ${H.pack}). Top up at ${Z}/account.`)}const k=C.randomUUID(),p=C.randomUUID(),N=await JH(K,{mode:$?"custom":"simple",model:T,title:d,lyrics:B,tags:M,negativeTags:D,description:R,makeInstrumental:S,weirdness:u,styleWeight:m,userTier:X.planId,createSessionToken:p,transactionUuid:k,deviceId:G});if(!Array.isArray(N.clips))throw new V("Suno generation returned malformed clips payload.");const j=N.clips.map((H)=>H?.id);if(j.some((H)=>!H))throw new V("Suno generation returned malformed clip identity.");if(!j.length)throw new V("Suno accepted the request but returned no clip ids.");const x=await s(K,j,E,G);if(!x.filter((H)=>H.status==="complete").length){const H=x.map((Y)=>`${Y.id.slice(0,8)}:${Y.status}`).join(", ");throw new V(`All Suno clips failed (${H}). Open ${Z}/song/${j[0]} to inspect.`)}const q=[];for(const H of x){const Y=`${Z}/song/${H.id}`;if(H.status!=="complete"){q.push({status:`❌ ${H.status}`,clip:H.id.slice(0,8),title:H.title||"(untitled)",files:"-",link:`\uD83D\uDD17 ${Y}`});continue}if(I){q.push({status:"\uD83C\uDFB5 generated",clip:H.id.slice(0,8),title:H.title||"(untitled)",files:"\uD83D\uDCC1 -",link:`\uD83D\uDD17 ${Y}`});continue}const F=await i(K,H,U,L,G);if(!F.written.some((Q)=>Q.ok))throw new V(`Suno download wrote no files for clip ${H.id}`);const w=F.written.map((Q)=>Q.ok?`${Q.format}:${QH(Q.file)}`:`${Q.format}:✗(${Q.reason})`).join(" | "),g=b.length?` | skipped(needs --confirm-paid):${b.join(",")}`:"",l=F.written.some((Q)=>!Q.ok);q.push({status:l?"⚠ partial":"✅ saved",clip:H.id.slice(0,8),title:H.title||"(untitled)",files:`\uD83D\uDCC1 ${w}${g}`,link:`\uD83D\uDD17 ${Y}`})}return q}});

package/clis/suno/list.js

@@ -1,79 +1,14 @@
-/**
- * `opencli suno list` — list recent clips in the user's library. Lets agents
- * discover clip ids without needing to remember them, and feed them to
- * `opencli suno download`.
- */
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { CommandExecutionError, EmptyResultError } from '@jackwener/opencli/errors';
-import {
-    STUDIO_API,
-    SUNO_DOMAIN,
-    SUNO_URL,
-    ensureSunoSession,
-    requireNonNegativeInt,
-    requirePositiveInt,
-    unwrapEvaluateResult,
-} from './utils.js';
-
-export const listCommand = cli({
-    site: 'suno',
-    name: 'list',
-    access: 'read',
-    description: 'List recent Suno clips in your library (id, title, status, created_at, link)',
-    domain: SUNO_DOMAIN,
-    strategy: Strategy.COOKIE,
-    browser: true,
-    siteSession: 'persistent',
-    navigateBefore: false,
-    args: [
-        { name: 'limit', type: 'int', default: 20, help: 'Max clips to list (default: 20)' },
-        { name: 'page', type: 'int', default: 0, help: 'Pagination offset, 0-based (default: 0)' },
-    ],
-    columns: ['rank', 'clip', 'title', 'status', 'created', 'link'],
-    func: async (page, kwargs) => {
-        const limit = requirePositiveInt(kwargs.limit, '--limit');
-        const pageOffset = requireNonNegativeInt(kwargs.page ?? 0, '--page');
-
-        const session = await ensureSunoSession(page);
-        const deviceId = session.deviceId;
-
-        const result = unwrapEvaluateResult(await page.evaluate(`(async () => {
+import{cli as d,Strategy as u}from"@jackwener/opencli/registry";import{CommandExecutionError as i,EmptyResultError as c}from"@jackwener/opencli/errors";import{STUDIO_API as p,SUNO_DOMAIN as f,SUNO_URL as m,ensureSunoSession as y,requireNonNegativeInt as w,requirePositiveInt as g,unwrapEvaluateResult as k}from"./utils.js";export const listCommand=d({site:"suno",name:"list",access:"read",description:"List recent Suno clips in your library (id, title, status, created_at, link)",domain:f,strategy:u.COOKIE,browser:!0,siteSession:"persistent",navigateBefore:!1,args:[{name:"limit",type:"int",default:20,help:"Max clips to list (default: 20)"},{name:"page",type:"int",default:0,help:"Pagination offset, 0-based (default: 0)"}],columns:["rank","clip","title","status","created","link"],func:async(r,s)=>{const a=g(s.limit,"--limit"),o=w(s.page??0,"--page"),n=(await y(r)).deviceId,t=k(await r.evaluate(`(async () => {
             const browserToken = JSON.stringify({ token: btoa(JSON.stringify({ timestamp: Date.now() })) });
-            const res = await fetch('${STUDIO_API}/api/feed/v2?page=${pageOffset}', {
+            const res = await fetch('${p}/api/feed/v2?page=${o}', {
                 headers: {
                     'Authorization': 'Bearer ' + (await window.Clerk.session.getToken()),
                     'browser-token': browserToken,
-                    'device-id': ${JSON.stringify(deviceId)},
+                    'device-id': ${JSON.stringify(n)},
                 },
             });
             if (!res.ok) return { ok: false, status: res.status };
             const data = await res.json().catch(() => null);
             if (!data || !Array.isArray(data.clips)) return { ok: false, error: 'malformed clips payload' };
             return { ok: true, clips: data.clips };
-        })()`));
-
-        if (!result?.ok) {
-            throw new CommandExecutionError(result?.error || `Suno feed lookup failed (HTTP ${result?.status || '?'}).`);
-        }
-        if (!Array.isArray(result.clips)) {
-            throw new CommandExecutionError('Suno feed lookup returned malformed clips payload');
-        }
-        if (result.clips.length === 0) {
-            throw new EmptyResultError('suno list', 'No Suno clips found in your library.');
-        }
-
-        return result.clips.slice(0, limit).map((c, i) => {
-            if (!c || typeof c.id !== 'string' || !c.id) {
-                throw new CommandExecutionError('Suno feed lookup returned malformed clip identity');
-            }
-            return {
-                rank: i + 1 + pageOffset * limit,
-                clip: c.id.slice(0, 8),
-                title: c.title || '(untitled)',
-                status: c.status || '?',
-                created: (c.created_at || '').replace('T', ' ').replace(/\..*$/, '').replace(/Z$/, ''),
-                link: `${SUNO_URL}/song/${c.id}`,
-            };
-        });
-    },
-});
+        })()`));if(!t?.ok)throw new i(t?.error||`Suno feed lookup failed (HTTP ${t?.status||"?"}).`);if(!Array.isArray(t.clips))throw new i("Suno feed lookup returned malformed clips payload");if(t.clips.length===0)throw new c("suno list","No Suno clips found in your library.");return t.clips.slice(0,a).map((e,l)=>{if(!e||typeof e.id!=="string"||!e.id)throw new i("Suno feed lookup returned malformed clip identity");return{rank:l+1+o*a,clip:e.id.slice(0,8),title:e.title||"(untitled)",status:e.status||"?",created:(e.created_at||"").replace("T"," ").replace(/\..*$/,"").replace(/Z$/,""),link:`${m}/song/${e.id}`}})}});

package/clis/suno/status.js

@@ -1,63 +1 @@
-/**
- * `opencli suno status` — quick health check: login state, plan, credit
- * breakdown, captcha readiness. Lets agents pre-flight before spending
- * generate credits.
- */
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { AuthRequiredError, CommandExecutionError } from '@jackwener/opencli/errors';
-import {
-    SUNO_DOMAIN,
-    checkSunoCaptcha,
-    ensureSunoSession,
-} from './utils.js';
-
-export const statusCommand = cli({
-    site: 'suno',
-    name: 'status',
-    access: 'read',
-    description: 'Check Suno login, plan, credit balance, and captcha readiness',
-    domain: SUNO_DOMAIN,
-    strategy: Strategy.COOKIE,
-    browser: true,
-    siteSession: 'persistent',
-    navigateBefore: false,
-    args: [],
-    columns: ['Status', 'Plan', 'Credits', 'Monthly', 'Captcha'],
-    func: async (page) => {
-        let session;
-        try {
-            session = await ensureSunoSession(page);
-        } catch (err) {
-            if (err instanceof AuthRequiredError) {
-                return [{
-                    Status: 'Not logged in',
-                    Plan: '-',
-                    Credits: '-',
-                    Monthly: '-',
-                    Captcha: '-',
-                }];
-            }
-            throw err;
-        }
-        let captcha;
-        try {
-            captcha = await checkSunoCaptcha(page, session.deviceId);
-        } catch (err) {
-            // Conservative: assume captcha is required when the pre-flight
-            // probe fails, so the displayed status doesn't claim "Not required"
-            // for an unverified state.
-            captcha = { required: true };
-        }
-        const b = session.breakdown;
-        // ensureSunoSession surfaces planKey derived from billing/info's
-        // subscription_type vs plans[] lookup; planId may be null for accounts
-        // whose plan cannot be resolved against plans[] (e.g., new schema fields).
-        return [{
-            Status: 'Connected',
-            Plan: session.planKey,
-            Credits: String(session.totalCreditsAvailable),
-            Monthly: `${b.monthlyRemaining}/${b.monthlyLimit}`,
-            Captcha: captcha?.required === true ? 'Required (solve in UI)' : 'Not required',
-        }];
-    },
-});
+import{cli as H,Strategy as J}from"@jackwener/opencli/registry";import{AuthRequiredError as K,CommandExecutionError as W}from"@jackwener/opencli/errors";import{SUNO_DOMAIN as L,checkSunoCaptcha as P,ensureSunoSession as Q}from"./utils.js";export const statusCommand=H({site:"suno",name:"status",access:"read",description:"Check Suno login, plan, credit balance, and captcha readiness",domain:L,strategy:J.COOKIE,browser:!0,siteSession:"persistent",navigateBefore:!1,args:[],columns:["Status","Plan","Credits","Monthly","Captcha"],func:async(F)=>{let x;try{x=await Q(F)}catch(B){if(B instanceof K)return[{Status:"Not logged in",Plan:"-",Credits:"-",Monthly:"-",Captcha:"-"}];throw B}let z;try{z=await P(F,x.deviceId)}catch(B){z={required:!0}}const G=x.breakdown;return[{Status:"Connected",Plan:x.planKey,Credits:String(x.totalCreditsAvailable),Monthly:`${G.monthlyRemaining}/${G.monthlyLimit}`,Captcha:z?.required===!0?"Required (solve in UI)":"Not required"}]}});