gipity 1.0.397 → 1.0.399

package/dist/adopt-cwd.js

@@ -11,7 +11,7 @@
  *      `.gipity.json`, sync, and install hooks/skills/gitignore.
  */
 import { readdirSync, statSync } from 'fs';
-import { join, resolve, sep } from 'path';
+import { join, resolve, sep, parse as parsePath } from 'path';
 import { homedir } from 'os';
 import { get, post, ApiError } from './api.js';
 import { isSyncIgnored } from './setup.js';
@@ -103,6 +103,15 @@ export function canAdoptCwd(cwd) {
         '/tmp', '/var', '/etc', '/usr', '/opt',
         '/mnt', '/mnt/c', '/mnt/d', '/mnt/wsl',
     ]);
+    // Filesystem root (POSIX `/` already covered by `sep`, but on Windows this
+    // catches drive roots like `C:\`). Plus the common Windows system dirs.
+    if (norm === parsePath(norm).root)
+        return false;
+    for (const envVar of ['windir', 'SystemRoot', 'ProgramFiles', 'ProgramFiles(x86)']) {
+        const v = process.env[envVar];
+        if (v && norm === resolve(v))
+            return false;
+    }
     if (blocked.has(norm))
         return false;
     // Workspace-parent heuristic: a directory at depth ≤1 below $HOME that

package/dist/api.js

@@ -2,6 +2,7 @@ import { Readable } from 'stream';
 import * as tar from 'tar-stream';
 import { getAuth, refreshTokenIfNeeded } from './auth.js';
 import { resolveApiBase, requireConfig, saveConfig } from './config.js';
+import { clientHeaders } from './client-context.js';
 export class ApiError extends Error {
     statusCode;
     code;
@@ -32,6 +33,7 @@ async function bearerToken() {
 }
 async function getHeaders() {
     return {
+        ...clientHeaders(),
         'Authorization': `Bearer ${await bearerToken()}`,
         'Content-Type': 'application/json',
     };
@@ -137,7 +139,7 @@ export async function sendMessage(message) {
 export async function download(path) {
     const url = `${baseUrl()}${path}`;
     const res = await fetch(url, {
-        headers: { 'Authorization': `Bearer ${await bearerToken()}` },
+        headers: { ...clientHeaders(), 'Authorization': `Bearer ${await bearerToken()}` },
     });
     if (!res.ok) {
         throw new ApiError(res.status, 'DOWNLOAD_ERROR', `Download failed: ${res.statusText}`);
@@ -149,7 +151,7 @@ export async function downloadStream(path) {
     const { Readable } = await import('stream');
     const url = `${baseUrl()}${path}`;
     const res = await fetch(url, {
-        headers: { 'Authorization': `Bearer ${await bearerToken()}` },
+        headers: { ...clientHeaders(), 'Authorization': `Bearer ${await bearerToken()}` },
     });
     if (!res.ok) {
         throw new ApiError(res.status, 'DOWNLOAD_ERROR', `Download failed: ${res.statusText}`);
@@ -199,7 +201,7 @@ export async function publicPost(path, body) {
     const url = `${baseUrl()}${path}`;
     const res = await fetch(url, {
         method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        headers: { ...clientHeaders(), 'Content-Type': 'application/json' },
         body: JSON.stringify(body),
     });
     if (!res.ok) {

package/dist/client-context.js

@@ -0,0 +1,63 @@
+import { readFileSync } from 'fs';
+import { resolve, dirname } from 'path';
+import { fileURLToPath } from 'url';
+function cliVersion() {
+    try {
+        const dir = dirname(fileURLToPath(import.meta.url));
+        const pkg = JSON.parse(readFileSync(resolve(dir, '../package.json'), 'utf-8'));
+        return typeof pkg.version === 'string' ? pkg.version : 'unknown';
+    }
+    catch {
+        return 'unknown';
+    }
+}
+function hasEnvPrefix(prefix) {
+    return Object.keys(process.env).some((k) => k.startsWith(prefix));
+}
+function isCi() {
+    const ci = (process.env.CI ?? '').toLowerCase();
+    return ci === '1' || ci === 'true' || !!process.env.GITHUB_ACTIONS;
+}
+/** Identify the coding harness from its env footprint. Order = specificity. Exported for tests. */
+export function detectHarness() {
+    // Claude Code is the most reliable: CLAUDECODE=1 plus a versioned exec path.
+    if (process.env.CLAUDECODE === '1' || process.env.CLAUDE_CODE_ENTRYPOINT) {
+        const version = process.env.CLAUDE_CODE_EXECPATH?.match(/versions\/([^/\\]+)/)?.[1];
+        return { harness: 'claude-code', harnessVersion: version, harnessSession: process.env.CLAUDE_CODE_SESSION_ID };
+    }
+    if (hasEnvPrefix('CODEX_'))
+        return { harness: 'codex' };
+    if (process.env.CURSOR_TRACE_ID || hasEnvPrefix('CURSOR_') || (process.env.TERM_PROGRAM ?? '').toLowerCase().includes('cursor')) {
+        return { harness: 'cursor' };
+    }
+    if (hasEnvPrefix('AIDER_'))
+        return { harness: 'aider' };
+    if (process.env.GEMINI_CLI)
+        return { harness: 'gemini' };
+    if (isCi())
+        return { harness: 'ci' };
+    return { harness: 'manual' };
+}
+let cached;
+export function clientContext() {
+    if (cached)
+        return cached;
+    cached = {
+        cli: cliVersion(),
+        ...detectHarness(),
+        node: process.versions.node,
+        os: process.platform,
+        arch: process.arch,
+        ci: isCi() || undefined,
+    };
+    return cached;
+}
+/** Headers to merge into every API request so the server can attribute the call. */
+export function clientHeaders() {
+    const ctx = clientContext();
+    return {
+        'User-Agent': `gipity-cli/${ctx.cli} (${ctx.os}; ${ctx.arch}; harness=${ctx.harness})`,
+        'X-Gipity-Client': JSON.stringify(ctx),
+    };
+}
+//# sourceMappingURL=client-context.js.map

package/dist/commands/add.js

@@ -7,6 +7,7 @@ import { requireConfig } from '../config.js';
 import { sync } from '../sync.js';
 import { success, muted, bold } from '../colors.js';
 import { run } from '../helpers/index.js';
+import { createProgressReporter, withSpinner } from '../progress.js';
 const STARTERS = [
     { key: 'web-vision-cam', hint: 'fullscreen camera app with on-device vision (MediaPipe)' },
     { key: 'object-spotter', hint: 'camera app that boxes, labels, and counts objects (YOLOX on-device)' },
@@ -198,9 +199,14 @@ export const addCommand = new Command('add')
             force: opts.force,
         };
     }
-    const res = await post(`/projects/${config.projectGuid}/add`, body);
+    // The server runs the whole install pipeline before responding; animate the
+    // wait, then clear the spinner so the installed-files list is the result.
+    const doAdd = () => post(`/projects/${config.projectGuid}/add`, body);
+    const res = opts.json
+        ? await doAdd()
+        : await withSpinner('Installing…', doAdd, { done: null });
     // Pull the created/installed files down to local.
-    const syncResult = await sync({ interactive: false });
+    const syncResult = await sync({ interactive: false, progress: opts.json ? undefined : createProgressReporter() });
     const data = res.data;
     if (opts.json) {
         console.log(JSON.stringify({ ...data, synced: syncResult.applied }));

package/dist/commands/chat.js

@@ -4,6 +4,7 @@ import { resolveProjectContext, saveConfig } from '../config.js';
 import { sync } from '../sync.js';
 import { error as clrError, muted, success } from '../colors.js';
 import { run, printList, printResult } from '../helpers/index.js';
+import { createProgressReporter, withSpinner } from '../progress.js';
 export const chatCommand = new Command('chat')
     .description('Send a message to your agent')
     .argument('<message>', 'Message to send')
@@ -19,7 +20,12 @@ export const chatCommand = new Command('chat')
         const body = useExisting
             ? { content: message, projectGuid: config.projectGuid }
             : { agentGuid: config.agentGuid, content: message, projectGuid: config.projectGuid };
-        const res = await post(endpoint, body);
+        // The agent can think for many seconds; animate the wait, then clear the
+        // spinner (done:null) so the reply itself is the result. JSON mode skips it.
+        const doChat = () => post(endpoint, body);
+        const res = opts.json
+            ? await doChat()
+            : await withSpinner('Thinking…', doChat, { done: null });
         // Save conversation guid for continuity. Skipped in one-off mode: the
         // config was resolved from the server's Home project and there is no
         // local `.gipity.json` to update - persisting here would create one in
@@ -31,7 +37,10 @@ export const chatCommand = new Command('chat')
         let syncSummary = '';
         let syncChanges = [];
         if (res.data.filesChanged) {
-            const syncResult = await sync({ interactive: false });
+            const syncResult = await sync({
+                interactive: false,
+                progress: opts.json ? undefined : createProgressReporter(),
+            });
             if (syncResult.applied > 0) {
                 syncSummary = `\nSynced ${syncResult.applied} change${syncResult.applied > 1 ? 's' : ''}:\n${syncResult.summary}`;
             }

package/dist/commands/claude.js

@@ -4,20 +4,8 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync, renameSync, readdir
 import { execSync, spawn } from 'child_process';
 import { homedir } from 'os';
 import { fileURLToPath } from 'url';
-/** On Windows, spawn without shell:true needs an explicit extension (.exe or .cmd) */
-function resolveCommand(cmd) {
-    if (process.platform !== 'win32')
-        return cmd;
-    try {
-        const lines = execSync(`where ${cmd}`, { encoding: 'utf-8' }).split(/\r?\n/).map(l => l.trim()).filter(Boolean);
-        // Prefer .exe (native) over .cmd (npm shim)
-        return lines.find(l => l.endsWith('.exe')) || lines.find(l => l.endsWith('.cmd')) || cmd;
-    }
-    catch {
-        return `${cmd}.cmd`;
-    }
-}
-import { getAuth, saveAuth } from '../auth.js';
+import { resolveCommand } from '../platform.js';
+import { getAuth, saveAuth, sessionExpired } from '../auth.js';
 import { get, post, publicPost, ApiError, getAccountSlug } from '../api.js';
 import { getConfig, saveConfigAt, clearConfigCache, getApiBaseOverride, DEFAULT_API_BASE, getConfigPath } from '../config.js';
 import { sync } from '../sync.js';
@@ -26,12 +14,35 @@ import { buildProjectContextBlock as buildProjectContextBlockText, buildNewProje
 import * as relayState from '../relay/state.js';
 import { maybeOfferRelayOn, ensureDaemonRunning } from '../relay/onboarding.js';
 import { prompt, pickOne, decodeJwtExp, confirm } from '../utils.js';
-import { brand, bold, info, success, error as clrError, muted } from '../colors.js';
+import { brand, bold, info, success, warning, error as clrError, muted } from '../colors.js';
 import { createProgressReporter } from '../progress.js';
 import { printBanner } from '../banner.js';
 import { scanForAdoption, isLikelyEmpty, canAdoptCwd, formatCwdLabel, formatBytes, adoptCurrentDir, ADOPT_THRESHOLDS, } from '../adopt-cwd.js';
 const __clDir = dirname(fileURLToPath(import.meta.url));
 const __clPkg = JSON.parse(readFileSync(resolve(__clDir, '../../package.json'), 'utf-8'));
+/** Report a sync run to the user. Beyond the applied-changes line, this SURFACES
+ *  sync.errors - a download that came back incomplete (truncated bulk tar, a file
+ *  that couldn't be refetched) lands here, so we never print "ready" over a
+ *  half-synced project as if nothing went wrong. Deletions are disarmed on an
+ *  incomplete pull, so we can tell the user plainly that nothing was deleted. */
+function reportSyncResult(result) {
+    if (result.aborted) {
+        console.log(`  ${warning('Merge cancelled — this folder was NOT synced with the project.')}`);
+        console.log(`  ${muted('For a clean copy, quit and open the project in an empty folder. To merge anyway, run `gipity sync`.')}`);
+        return;
+    }
+    if (result.applied > 0) {
+        console.log(`  Synced ${result.applied} change${result.applied > 1 ? 's' : ''} with Gipity.`);
+    }
+    if (result.errors.length) {
+        console.log(`  ${warning(`Sync finished with ${result.errors.length} problem${result.errors.length === 1 ? '' : 's'} — your local copy may be incomplete:`)}`);
+        for (const e of result.errors.slice(0, 8))
+            console.log(`    - ${e}`);
+        if (result.errors.length > 8)
+            console.log(`    …and ${result.errors.length - 8} more.`);
+        console.log(`  ${muted('Nothing was deleted. Re-run `gipity sync` to finish the pull.')}`);
+    }
+}
 import { getProjectsRoot } from '../relay/paths.js';
 /** Ask the server for recursive VFS counts. Server owns the file metadata
  *  (counts, bytes, paths), so a single aggregate query beats walking the
@@ -280,7 +291,15 @@ export const claudeCommand = new Command('claude')
         if (!nonInteractive) {
             printBanner({ version: __clPkg.version, email: auth?.email, cwd: process.cwd() });
         }
-        if (auth) {
+        if (auth && sessionExpired()) {
+            // The cached auth.json exists but its refresh token has lapsed, so the
+            // first API call below would 401 anyway. Re-login up front instead of
+            // printing "Logged in" and immediately contradicting it with "session
+            // expired" once the projects fetch fails.
+            console.log(`  ${muted('Your session expired. Let\'s sign you back in.')}\n`);
+            auth = await interactiveLogin();
+        }
+        else if (auth) {
             console.log(`  Logged in (${auth.email}).`);
         }
         else {
@@ -395,13 +414,11 @@ export const claudeCommand = new Command('claude')
             });
             console.log(`\n  Using ${projectDir}`);
             try {
-                const result = await sync({ interactive: !nonInteractive, progress: syncProgress });
-                if (result.applied > 0) {
-                    console.log(`  Synced ${result.applied} change${result.applied > 1 ? 's' : ''} with Gipity.`);
-                }
+                const result = await sync({ interactive: !nonInteractive, confirmMerge: !nonInteractive, progress: syncProgress });
+                reportSyncResult(result);
             }
-            catch {
-                console.log('  Could not sync files (will retry on next prompt).');
+            catch (err) {
+                console.log(`  ${warning('Could not sync files (will retry on next prompt):')} ${err.message}`);
             }
             setupClaudeHooks();
             setupClaudeMd();
@@ -445,13 +462,11 @@ export const claudeCommand = new Command('claude')
             }
             if (doSync) {
                 try {
-                    const result = await sync({ interactive: !nonInteractive, progress: syncProgress });
-                    if (result.applied > 0) {
-                        console.log(`  Synced ${result.applied} change${result.applied > 1 ? 's' : ''} with Gipity.`);
-                    }
+                    const result = await sync({ interactive: !nonInteractive, confirmMerge: !nonInteractive, progress: syncProgress });
+                    reportSyncResult(result);
                 }
-                catch {
-                    console.log('  Could not sync files (will retry on next prompt).');
+                catch (err) {
+                    console.log(`  ${warning('Could not sync files (will retry on next prompt):')} ${err.message}`);
                 }
             }
             // Interactive: no seeded prompt - CLAUDE.md carries the context now.
@@ -570,13 +585,11 @@ export const claudeCommand = new Command('claude')
                 console.log(`\n  Using ${projectDir}`);
                 // Unified sync - push and pull resolved via three-way merge (non-fatal)
                 try {
-                    const result = await sync({ interactive: !nonInteractive, progress: syncProgress });
-                    if (result.applied > 0) {
-                        console.log(`  Synced ${result.applied} change${result.applied > 1 ? 's' : ''} with Gipity.`);
-                    }
+                    const result = await sync({ interactive: !nonInteractive, confirmMerge: !nonInteractive, progress: syncProgress });
+                    reportSyncResult(result);
                 }
-                catch {
-                    console.log('  Could not sync files (will retry on next prompt).');
+                catch (err) {
+                    console.log(`  ${warning('Could not sync files (will retry on next prompt):')} ${err.message}`);
                 }
             }
             // Interactive launch: no seeded first message (new or existing). The

package/dist/commands/credits.js

@@ -1,15 +1,18 @@
 import { Command } from 'commander';
 import { spawn } from 'node:child_process';
 import { get } from '../api.js';
-import { brand, muted } from '../colors.js';
+import { brand, muted, success, error as clrError } from '../colors.js';
 import { run, printList } from '../helpers/index.js';
 const PRICING_URL = 'https://prompt.gipity.ai/pricing';
 function openInBrowser(url) {
-    const cmd = process.platform === 'darwin' ? 'open' :
-        process.platform === 'win32' ? 'start' :
-            'xdg-open';
+    // Windows `start` is a cmd.exe builtin, not an executable - spawn can't
+    // launch it directly, so go through `cmd /c start`. The empty "" is the
+    // window-title arg; without it a quoted URL would be swallowed as the title.
+    const [cmd, args] = process.platform === 'darwin' ? ['open', [url]] :
+        process.platform === 'win32' ? ['cmd', ['/c', 'start', '', url]] :
+            ['xdg-open', [url]];
     try {
-        spawn(cmd, [url], { stdio: 'ignore', detached: true }).unref();
+        spawn(cmd, args, { stdio: 'ignore', detached: true }).unref();
     }
     catch {
         // Spawn failed (no xdg-open on minimal Linux, etc.) - caller prints the URL.
@@ -19,17 +22,23 @@ export const creditsCommand = new Command('credits')
     .description('View credits')
     .option('--json', 'Output as JSON')
     .action((opts) => run('Credits', async () => {
-    const res = await get('/credits/balance');
     if (opts.json) {
+        const res = await get('/credits/balance');
         console.log(JSON.stringify(res.data));
+        return;
     }
-    else {
-        console.log(`Credits: ${brand(res.data.available.toLocaleString())}`);
-        if (res.data.balances.length > 0) {
-            for (const b of res.data.balances) {
-                const exp = new Date(b.expiresAt).toLocaleDateString();
-                console.log(`${b.source}: ${b.creditsRemaining.toLocaleString()}  ${muted(`expires ${exp}`)}`);
-            }
+    const [balRes, subRes] = await Promise.all([
+        get('/credits/balance'),
+        get('/credits/subscription'),
+    ]);
+    const sub = subRes.data;
+    const tierLabel = sub.tier === 'pro' ? 'Gipity Pro' : 'Free';
+    console.log(`Plan: ${brand(tierLabel)} ${muted(`(${sub.status})`)}`);
+    console.log(`Credits: ${brand(balRes.data.available.toLocaleString())}`);
+    if (balRes.data.balances.length > 0) {
+        for (const b of balRes.data.balances) {
+            const exp = new Date(b.expiresAt).toLocaleDateString();
+            console.log(`${b.source}: ${b.creditsRemaining.toLocaleString()}  ${muted(`expires ${exp}`)}`);
         }
     }
 }));
@@ -41,12 +50,42 @@ creditsCommand
     openInBrowser(PRICING_URL);
     console.log(muted("If your browser didn't open automatically, copy the URL above."));
 }));
+creditsCommand
+    .command('status')
+    .description('Show billing/Stripe configuration health (admin only)')
+    .option('--json', 'Output as JSON')
+    // optsWithGlobals(): the parent `credits` command also declares --json, which
+    // commander binds to the parent - so read merged opts to see the flag here.
+    .action((_opts, cmd) => run('Billing status', async () => {
+    const opts = cmd.optsWithGlobals();
+    const res = await get('/admin/billing-status');
+    const s = res.data;
+    if (opts.json) {
+        console.log(JSON.stringify(s));
+        return;
+    }
+    const mark = (ok) => (ok ? success('✓') : clrError('✗'));
+    console.log(`Stripe mode:     ${brand(s.mode)}`);
+    console.log(`Secret key:      ${mark(s.secretKeyConfigured)}`);
+    console.log(`Webhook secret:  ${mark(s.webhookSecretConfigured)}  ${muted(`endpoint ${s.webhookPath}`)}`);
+    console.log(`Credit packs:    ${mark(s.packsConfigured)}${s.packsError ? `  ${clrError(s.packsError)}` : ''}`);
+    for (const p of s.packs) {
+        console.log(`  ${p.name}  ${muted(p.priceId)}${p.hidden ? muted(' [hidden]') : ''}`);
+    }
+    console.log(`Test pack ($1):  ${mark(s.testPackConfigured)}  ${muted('set STRIPE_PACK_TEST_PRICE_ID to enable a cheap purchase smoke test')}`);
+    console.log('Subscription plans:');
+    for (const pl of s.subscriptionPlans) {
+        console.log(`  ${pl.name} (${pl.tier})  ${mark(pl.priceIdConfigured)}`);
+    }
+}));
 creditsCommand
     .command('usage')
     .description('Show recent usage')
     .option('--limit <n>', 'Number of entries', '20')
     .option('--json', 'Output as JSON')
-    .action((opts) => run('Usage', async () => {
+    // optsWithGlobals(): parent `credits` also declares --json (see status above).
+    .action((_opts, cmd) => run('Usage', async () => {
+    const opts = cmd.optsWithGlobals();
     const limit = parseInt(opts.limit, 10) || 20;
     const res = await get(`/credits/usage?limit=${limit}`);
     printList(res.data, opts, 'No usage history.', u => {

package/dist/commands/deploy.js

@@ -4,6 +4,7 @@ import { requireConfig } from '../config.js';
 import { formatSize } from '../utils.js';
 import { success, error as clrError, warning, muted, bold, brand } from '../colors.js';
 import { run, syncBeforeAction } from '../helpers/index.js';
+import { withSpinner } from '../progress.js';
 // ── Status icons ───────────────────────────────────────────────────────
 function statusIcon(status) {
     if (status === 'ok')
@@ -32,14 +33,16 @@ export const deployCommand = new Command('deploy')
     }
     const config = requireConfig();
     await syncBeforeAction(opts);
-    // Call server - pipeline runs entirely server-side
-    const res = await post(`/projects/${config.projectGuid}/deploy`, {
+    const doDeploy = () => post(`/projects/${config.projectGuid}/deploy`, {
         target,
         sourceDir: opts.sourceDir,
         optimize: opts.optimize,
         force: opts.force,
         only: opts.only?.split(',').map((s) => s.trim()),
     });
+    const res = opts.json
+        ? await doDeploy()
+        : await withSpinner(`Deploying to ${target}…`, doDeploy, { done: null });
     const d = res.data;
     if (opts.json) {
         console.log(JSON.stringify(d));

package/dist/commands/generate.js

@@ -4,7 +4,9 @@ import { resolveProjectContext, getConfigPath } from '../config.js';
 import { pushFile } from '../sync.js';
 import { writeFileSync } from 'fs';
 import { resolve as resolvePath, dirname, relative, isAbsolute } from 'path';
-import { error as clrError, success, muted, info } from '../colors.js';
+import { error as clrError, success, muted } from '../colors.js';
+import { printCommandError } from '../helpers/command.js';
+import { withSpinner } from '../progress.js';
 import { IMAGE_MODELS_DOC, IMAGE_GEMINI_ASPECT_RATIOS, IMAGE_GEMINI_SIZES, VIDEO_MODELS_DOC, TTS_PROVIDER_DESCRIPTIONS } from '../provider-docs.js';
 /** Download a URL and save to a local file, then push it up to the project so
  *  the cloud (and anything that mirrors it) immediately matches local disk.
@@ -72,7 +74,7 @@ Examples:
     .action(async (prompt, opts) => {
     try {
         const { config } = await resolveProjectContext();
-        const result = await post(`/projects/${config.projectGuid}/generate/image`, {
+        const doGenerate = () => post(`/projects/${config.projectGuid}/generate/image`, {
             prompt,
             provider: opts.provider,
             model: opts.model,
@@ -82,6 +84,9 @@ Examples:
             image_size: opts.imageSize,
             seed: Number.isFinite(opts.seed) ? opts.seed : undefined,
         });
+        const result = opts.json
+            ? await doGenerate()
+            : await withSpinner('Generating image…', doGenerate, { done: null });
         const ext = result.content_type.includes('png') ? 'png' : 'jpg';
         const filename = opts.output || `generated.${ext}`;
         const savedPath = await downloadFile(result.url, filename);
@@ -98,7 +103,7 @@ Examples:
         }
     }
     catch (err) {
-        console.error(clrError(`Image generation failed: ${err.message}`));
+        printCommandError('Image generation', err);
         process.exit(1);
     }
 });
@@ -130,14 +135,16 @@ Examples:
     .action(async (prompt, opts) => {
     try {
         const { config } = await resolveProjectContext();
-        if (!opts.json)
-            console.log(info('Generating video (this may take 30-120 seconds)...')); // keep --json stdout pure JSON
-        const result = await post(`/projects/${config.projectGuid}/generate/video`, {
+        const doGenerate = () => post(`/projects/${config.projectGuid}/generate/video`, {
             prompt,
             model: opts.model,
             aspect_ratio: opts.aspect,
             resolution: opts.resolution,
         });
+        // Veo runs 30-120s; the bouncing bar + timer keeps the wait honest.
+        const result = opts.json
+            ? await doGenerate()
+            : await withSpinner('Generating video…', doGenerate, { done: null });
         const filename = opts.output || 'generated.mp4';
         const savedPath = await downloadFile(result.url, filename);
         if (opts.json) {
@@ -150,7 +157,7 @@ Examples:
         }
     }
     catch (err) {
-        console.error(clrError(`Video generation failed: ${err.message}`));
+        printCommandError('Video generation', err);
         process.exit(1);
     }
 });
@@ -190,13 +197,16 @@ Examples:
                 process.exit(1);
             }
         }
-        const result = await post(`/projects/${config.projectGuid}/generate/speech`, {
+        const doGenerate = () => post(`/projects/${config.projectGuid}/generate/speech`, {
             text,
             provider: opts.provider,
             voice: opts.voice,
             language: opts.language,
             speakers,
         });
+        const result = opts.json
+            ? await doGenerate()
+            : await withSpinner('Generating speech…', doGenerate, { done: null });
         const filename = opts.output || 'speech.mp3';
         const savedPath = await downloadFile(result.url, filename);
         if (opts.json) {
@@ -209,7 +219,7 @@ Examples:
         }
     }
     catch (err) {
-        console.error(clrError(`Speech generation failed: ${err.message}`));
+        printCommandError('Speech generation', err);
         process.exit(1);
     }
 });
@@ -239,14 +249,15 @@ Examples:
     .action(async (prompt, opts) => {
     try {
         const { config } = await resolveProjectContext();
-        if (!opts.json)
-            console.log(info('Generating music...')); // keep --json stdout pure JSON
-        const result = await post(`/projects/${config.projectGuid}/generate/music`, {
+        const doGenerate = () => post(`/projects/${config.projectGuid}/generate/music`, {
             prompt,
             duration_seconds: opts.duration,
             model: opts.model,
             instrumental: !opts.vocals,
         });
+        const result = opts.json
+            ? await doGenerate()
+            : await withSpinner('Generating music…', doGenerate, { done: null });
         const filename = opts.output || 'music.mp3';
         const savedPath = await downloadFile(result.url, filename);
         if (opts.json) {
@@ -259,7 +270,7 @@ Examples:
         }
     }
     catch (err) {
-        console.error(clrError(`Music generation failed: ${err.message}`));
+        printCommandError('Music generation', err);
         process.exit(1);
     }
 });

package/dist/commands/page-screenshot.js

@@ -6,6 +6,7 @@ import { getProjectRoot } from '../config.js';
 import { brand, bold, muted, success } from '../colors.js';
 import { formatSize } from '../utils.js';
 import { run } from '../helpers/index.js';
+import { withSpinner } from '../progress.js';
 const DEVICE_PRESETS = {
     default: { width: 1280, height: 720 },
     desktop: { width: 1920, height: 1080 },
@@ -143,7 +144,13 @@ export const pageScreenshotCommand = new Command('screenshot')
         ...(opts.fakeMedia ? { fakeMedia: true } : {}),
         ...(opts.action ? { action: opts.action } : {}),
     };
-    const entries = await postForTarEntries('/tools/browser/screenshot', body);
+    // Load + render across viewports runs server-side and can take many
+    // seconds; animate the wait, then clear so the saved-files summary is the
+    // result. JSON mode skips the spinner (shares stdout).
+    const doShoot = () => postForTarEntries('/tools/browser/screenshot', body);
+    const entries = opts.json
+        ? await doShoot()
+        : await withSpinner('Capturing…', doShoot, { done: null });
     const metaEntry = entries.find((e) => e.name === 'meta.json');
     if (!metaEntry)
         throw new Error('Server response missing meta.json');

package/dist/commands/remove.js

@@ -5,6 +5,7 @@ import { sync } from '../sync.js';
 import { success, muted } from '../colors.js';
 import { run } from '../helpers/index.js';
 import { confirm } from '../utils.js';
+import { createProgressReporter, withSpinner } from '../progress.js';
 export const removeCommand = new Command('remove')
     .description('Remove an installed kit from the project (inverse of `gipity add <kit>`).')
     .argument('<kit>', 'Kit key/directory under src/packages/ to remove')
@@ -18,10 +19,13 @@ export const removeCommand = new Command('remove')
             return;
         }
     }
-    const res = await post(`/projects/${config.projectGuid}/remove`, { name: kit });
+    const doRemove = () => post(`/projects/${config.projectGuid}/remove`, { name: kit });
+    const res = opts.json
+        ? await doRemove()
+        : await withSpinner('Removing…', doRemove, { done: null });
     // Force the pull so the kit's deletions land locally without tripping the
     // bulk-deletion guard - the removal is an explicit, user-invoked action.
-    const syncResult = await sync({ interactive: false, force: true });
+    const syncResult = await sync({ interactive: false, force: true, progress: opts.json ? undefined : createProgressReporter() });
     const data = res.data;
     if (opts.json) {
         console.log(JSON.stringify({ ...data, synced: syncResult.applied }));