@wavespeed/cli 0.4.19 → 0.4.21

package/README.md

@@ -141,7 +141,7 @@ wavespeed logout                         Clear stored API key
 wavespeed status                         Show masked key, base URL, useful links
 wavespeed config [--default-model …]     View / update CLI defaults
 wavespeed upgrade [--check] [--json]     Upgrade to the latest version (--check only reports)
-wavespeed setup [agent]                  Point claude, codex, opencode, openclaw, hermes, cline, qwen or miniagent at the WaveSpeed LLM gateway (--dry-run, --undo, --model)
+wavespeed setup [agent]                  Point a coding agent (claude, codex, gemini, opencode, openclaw, hermes, kilo, cline, qwen, droid, crush, aider, continue, goose, miniagent, dsh) at the WaveSpeed LLM gateway (--dry-run, --undo, --model)
 
 # generation
 wavespeed run [model|alias] -p "…"       Run any model or alias (uses defaultModel if omitted)

package/dist/commands/setup.js

@@ -9,10 +9,11 @@ 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, 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';
+import { DEFAULT_MODEL, KEY_ENV, LLM_BASE_URL, aiderValues, applyCodexToml, applyContinueYaml, applyDshPatch, applyHermesYaml, applyGeminiEnv, applyJson, applyYamlScalars, claudeEdits, crushEdits, droidEdits, geminiEdits, gooseProviderFile, goosePlainValues, miniAgentValues, openclawEdits, opencodeEdits, qwenEdits, revertCodexToml, revertContinueYaml, revertDshPatch, revertGeminiEnv, 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 GEMINI_SETTINGS_FILE = path.join(home, '.gemini', 'settings.json');
 const GOOSE_PROVIDER_FILE = path.join(GOOSE_DIR, 'custom_providers', 'wavespeed.json');
 const AGENTS = [
     { id: 'codex', name: 'Codex', file: path.join(home, '.codex', 'config.toml'), command: 'codex', kind: 'toml', keyInFile: false },
@@ -29,6 +30,8 @@ const AGENTS = [
     { 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 },
+    // Gemini CLI reads the base URL and key from ~/.gemini/.env (trusted folders only); the model and auth type live in settings.json.
+    { id: 'gemini', name: 'Gemini CLI', file: path.join(home, '.gemini', '.env'), command: 'gemini', kind: 'gemini', keyInFile: true },
     // 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`.
@@ -98,7 +101,7 @@ function envHint() {
 export function registerSetup(program) {
     program
         .command('setup [agent]')
-        .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')
+        .description('Point a coding agent (claude, codex, opencode, openclaw, hermes, cline, qwen, miniagent, kilo, droid, crush, aider, continue, goose, dsh, gemini) 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")
@@ -143,7 +146,7 @@ export function registerSetup(program) {
                     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' &&
+                const exact = !!state?.hash && agent.kind !== 'cline' && agent.kind !== 'goose' && agent.kind !== 'gemini' &&
                     fs.existsSync(state.file) && sha256(fs.readFileSync(state.file)) === state.hash;
                 if (exact && state) {
                     const bak = `${state.file}.wavespeed.bak`;
@@ -210,6 +213,26 @@ export function registerSetup(program) {
                         forget();
                     }
                 }
+                else if (agent.kind === 'gemini') {
+                    const prev = state.previous;
+                    const envAfter = revertGeminiEnv(fs.readFileSync(state.file, 'utf8'));
+                    if (!opts.dryRun) {
+                        if (envAfter.trim() === '' && !state.existed)
+                            fs.rmSync(state.file, { force: true });
+                        else
+                            fs.writeFileSync(state.file, envAfter);
+                        fs.rmSync(`${state.file}.wavespeed.bak`, { force: true });
+                        if (fs.existsSync(GEMINI_SETTINGS_FILE)) {
+                            const doc = revertJson(readJson(GEMINI_SETTINGS_FILE, false), prev.settings);
+                            if (!prev.settingsExisted && Object.keys(doc).length === 0)
+                                fs.rmSync(GEMINI_SETTINGS_FILE, { force: true });
+                            else
+                                fs.writeFileSync(GEMINI_SETTINGS_FILE, JSON.stringify(doc, null, 2) + '\n');
+                        }
+                        fs.rmSync(`${GEMINI_SETTINGS_FILE}.wavespeed.bak`, { force: true });
+                        forget();
+                    }
+                }
                 else if (agent.kind === 'goose') {
                     const prev = state.previous;
                     const after = revertYamlScalars(fs.readFileSync(state.file, 'utf8'), prev.scalars);
@@ -268,6 +291,7 @@ export function registerSetup(program) {
         }
         let next = '';
         let previous = [];
+        let geminiSettings = '';
         try {
             if (agent.kind === 'toml') {
                 next = applyCodexToml(fs.existsSync(agent.file) ? fs.readFileSync(agent.file, 'utf8') : '', model);
@@ -297,6 +321,12 @@ export function registerSetup(program) {
                 next = r.text;
                 previous = { scalars: r.previous, providerRaw: fs.existsSync(GOOSE_PROVIDER_FILE) ? fs.readFileSync(GOOSE_PROVIDER_FILE, 'utf8') : null };
             }
+            else if (agent.kind === 'gemini') {
+                const r = applyJson(readJson(GEMINI_SETTINGS_FILE, false), geminiEdits(model));
+                geminiSettings = JSON.stringify(r.doc, null, 2) + '\n';
+                previous = { settings: r.previous, settingsExisted: fs.existsSync(GEMINI_SETTINGS_FILE) };
+                next = applyGeminiEnv(fs.existsSync(agent.file) ? fs.readFileSync(agent.file, 'utf8') : '', apiKey);
+            }
             else if (agent.kind === 'cline') {
                 previous = { existed: fs.existsSync(agent.file) };
                 if (!onPath('cline'))
@@ -317,7 +347,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)}${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.bold(`Would ${exists ? 'update' : 'create'} ${shown(agent.file)}${agent.kind === 'goose' ? ` and ${shown(GOOSE_PROVIDER_FILE)}` : agent.kind === 'gemini' ? ` and ${shown(GEMINI_SETTINGS_FILE)}` : ''}`) + chalk.gray(` (model ${model}${agent.keyInFile ? '; your API key would be stored in this file' : ''})`));
             info(chalk.gray('Nothing written.'));
             return;
         }
@@ -340,6 +370,12 @@ 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, !!userConfig.get('setup')?.[agent.id]);
+            if (agent.kind === 'gemini') {
+                const bak = `${GEMINI_SETTINGS_FILE}.wavespeed.bak`;
+                if (fs.existsSync(GEMINI_SETTINGS_FILE) && !fs.existsSync(bak))
+                    fs.copyFileSync(GEMINI_SETTINGS_FILE, bak);
+                fs.writeFileSync(GEMINI_SETTINGS_FILE, geminiSettings);
+            }
             if (agent.kind === 'goose') {
                 fs.mkdirSync(path.dirname(GOOSE_PROVIDER_FILE), { recursive: true });
                 fs.writeFileSync(GOOSE_PROVIDER_FILE, gooseProviderFile(model));
@@ -367,6 +403,9 @@ export function registerSetup(program) {
         if (!agent.keyInFile) {
             info(`\nThe key is read from ${chalk.bold(KEY_ENV)}; set it in the shell that launches ${agent.command}:\n  ${chalk.cyan(envHint())}\n  Keys: https://wavespeed.ai/accesskey`);
         }
+        if (agent.kind === 'gemini') {
+            info(chalk.yellow('\nGemini CLI reads ~/.gemini/.env only in folders it trusts: accept the trust prompt on first start, or set GEMINI_CLI_TRUST_WORKSPACE=true for scripts and CI.'));
+        }
         info(`\nStart it with ${chalk.cyan(agent.command)}. Revert with ${chalk.cyan(`wavespeed setup ${agent.id} --undo`)}.`);
         if (check && !check.ok)
             process.exit(1);

package/dist/lib/setup-agents.js

@@ -576,3 +576,38 @@ export function applyCodexToml(text, model) {
     const body = edited.join('\n').replace(/\n+$/, '');
     return [...top, body, ...tail].join('\n').replace(/\n{3,}/g, '\n\n');
 }
+// ---------- Gemini CLI (managed block in ~/.gemini/.env + two keys in settings.json) ----------
+const ENV_OPEN = '# >>> wavespeed (managed by `wavespeed setup`) >>>';
+const ENV_CLOSE = '# <<< wavespeed <<<';
+export function geminiEdits(model) {
+    const m = validateModel(model);
+    return [
+        { path: ['security', 'auth', 'selectedType'], value: 'gemini-api-key' },
+        { path: ['model', 'name'], value: m },
+    ];
+}
+export function revertGeminiEnv(text) {
+    const out = [];
+    let skipping = false;
+    for (const line of text.split('\n')) {
+        if (line.trim() === ENV_OPEN) {
+            skipping = true;
+            continue;
+        }
+        if (skipping) {
+            if (line.trim() === ENV_CLOSE)
+                skipping = false;
+            continue;
+        }
+        out.push(line);
+    }
+    return out.join('\n').replace(/\n{3,}/g, '\n\n').replace(/\n+$/, '\n').replace(/^\n$/, '');
+}
+/** dotenv lets the last duplicate win, so the managed block goes at the end. */
+export function applyGeminiEnv(input, apiKey) {
+    if (/[\r\n]/.test(apiKey))
+        throw new Error('API key contains a line break');
+    const base = revertGeminiEnv(input);
+    const head = base.trim() === '' ? '' : base.replace(/\n*$/, '\n\n');
+    return head + [ENV_OPEN, `GOOGLE_GEMINI_BASE_URL=${CLAUDE_BASE_URL}`, `GEMINI_API_KEY=${apiKey}`, ENV_CLOSE, ''].join('\n');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavespeed/cli",
-  "version": "0.4.19",
+  "version": "0.4.21",
   "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.