@wavespeed/cli 0.4.18 → 0.4.20

package/dist/commands/setup.js

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import crypto from 'node:crypto';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -8,19 +9,31 @@ import JSON5 from 'json5';
 import { getApiKey, userConfig } from '../lib/config.js';
 import { clientAttributionHeaders } from '../lib/client-headers.js';
 import { emitJson, emitJsonError, info, setJsonMode } from '../lib/log.js';
-import { DEFAULT_MODEL, KEY_ENV, LLM_BASE_URL, applyCodexToml, applyHermesYaml, applyJson, applyYamlScalars, claudeEdits, miniAgentValues, openclawEdits, opencodeEdits, qwenEdits, revertCodexToml, revertHermesYaml, revertJson, revertYamlScalars, validateModel, } from '../lib/setup-agents.js';
+import { DEFAULT_MODEL, KEY_ENV, LLM_BASE_URL, aiderValues, applyCodexToml, applyContinueYaml, applyDshPatch, applyHermesYaml, applyJson, applyYamlScalars, claudeEdits, crushEdits, droidEdits, gooseProviderFile, goosePlainValues, miniAgentValues, openclawEdits, opencodeEdits, qwenEdits, revertCodexToml, revertContinueYaml, revertDshPatch, revertHermesYaml, revertJson, revertYamlScalars, validateModel, } from '../lib/setup-agents.js';
 const home = os.homedir();
+// Goose: ~/.config/goose on macOS and Linux, %APPDATA%\Block\goose\config on Windows (per its docs; Windows not tested here).
+const GOOSE_DIR = process.platform === 'win32' ? path.join(process.env.APPDATA ?? path.join(home, 'AppData', 'Roaming'), 'Block', 'goose', 'config') : path.join(home, '.config', 'goose');
+const GOOSE_PROVIDER_FILE = path.join(GOOSE_DIR, 'custom_providers', 'wavespeed.json');
 const AGENTS = [
-    { id: 'claude', name: 'Claude Code', file: path.join(home, '.claude', 'settings.json'), command: 'claude', kind: 'json', keyInFile: true },
     { id: 'codex', name: 'Codex', file: path.join(home, '.codex', 'config.toml'), command: 'codex', kind: 'toml', keyInFile: false },
+    { id: 'claude', name: 'Claude Code', file: path.join(home, '.claude', 'settings.json'), command: 'claude', kind: 'json', keyInFile: true },
     { id: 'opencode', name: 'OpenCode', file: path.join(home, '.config', 'opencode', 'opencode.json'), command: 'opencode', kind: 'json', keyInFile: false },
     { id: 'openclaw', name: 'OpenClaw', file: path.join(home, '.openclaw', 'openclaw.json'), command: 'openclaw', kind: 'json5', keyInFile: false },
     { id: 'hermes', name: 'Hermes', file: path.join(home, '.hermes', 'config.yaml'), command: 'hermes', kind: 'yaml', keyInFile: false },
+    { id: 'kilo', name: 'Kilo Code', file: path.join(home, '.config', 'kilo', 'kilo.json'), command: 'kilo', kind: 'json5', keyInFile: false },
     { id: 'qwen', name: 'Qwen Code', file: path.join(home, '.qwen', 'settings.json'), command: 'qwen', kind: 'json', keyInFile: false },
     { id: 'miniagent', name: 'Mini-Agent', file: path.join(home, '.mini-agent', 'config', 'config.yaml'), command: 'mini-agent', kind: 'yamlscalars', keyInFile: true },
+    { id: 'crush', name: 'Crush', file: path.join(home, '.config', 'crush', 'crush.json'), command: 'crush', kind: 'json', keyInFile: false },
+    { id: 'droid', name: 'Factory Droid', file: path.join(home, '.factory', 'settings.json'), command: 'droid', kind: 'json', keyInFile: false },
+    { id: 'aider', name: 'Aider', file: path.join(home, '.aider.conf.yml'), command: 'aider', kind: 'yamlscalars', keyInFile: true },
+    { id: 'continue', name: 'Continue CLI', file: path.join(home, '.continue', 'config.yaml'), command: 'cn', kind: 'yamlseq', keyInFile: false },
+    { id: 'goose', name: 'Goose', file: path.join(GOOSE_DIR, 'config.yaml'), command: 'goose', kind: 'goose', keyInFile: false },
+    { id: 'dsh', name: 'DeepSeek Harness', file: path.join(process.env.DSH_HOME || path.join(home, '.dsh'), 'cordis.patch.yml'), command: 'dsh', kind: 'dsh', keyInFile: false },
     // Cline's CLI keeps provider settings (including the key) in this file; we write it only through `cline auth`.
     { id: 'cline', name: 'Cline', file: path.join(home, '.cline', 'data', 'settings', 'providers.json'), command: 'cline', kind: 'cline', keyInFile: true },
+    // Cline's CLI keeps provider settings (including the key) in this file; we write it only through `cline auth`.
 ];
+const sha256 = (data) => crypto.createHash('sha256').update(data).digest('hex');
 const shown = (p) => p.replace(home, '~');
 function onPath(cmd) {
     const exts = process.platform === 'win32' ? ['.exe', '.cmd', '.bat', ''] : [''];
@@ -67,10 +80,11 @@ function readJson(file, json5 = false) {
     }
     throw new Error(`${shown(file)} is not plain JSON (comments or trailing commas?). Edit it by hand using the snippet at https://wavespeed.ai/llm/agents`);
 }
-function writeFile(file, content, secret) {
+/** `keepOriginalBackup`: setup already ran for this agent, so an existing .bak is the true original. */
+function writeFile(file, content, secret, keepOriginalBackup) {
     fs.mkdirSync(path.dirname(file), { recursive: true });
     const bak = `${file}.wavespeed.bak`;
-    if (fs.existsSync(file) && !fs.existsSync(bak))
+    if (fs.existsSync(file) && (!keepOriginalBackup || !fs.existsSync(bak)))
         fs.copyFileSync(file, bak);
     fs.writeFileSync(file, content, secret ? { mode: 0o600 } : undefined);
     if (secret)
@@ -84,7 +98,7 @@ function envHint() {
 export function registerSetup(program) {
     program
         .command('setup [agent]')
-        .description('Point a coding agent (claude, codex, opencode, openclaw, hermes, cline, qwen, miniagent) at the WaveSpeed LLM gateway')
+        .description('Point a coding agent (claude, codex, opencode, openclaw, hermes, cline, qwen, miniagent, kilo, droid, crush, aider, continue, goose, dsh) at the WaveSpeed LLM gateway')
         .option('--model <id>', `Model to use (default: ${DEFAULT_MODEL})`)
         .option('--dry-run', 'Show what would change without writing anything')
         .option('--undo', "Restore the agent's config to what it was before setup")
@@ -122,7 +136,29 @@ export function registerSetup(program) {
                     delete rest[agent.id];
                     userConfig.set('setup', rest);
                 };
-                if (agent.kind === 'toml') {
+                if (state && agent.kind !== 'cline' && !fs.existsSync(state.file)) {
+                    if (!opts.dryRun)
+                        forget();
+                    info(chalk.yellow(`${shown(state.file)} is already gone; cleared the saved setup state.`));
+                    return;
+                }
+                // Untouched since setup wrote it: put the original bytes back (or remove a file we created).
+                const exact = !!state?.hash && agent.kind !== 'cline' && agent.kind !== 'goose' &&
+                    fs.existsSync(state.file) && sha256(fs.readFileSync(state.file)) === state.hash;
+                if (exact && state) {
+                    const bak = `${state.file}.wavespeed.bak`;
+                    if (!opts.dryRun) {
+                        if (state.existed === false)
+                            fs.rmSync(state.file, { force: true });
+                        else if (fs.existsSync(bak)) {
+                            fs.copyFileSync(bak, state.file);
+                            fs.chmodSync(state.file, fs.statSync(bak).mode & 0o777);
+                        }
+                        fs.rmSync(bak, { force: true });
+                        forget();
+                    }
+                }
+                else if (agent.kind === 'toml') {
                     if (!fs.existsSync(agent.file))
                         return fail(`${shown(agent.file)} does not exist; nothing to undo`);
                     const before = fs.readFileSync(agent.file, 'utf8');
@@ -154,6 +190,47 @@ export function registerSetup(program) {
                         forget();
                     }
                 }
+                else if (agent.kind === 'yamlseq') {
+                    const after = revertContinueYaml(fs.readFileSync(state.file, 'utf8'), state.previous);
+                    if (!opts.dryRun) {
+                        if (after.trim() === '')
+                            fs.rmSync(state.file, { force: true });
+                        else
+                            fs.writeFileSync(state.file, after);
+                        forget();
+                    }
+                }
+                else if (agent.kind === 'dsh') {
+                    const after = revertDshPatch(fs.readFileSync(state.file, 'utf8'));
+                    if (!opts.dryRun) {
+                        if (!state.previous.existed)
+                            fs.rmSync(state.file, { force: true });
+                        else
+                            fs.writeFileSync(state.file, after);
+                        forget();
+                    }
+                }
+                else if (agent.kind === 'goose') {
+                    const prev = state.previous;
+                    const after = revertYamlScalars(fs.readFileSync(state.file, 'utf8'), prev.scalars);
+                    if (!opts.dryRun) {
+                        if (after.trim() === '')
+                            fs.rmSync(state.file, { force: true });
+                        else
+                            fs.writeFileSync(state.file, after);
+                        fs.rmSync(`${state.file}.wavespeed.bak`, { force: true });
+                        if (prev.providerRaw !== null)
+                            fs.writeFileSync(GOOSE_PROVIDER_FILE, prev.providerRaw);
+                        else {
+                            fs.rmSync(GOOSE_PROVIDER_FILE, { force: true });
+                            try {
+                                fs.rmdirSync(path.dirname(GOOSE_PROVIDER_FILE));
+                            }
+                            catch { /* not empty or already gone */ }
+                        }
+                        forget();
+                    }
+                }
                 else if (agent.kind === 'yaml') {
                     const after = revertHermesYaml(fs.readFileSync(state.file, 'utf8'), state.previous);
                     if (!opts.dryRun) {
@@ -201,10 +278,25 @@ export function registerSetup(program) {
                 previous = r.previous;
             }
             else if (agent.kind === 'yamlscalars') {
-                const r = applyYamlScalars(fs.existsSync(agent.file) ? fs.readFileSync(agent.file, 'utf8') : '', miniAgentValues(model, apiKey));
+                const values = agent.id === 'aider' ? aiderValues(model, apiKey) : miniAgentValues(model, apiKey);
+                const r = applyYamlScalars(fs.existsSync(agent.file) ? fs.readFileSync(agent.file, 'utf8') : '', values);
                 next = r.text;
                 previous = r.previous;
             }
+            else if (agent.kind === 'yamlseq') {
+                const r = applyContinueYaml(fs.existsSync(agent.file) ? fs.readFileSync(agent.file, 'utf8') : '', model);
+                next = r.text;
+                previous = r.previous;
+            }
+            else if (agent.kind === 'dsh') {
+                previous = { existed: fs.existsSync(agent.file) };
+                next = applyDshPatch(fs.existsSync(agent.file) ? fs.readFileSync(agent.file, 'utf8') : '', model);
+            }
+            else if (agent.kind === 'goose') {
+                const r = applyYamlScalars(fs.existsSync(agent.file) ? fs.readFileSync(agent.file, 'utf8') : '', goosePlainValues(model));
+                next = r.text;
+                previous = { scalars: r.previous, providerRaw: fs.existsSync(GOOSE_PROVIDER_FILE) ? fs.readFileSync(GOOSE_PROVIDER_FILE, 'utf8') : null };
+            }
             else if (agent.kind === 'cline') {
                 previous = { existed: fs.existsSync(agent.file) };
                 if (!onPath('cline'))
@@ -212,7 +304,7 @@ export function registerSetup(program) {
             }
             else {
                 const base = readJson(agent.file, agent.kind === 'json5');
-                const edits = agent.id === 'claude' ? claudeEdits(model, apiKey) : agent.id === 'openclaw' ? openclawEdits(model, base) : agent.id === 'qwen' ? qwenEdits(model) : opencodeEdits(model);
+                const edits = agent.id === 'claude' ? claudeEdits(model, apiKey) : agent.id === 'openclaw' ? openclawEdits(model, base) : agent.id === 'qwen' ? qwenEdits(model) : agent.id === 'crush' ? crushEdits(model) : agent.id === 'droid' ? droidEdits(model, base) : opencodeEdits(model);
                 const r = applyJson(base, edits);
                 previous = r.previous;
                 next = JSON.stringify(r.doc, null, 2) + '\n';
@@ -225,7 +317,7 @@ export function registerSetup(program) {
         if (opts.dryRun) {
             if (opts.json)
                 return emitJson({ agent: agent.id, model, file: agent.file, dry_run: true, will_create: !exists });
-            info(chalk.bold(`Would ${exists ? 'update' : 'create'} ${shown(agent.file)}`) + chalk.gray(` (model ${model}${agent.keyInFile ? '; your API key would be stored in this file' : ''})`));
+            info(chalk.bold(`Would ${exists ? 'update' : 'create'} ${shown(agent.file)}${agent.kind === 'goose' ? ` and ${shown(GOOSE_PROVIDER_FILE)}` : ''}`) + chalk.gray(` (model ${model}${agent.keyInFile ? '; your API key would be stored in this file' : ''})`));
             info(chalk.gray('Nothing written.'));
             return;
         }
@@ -247,12 +339,21 @@ export function registerSetup(program) {
         }
         else {
             const hadComments = agent.kind === 'json5' && exists && /^\s*\/\/|\/\*/m.test(fs.readFileSync(agent.file, 'utf8'));
-            writeFile(agent.file, next, agent.keyInFile);
+            writeFile(agent.file, next, agent.keyInFile, !!userConfig.get('setup')?.[agent.id]);
+            if (agent.kind === 'goose') {
+                fs.mkdirSync(path.dirname(GOOSE_PROVIDER_FILE), { recursive: true });
+                fs.writeFileSync(GOOSE_PROVIDER_FILE, gooseProviderFile(model));
+            }
             if (hadComments)
                 info(chalk.yellow(`Comments in ${shown(agent.file)} were not kept; the original is saved as ${shown(agent.file)}.wavespeed.bak`));
         }
-        if (agent.kind !== 'toml')
-            userConfig.set('setup', { ...(userConfig.get('setup') ?? {}), [agent.id]: { file: agent.file, previous } });
+        {
+            const prior = userConfig.get('setup')?.[agent.id];
+            const record = { file: agent.file, previous, hash: agent.kind === 'cline' ? undefined : sha256(next), existed: prior ? prior.existed : exists };
+            // Re-running setup on an already configured agent keeps the first run's undo data.
+            const keep = prior && agent.kind !== 'toml' && agent.kind !== 'cline' ? { ...record, previous: prior.previous } : record;
+            userConfig.set('setup', { ...(userConfig.get('setup') ?? {}), [agent.id]: keep });
+        }
         const check = opts.check ? await selfCheck(apiKey, model) : null;
         if (opts.json) {
             emitJson({ agent: agent.id, model, file: agent.file, written: true, check: check ? { ok: check.ok, detail: check.detail } : 'skipped', needs_env: agent.keyInFile ? null : KEY_ENV });
@@ -260,7 +361,7 @@ export function registerSetup(program) {
                 process.exit(1);
             return;
         }
-        info(chalk.green(`Updated ${shown(agent.file)}`) + chalk.gray(` (model ${model})`));
+        info(chalk.green(`${exists ? 'Updated' : 'Created'} ${shown(agent.file)}`) + chalk.gray(` (model ${model})`));
         if (check)
             info(check.ok ? chalk.green(`Verified: streamed reply from ${model} (${check.detail}).`) : chalk.red(`Check failed: ${check.detail}`));
         if (!agent.keyInFile) {

package/dist/lib/setup-agents.js

@@ -16,13 +16,17 @@ import { parseDocument } from 'yaml';
 function isObj(v) {
     return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
+/** Objects and arrays can both hold a path segment (array elements are addressed by index). */
+function isContainer(v) {
+    return typeof v === 'object' && v !== null;
+}
 /** Set each path, remembering what was there so `revertJson` can put it back. */
 export function applyJson(doc, edits) {
     const previous = [];
     for (const { path, value } of edits) {
         let cur = doc;
         for (const key of path.slice(0, -1)) {
-            if (!isObj(cur[key]))
+            if (!isContainer(cur[key]))
                 cur[key] = {};
             cur = cur[key];
         }
@@ -38,8 +42,8 @@ export function revertJson(doc, previous) {
         const parents = [doc];
         let cur = doc;
         for (const key of path.slice(0, -1)) {
-            cur = isObj(cur) ? cur[key] : undefined;
-            if (!isObj(cur))
+            cur = isContainer(cur) ? cur[key] : undefined;
+            if (!isContainer(cur))
                 break;
             parents.push(cur);
         }
@@ -49,6 +53,8 @@ export function revertJson(doc, previous) {
         const last = path[path.length - 1];
         if (existed)
             holder[last] = value;
+        else if (Array.isArray(holder))
+            holder.splice(Number(last), 1);
         else
             delete holder[last];
         // Drop containers we created and that are now empty.
@@ -118,6 +124,69 @@ export function qwenEdits(model) {
         { path: ['model', 'name'], value: m },
     ];
 }
+export function crushEdits(model) {
+    const m = validateModel(model);
+    const sel = { provider: 'wavespeed', model: m };
+    return [
+        {
+            path: ['providers', 'wavespeed'],
+            value: {
+                name: 'WaveSpeed',
+                type: 'openai-compat',
+                base_url: LLM_BASE_URL,
+                api_key: `$${KEY_ENV}`,
+                models: [{ id: m, name: m, context_window: 128000, default_max_tokens: 16000 }],
+            },
+        },
+        { path: ['models', 'large'], value: sel },
+        { path: ['models', 'small'], value: { ...sel } },
+    ];
+}
+/**
+ * Factory Droid keeps custom models in one array that also holds the user's other
+ * providers (and their keys): touch only our own element so the saved undo state
+ * never copies anyone else's entry.
+ */
+export function droidEdits(model, doc) {
+    const m = validateModel(model);
+    const existing = Array.isArray(doc.customModels) ? doc.customModels : [];
+    const at = existing.findIndex((e) => isObj(e) && e.baseUrl === LLM_BASE_URL);
+    const ours = {
+        model: m,
+        displayName: `WaveSpeed ${m}`,
+        baseUrl: LLM_BASE_URL,
+        apiKey: `\${${KEY_ENV}}`,
+        provider: 'generic-chat-completion-api',
+        maxOutputTokens: 16000,
+    };
+    return [
+        { path: ['customModels', String(at >= 0 ? at : existing.length)], value: ours },
+        // Without a default, `droid exec` asks for a Factory login unless -m custom:<model> is given.
+        { path: ['sessionDefaultSettings', 'model'], value: `custom:${m}` },
+    ];
+}
+// ---------- Goose (custom provider file + two scalars in config.yaml) ----------
+export function goosePlainValues(model) {
+    return { GOOSE_PROVIDER: 'wavespeed', GOOSE_MODEL: validateModel(model) };
+}
+export function gooseProviderFile(model) {
+    const m = validateModel(model);
+    return (JSON.stringify({
+        name: 'wavespeed',
+        engine: 'openai',
+        display_name: 'WaveSpeed',
+        description: 'WaveSpeed LLM gateway',
+        api_key_env: KEY_ENV,
+        base_url: `${LLM_BASE_URL}/chat/completions`,
+        models: [{ name: m, context_limit: 128000 }],
+        supports_streaming: true,
+    }, null, 2) + '\n');
+}
+// ---------- Aider (flat YAML scalars; the key lives in the file) ----------
+export function aiderValues(model, apiKey) {
+    // litellm needs the openai/ prefix to treat the gateway as a generic OpenAI-compatible endpoint.
+    return { 'openai-api-base': LLM_BASE_URL, 'openai-api-key': apiKey, model: `openai/${validateModel(model)}` };
+}
 // ---------- Mini-Agent (flat YAML scalars; the key lives in the file) ----------
 export function miniAgentValues(model, apiKey) {
     return { api_key: apiKey, api_base: LLM_BASE_URL, model: validateModel(model), provider: 'openai' };
@@ -319,6 +388,134 @@ export function revertHermesYaml(input, previous) {
     }
     return text;
 }
+export function continueEntry(model, pad) {
+    const m = validateModel(model);
+    return [
+        `${pad}- name: ${JSON.stringify(`WaveSpeed ${m}`)}`,
+        `${pad}  provider: openai`,
+        `${pad}  model: ${JSON.stringify(m)}`,
+        `${pad}  apiBase: ${LLM_BASE_URL}`,
+        `${pad}  apiKey: "\${{ secrets.${KEY_ENV} }}"`,
+        `${pad}  roles:`,
+        `${pad}    - chat`,
+        `${pad}  defaultCompletionOptions:`,
+        `${pad}    contextLength: 128000`,
+        `${pad}    maxTokens: 16000`,
+        '',
+    ].join('\n');
+}
+function isOurContinueEntry(it) {
+    return typeof it?.get === 'function' && it.get('apiBase') === LLM_BASE_URL && it.get('provider') === 'openai';
+}
+export function applyContinueYaml(input, model) {
+    validateModel(model);
+    const created = input.trim() === '';
+    let text = input;
+    if (created) {
+        text = 'name: WaveSpeed\nversion: 1.0.0\nschema: v1\n';
+    }
+    else if (!text.endsWith('\n')) {
+        text += '\n';
+    }
+    const doc = parseYaml(text);
+    const root = doc.contents;
+    const previous = { created, hadKey: false };
+    const list = root?.get?.('models', true);
+    if (list === undefined || list === null) {
+        return { text: `${text}models:\n${continueEntry(model, '  ')}`, previous };
+    }
+    if (!list.items || list.flow === true)
+        throw new Error('models: in config.yaml is not a block list; edit it by hand');
+    previous.hadKey = true;
+    const mine = list.items.find(isOurContinueEntry);
+    if (mine?.range) {
+        const { dash, pad } = dashPad(text, mine.range[0]);
+        const end = contentLineEnd(text, mine.range[1]);
+        previous.entryRaw = text.slice(lineStart(text, dash), end);
+        return { text: text.slice(0, lineStart(text, dash)) + continueEntry(model, pad) + text.slice(end), previous };
+    }
+    if (list.items.length === 0)
+        throw new Error('models: in config.yaml is empty; edit it by hand');
+    // First in the list: Continue's CLI has no default-model key and uses the first chat-role entry.
+    const { dash, pad } = dashPad(text, list.items[0].range[0]);
+    const at = lineStart(text, dash);
+    return { text: text.slice(0, at) + continueEntry(model, pad) + text.slice(at), previous };
+}
+export function revertContinueYaml(input, previous) {
+    let text = input;
+    const doc = parseYaml(text);
+    const list = doc.contents?.get?.('models', true);
+    const mine = list?.items?.find(isOurContinueEntry);
+    if (mine?.range) {
+        const { dash } = dashPad(text, mine.range[0]);
+        const start = lineStart(text, dash);
+        text = text.slice(0, start) + (previous.entryRaw ?? '') + text.slice(contentLineEnd(text, mine.range[1]));
+    }
+    if (!previous.hadKey) {
+        const again = parseYaml(text);
+        const l2 = again.contents?.get?.('models', true);
+        if (l2 && (l2.items === undefined || l2.items.length === 0))
+            text = text.replace(/^models:[ \t]*\n?/m, '');
+    }
+    if (previous.created && text.trim() === 'name: WaveSpeed\nversion: 1.0.0\nschema: v1')
+        return '';
+    return text;
+}
+// ---------- DeepSeek Harness (user patch layer; a managed block in cordis.patch.yml) ----------
+const DSH_OPEN = '# >>> wavespeed (managed by `wavespeed setup`) >>>';
+const DSH_CLOSE = '# <<< wavespeed <<<';
+export function dshBlock(model) {
+    const m = validateModel(model);
+    return [
+        DSH_OPEN,
+        '- id: llm-pi-ai',
+        '  config:',
+        '    providers:',
+        '      wavespeed:',
+        `        apiKeyEnv: ${KEY_ENV}`,
+        '        api: openai-completions',
+        `        baseURL: ${LLM_BASE_URL}`,
+        '        models:',
+        `          - id: ${m}`,
+        '- id: agent-default-model',
+        '  config:',
+        '    provider: wavespeed',
+        `    model: ${m}`,
+        DSH_CLOSE,
+        '',
+    ].join('\n');
+}
+export function revertDshPatch(text) {
+    const out = [];
+    let skipping = false;
+    for (const line of text.split('\n')) {
+        if (line.trim() === DSH_OPEN) {
+            skipping = true;
+            continue;
+        }
+        if (skipping) {
+            if (line.trim() === DSH_CLOSE)
+                skipping = false;
+            continue;
+        }
+        out.push(line);
+    }
+    const rest = out.join('\n').replace(/\n{3,}/g, '\n\n');
+    if (/^\s*-\s+id:/m.test(rest))
+        return rest.replace(/\n+$/, '\n');
+    // No entries left: dsh's own file is an empty list (plus any comments).
+    const noEmpty = rest.replace(/^\s*\[\]\s*$/m, '').replace(/\n+$/, '');
+    return (noEmpty ? noEmpty + '\n' : '') + '[]\n';
+}
+export function applyDshPatch(input, model) {
+    const base = revertDshPatch(input);
+    if (/^\s*-\s+id:\s*(llm-pi-ai|agent-default-model)\b/m.test(base)) {
+        throw new Error('cordis.patch.yml already patches llm-pi-ai or agent-default-model; merge the WaveSpeed provider by hand');
+    }
+    const withoutEmpty = base.replace(/^\s*\[\]\s*$/m, '').replace(/\n{3,}/g, '\n\n');
+    const head = withoutEmpty.trim() === '' ? '' : withoutEmpty.replace(/\n*$/, '\n\n');
+    return head + dshBlock(model);
+}
 // ---------- Codex (TOML, edited as text so the user's comments survive) ----------
 const TOP_OPEN = '# >>> wavespeed (managed by `wavespeed setup`) >>>';
 const TOP_CLOSE = '# <<< wavespeed <<<';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavespeed/cli",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "description": "WaveSpeed CLI — one command to run any WaveSpeed AI model from your terminal.",
   "publishConfig": {
     "access": "public"

package/skills/SKILL.md

@@ -77,4 +77,5 @@ The CLI never modifies the user's prompt or inputs. The single exception is expl
 - Don't invent model IDs. Always confirm via `wavespeed models` or `wavespeed schema <id>` before running.
 - Use `--json` on every `run` so you can read `outputs[0]` programmatically.
 - `wavespeed delete` requires `--yes` when run non-interactively (that includes you).
-- Spend questions: `wavespeed usage` (totals, per-model) and `wavespeed billings` (per-charge records).
+- Cost and spend: `wavespeed price <id> -i k=v --json` estimates a run without generating or charging; `wavespeed balance` shows remaining credit; `wavespeed usage` (totals, per-model) and `wavespeed billings` (per-charge records) show what was spent.
+- A `run` that fails with a gateway or network error (502/503/504, connection reset, timeout) does NOT mean the task failed, and the submit request is never retried automatically, so re-running can create a duplicate paid task. Do not re-run immediately. If the error contains a task id (`task_id` / prediction id), keep checking it with `wavespeed show <id> --json` until its status is terminal (`completed`, `failed`, `cancelled`, `timeout`, `deleted`). If no id was returned, check recent predictions with `wavespeed history --json` (add `--model <id>`; default window is the last 24h) and re-run once only if none matches. A client-side wait timeout or an interrupted `run` does not mean the task failed: tasks can run for a long time, so do not give up after a fixed time.