@rglabs/butterfly 1.0.4 → 1.2.0

package/dist/commands/sync-docs.d.ts

@@ -0,0 +1,3 @@
+declare const _default: () => Promise<void>;
+export default _default;
+//# sourceMappingURL=sync-docs.d.ts.map

package/dist/commands/sync-docs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-docs.d.ts","sourceRoot":"","sources":["../../src/commands/sync-docs.ts"],"names":[],"mappings":";AAEA,wBA4BE"}

package/dist/commands/sync-docs.js

@@ -0,0 +1,27 @@
+import { syncDocs } from '../utils/docs.js';
+export default async () => {
+    console.log('Syncing documentation and commands...');
+    const result = await syncDocs();
+    if (result.success) {
+        const docFiles = result.syncedFiles.filter(f => f.startsWith('docs/') || f === 'CLAUDE.md');
+        const commandFiles = result.syncedFiles.filter(f => f.startsWith('.claude/commands/'));
+        console.log(`\x1b[32m✓ Synced ${result.syncedFiles.length} file(s)\x1b[0m`);
+        if (docFiles.length > 0) {
+            console.log(`\n\x1b[36mDocumentation (${docFiles.length}):\x1b[0m`);
+            for (const file of docFiles) {
+                console.log(`  - ${file}`);
+            }
+        }
+        if (commandFiles.length > 0) {
+            console.log(`\n\x1b[36mSlash Commands (${commandFiles.length}):\x1b[0m`);
+            for (const file of commandFiles) {
+                console.log(`  - ${file}`);
+            }
+        }
+    }
+    else {
+        console.log(`\x1b[31m✗ Failed to sync: ${result.error}\x1b[0m`);
+        process.exit(1);
+    }
+};
+//# sourceMappingURL=sync-docs.js.map

package/dist/commands/sync-docs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-docs.js","sourceRoot":"","sources":["../../src/commands/sync-docs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,eAAe,KAAK,IAAI,EAAE;IACxB,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;IAErD,MAAM,MAAM,GAAG,MAAM,QAAQ,EAAE,CAAC;IAEhC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,CAAC;QAC5F,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAEvF,OAAO,CAAC,GAAG,CAAC,oBAAoB,MAAM,CAAC,WAAW,CAAC,MAAM,iBAAiB,CAAC,CAAC;QAE5E,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,4BAA4B,QAAQ,CAAC,MAAM,WAAW,CAAC,CAAC;YACpE,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,6BAA6B,YAAY,CAAC,MAAM,WAAW,CAAC,CAAC;YACzE,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,6BAA6B,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC;QAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC"}

package/dist/commands/translate.d.ts

@@ -0,0 +1,13 @@
+interface TranslateCommandOptions {
+    lang?: string;
+    langId?: string;
+    source?: string;
+    sourceId?: string;
+    text?: string;
+    file?: string;
+    format?: 'json' | 'table';
+    limit?: string;
+}
+export default function translateCommand(operation: string, options: TranslateCommandOptions): Promise<void>;
+export {};
+//# sourceMappingURL=translate.d.ts.map

package/dist/commands/translate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"translate.d.ts","sourceRoot":"","sources":["../../src/commands/translate.tsx"],"names":[],"mappings":"AAIA,UAAU,uBAAuB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA8bD,wBAA8B,gBAAgB,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAuCf"}

package/dist/commands/translate.js

@@ -0,0 +1,399 @@
+import { promises as fs } from 'fs';
+import { loadAuthConfig } from '../utils/auth.js';
+import { ButterflyAPI } from '../utils/api.js';
+async function getUntranslated(api, options) {
+    const languageId = await resolveLanguageId(api, options);
+    if (!languageId) {
+        console.error('ERROR: Language not found. Use --lang (iso_code) or --lang-id');
+        process.exit(1);
+    }
+    const limit = options.limit ? parseInt(options.limit, 10) : undefined;
+    const code = `
+{% set existing = db().from('bfy_translations').where('bfy_language_id', ${languageId}).column('bfy_translation_text_id') %}
+{% set untranslated = db().from('bfy_translation_texts').whereNotIn('id', existing)${limit ? `.limit(${limit})` : ''}.get() %}
+{{ untranslated|json_encode }}
+  `.trim();
+    const result = await api.executeCode(code);
+    if (!result.success) {
+        console.error(`ERROR: ${result.error || 'Failed to fetch untranslated texts'}`);
+        process.exit(1);
+    }
+    let untranslated = [];
+    try {
+        untranslated = JSON.parse(result.output || '[]');
+    }
+    catch {
+        console.error('ERROR: Failed to parse response');
+        process.exit(1);
+    }
+    if (untranslated.length === 0) {
+        console.log('All texts are translated for this language.');
+        process.exit(0);
+    }
+    if (options.format === 'table') {
+        console.log('\nUntranslated texts:\n');
+        console.log('ID\t| Source');
+        console.log('-'.repeat(60));
+        for (const text of untranslated) {
+            const truncated = text.source.length > 50 ? text.source.substring(0, 47) + '...' : text.source;
+            console.log(`${text.id}\t| ${truncated}`);
+        }
+        console.log(`\nTotal: ${untranslated.length} untranslated texts`);
+    }
+    else {
+        console.log(JSON.stringify(untranslated, null, 2));
+    }
+}
+async function addTranslation(api, options) {
+    if (!options.text) {
+        console.error('ERROR: --text is required for add operation');
+        process.exit(1);
+    }
+    const languageId = await resolveLanguageId(api, options);
+    if (!languageId) {
+        console.error('ERROR: Language not found. Use --lang (iso_code) or --lang-id');
+        process.exit(1);
+    }
+    const sourceTextId = await resolveSourceTextId(api, options);
+    if (!sourceTextId) {
+        console.error('ERROR: Source text not found. Use --source (text) or --source-id');
+        process.exit(1);
+    }
+    const checkCode = `
+{% set t = db().from('bfy_translations')
+  .where('bfy_language_id', ${languageId})
+  .where('bfy_translation_text_id', ${sourceTextId})
+  .first() %}
+{{ t ? t.id : 'null' }}
+  `.trim();
+    const checkResult = await api.executeCode(checkCode);
+    const existingId = checkResult.output && checkResult.output !== 'null'
+        ? parseInt(checkResult.output, 10)
+        : null;
+    if (existingId) {
+        const result = await api.performOperation('bfy_translations', 'edit', {
+            id: existingId,
+            text: options.text
+        });
+        if (result.success) {
+            console.log(`SUCCESS: Translation updated (ID: ${existingId})`);
+        }
+        else {
+            console.error(`ERROR: ${result.error || result.message || 'Failed to update translation'}`);
+            process.exit(1);
+        }
+    }
+    else {
+        const result = await api.performOperation('bfy_translations', 'add', {
+            bfy_language_id: languageId,
+            bfy_translation_text_id: sourceTextId,
+            text: options.text
+        });
+        if (result.success) {
+            console.log(`SUCCESS: Translation added (ID: ${result.id})`);
+        }
+        else {
+            console.error(`ERROR: ${result.error || result.message || 'Failed to add translation'}`);
+            process.exit(1);
+        }
+    }
+}
+function parseCSVLine(line) {
+    const fields = [];
+    let current = '';
+    let inQuotes = false;
+    for (let i = 0; i < line.length; i++) {
+        const char = line[i];
+        const nextChar = line[i + 1];
+        if (char === '"' && !inQuotes) {
+            inQuotes = true;
+        }
+        else if (char === '"' && inQuotes) {
+            if (nextChar === '"') {
+                current += '"';
+                i++;
+            }
+            else {
+                inQuotes = false;
+            }
+        }
+        else if (char === '\t' && !inQuotes) {
+            fields.push(current);
+            current = '';
+        }
+        else {
+            current += char;
+        }
+    }
+    fields.push(current);
+    return fields;
+}
+async function bulkTranslate(api, options) {
+    if (!options.file) {
+        console.error('ERROR: --file is required for bulk operation');
+        process.exit(1);
+    }
+    const languageId = await resolveLanguageId(api, options);
+    if (!languageId) {
+        console.error('ERROR: Language not found. Use --lang (iso_code) or --lang-id');
+        process.exit(1);
+    }
+    let translations;
+    try {
+        const fileContent = await fs.readFile(options.file, 'utf-8');
+        const lines = fileContent.split('\n').filter(line => line.trim() !== '');
+        if (lines.length === 0) {
+            console.error('ERROR: File is empty');
+            process.exit(1);
+        }
+        const firstLine = lines[0].toLowerCase();
+        const startIndex = (firstLine.includes('source') && firstLine.includes('text')) ? 1 : 0;
+        translations = [];
+        for (let i = startIndex; i < lines.length; i++) {
+            const fields = parseCSVLine(lines[i]);
+            if (fields.length < 2) {
+                console.error(`WARNING: Skipping line ${i + 1} - expected 2 columns (source, text), got ${fields.length}`);
+                continue;
+            }
+            const source = fields[0].trim();
+            const text = fields[1].trim();
+            if (source && text) {
+                translations.push({ source, text });
+            }
+        }
+    }
+    catch (error) {
+        console.error(`ERROR: Failed to read/parse file: ${error.message}`);
+        process.exit(1);
+    }
+    if (translations.length === 0) {
+        console.error('ERROR: No valid translations found in file');
+        process.exit(1);
+    }
+    console.log(`Processing ${translations.length} translations...`);
+    const sourcesCode = `
+{% set texts = db().from('bfy_translation_texts').get() %}
+{% set map = {} %}
+{% for t in texts %}
+  {% set map = map|merge({('s_' ~ t.id): t.source}) %}
+{% endfor %}
+{{ map|json_encode }}
+  `.trim();
+    const sourcesResult = await api.executeCode(sourcesCode);
+    let sourceTextMap = {};
+    try {
+        sourceTextMap = JSON.parse(sourcesResult.output || '{}');
+    }
+    catch {
+        console.error('ERROR: Failed to fetch source texts');
+        process.exit(1);
+    }
+    const sourceToId = {};
+    for (const [key, source] of Object.entries(sourceTextMap)) {
+        const id = parseInt(key.replace('s_', ''), 10);
+        sourceToId[source] = id;
+    }
+    const existingCode = `
+{% set t = db().from('bfy_translations').where('bfy_language_id', ${languageId}).get() %}
+{% set map = {} %}
+{% for tr in t %}
+  {% set map = map|merge({('t_' ~ tr.bfy_translation_text_id): tr.id}) %}
+{% endfor %}
+{{ map|json_encode }}
+  `.trim();
+    const existingResult = await api.executeCode(existingCode);
+    let existingMap = {};
+    try {
+        existingMap = JSON.parse(existingResult.output || '{}');
+    }
+    catch {
+        console.error('ERROR: Failed to fetch existing translations');
+        process.exit(1);
+    }
+    let added = 0;
+    let updated = 0;
+    let skipped = 0;
+    let errors = 0;
+    const missingSourceTexts = [];
+    for (const entry of translations) {
+        let sourceTextId;
+        if (entry.sourceId) {
+            sourceTextId = entry.sourceId;
+        }
+        else if (entry.source) {
+            sourceTextId = sourceToId[entry.source];
+        }
+        if (!sourceTextId) {
+            if (entry.source) {
+                const createResult = await api.performOperation('bfy_translation_texts', 'add', {
+                    source: entry.source
+                });
+                if (createResult.success && createResult.id) {
+                    sourceTextId = createResult.id;
+                    sourceToId[entry.source] = sourceTextId;
+                    console.log(`  Created source text: "${entry.source.substring(0, 30)}..." (ID: ${sourceTextId})`);
+                }
+                else {
+                    missingSourceTexts.push(entry.source);
+                    errors++;
+                    continue;
+                }
+            }
+            else {
+                skipped++;
+                continue;
+            }
+        }
+        const existingTranslationId = existingMap[`t_${sourceTextId}`];
+        if (existingTranslationId) {
+            const result = await api.performOperation('bfy_translations', 'edit', {
+                id: existingTranslationId,
+                text: entry.text
+            });
+            if (result.success) {
+                updated++;
+            }
+            else {
+                errors++;
+                console.error(`  ERROR updating translation for source ID ${sourceTextId}: ${result.error || result.message}`);
+            }
+        }
+        else {
+            const result = await api.performOperation('bfy_translations', 'add', {
+                bfy_language_id: languageId,
+                bfy_translation_text_id: sourceTextId,
+                text: entry.text
+            });
+            if (result.success) {
+                added++;
+                existingMap[`t_${sourceTextId}`] = result.id;
+            }
+            else {
+                errors++;
+                console.error(`  ERROR adding translation for source ID ${sourceTextId}: ${result.error || result.message}`);
+            }
+        }
+    }
+    console.log('\n--- Summary ---');
+    console.log(`Added: ${added}`);
+    console.log(`Updated: ${updated}`);
+    console.log(`Skipped: ${skipped}`);
+    console.log(`Errors: ${errors}`);
+    if (missingSourceTexts.length > 0) {
+        console.log(`\nMissing source texts that couldn't be created:`);
+        for (const text of missingSourceTexts.slice(0, 10)) {
+            console.log(`  - ${text.substring(0, 50)}...`);
+        }
+        if (missingSourceTexts.length > 10) {
+            console.log(`  ... and ${missingSourceTexts.length - 10} more`);
+        }
+    }
+    process.exit(errors > 0 ? 1 : 0);
+}
+async function listLanguages(api, options) {
+    const code = `
+{% set langs = db().from('bfy_languages').get() %}
+{% set result = [] %}
+{% for l in langs %}
+  {% set total = db().from('bfy_translation_texts').count() %}
+  {% set translated = db().from('bfy_translations').where('bfy_language_id', l.id).count() %}
+  {% set result = result|merge([{
+    "id": l.id,
+    "name": l.name,
+    "iso_code": l.iso_code,
+    "total": total,
+    "translated": translated,
+    "untranslated": total - translated
+  }]) %}
+{% endfor %}
+{{ result|json_encode }}
+  `.trim();
+    const result = await api.executeCode(code);
+    if (!result.success) {
+        console.error(`ERROR: ${result.error || 'Failed to fetch languages'}`);
+        process.exit(1);
+    }
+    let languages = [];
+    try {
+        languages = JSON.parse(result.output || '[]');
+    }
+    catch {
+        console.error('ERROR: Failed to parse response');
+        process.exit(1);
+    }
+    if (options.format === 'table' || !options.format) {
+        console.log('\nAvailable languages:\n');
+        console.log('ID\t| ISO\t| Name\t\t| Translated\t| Untranslated');
+        console.log('-'.repeat(70));
+        for (const lang of languages) {
+            const name = lang.name.padEnd(12);
+            console.log(`${lang.id}\t| ${lang.iso_code}\t| ${name}\t| ${lang.translated}/${lang.total}\t\t| ${lang.untranslated}`);
+        }
+    }
+    else {
+        console.log(JSON.stringify(languages, null, 2));
+    }
+}
+async function resolveLanguageId(api, options) {
+    if (options.langId) {
+        return parseInt(options.langId, 10);
+    }
+    if (options.lang) {
+        const code = `{% set l = db().from('bfy_languages').where('iso_code', '${options.lang}').first() %}{{ l ? l.id : 'null' }}`;
+        const result = await api.executeCode(code);
+        if (result.success && result.output && result.output !== 'null') {
+            return parseInt(result.output, 10);
+        }
+    }
+    return null;
+}
+async function resolveSourceTextId(api, options) {
+    if (options.sourceId) {
+        return parseInt(options.sourceId, 10);
+    }
+    if (options.source) {
+        const escapedSource = options.source.replace(/'/g, "\\'");
+        const code = `{% set t = db().from('bfy_translation_texts').where('source', '${escapedSource}').first() %}{{ t ? t.id : 'null' }}`;
+        const result = await api.executeCode(code);
+        if (result.success && result.output && result.output !== 'null') {
+            return parseInt(result.output, 10);
+        }
+    }
+    return null;
+}
+export default async function translateCommand(operation, options) {
+    try {
+        const validOperations = ['get-untranslated', 'add', 'bulk', 'languages'];
+        if (!validOperations.includes(operation)) {
+            console.error(`ERROR: Invalid operation: ${operation}`);
+            console.error(`Valid operations: ${validOperations.join(', ')}`);
+            process.exit(1);
+        }
+        const config = await loadAuthConfig();
+        if (!config) {
+            console.error('ERROR: No authentication configured. Run "butterfly-cli setup" first.');
+            process.exit(1);
+        }
+        const api = new ButterflyAPI(config);
+        await api.authenticate();
+        switch (operation) {
+            case 'get-untranslated':
+                await getUntranslated(api, options);
+                break;
+            case 'add':
+                await addTranslation(api, options);
+                break;
+            case 'bulk':
+                await bulkTranslate(api, options);
+                break;
+            case 'languages':
+                await listLanguages(api, options);
+                break;
+        }
+    }
+    catch (error) {
+        console.error(`ERROR: ${error.message}`);
+        process.exit(1);
+    }
+}
+//# sourceMappingURL=translate.js.map

package/dist/commands/translate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"translate.js","sourceRoot":"","sources":["../../src/commands/translate.tsx"],"names":[],"mappings":"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"}

package/dist/commands/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/commands/upload.tsx"],"names":[],"mappings":"yBA0KgB,SAAS,MAAM,EAAE;AAAjC,wBAEE"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/commands/upload.tsx"],"names":[],"mappings":"yBA4NgB,SAAS,MAAM,EAAE;AAAjC,wBAEE"}

package/dist/commands/upload.js

@@ -1,11 +1,23 @@
 import React, { useEffect, useState } from 'react';
 import { render, Box, Text } from 'ink';
-import { join, resolve } from 'path';
-import { readdir, stat } from 'fs/promises';
+import { join, resolve, basename, dirname } from 'path';
+import { readdir, stat, access } from 'fs/promises';
 import { loadAuthConfig } from '../utils/auth.js';
 import { ButterflyAPI } from '../utils/api.js';
 import { UploadProgress } from '../components/UploadProgress.js';
 import { UploadHandler } from '../utils/uploadHandler.js';
+async function isPartFolder(dirPath) {
+    const folderName = basename(dirPath);
+    const parentDir = dirname(dirPath);
+    const potentialContainerPath = join(parentDir, `${folderName}.bfy`);
+    try {
+        await access(potentialContainerPath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function getFilesFromFolder(folderPath) {
     const files = [];
     async function traverse(currentPath) {
@@ -13,9 +25,13 @@ async function getFilesFromFolder(folderPath) {
         for (const entry of entries) {
             const fullPath = join(currentPath, entry.name);
             if (entry.isDirectory()) {
-                if (!['node_modules', '.git', 'dist', 'build'].includes(entry.name)) {
-                    await traverse(fullPath);
+                if (['node_modules', '.git', 'dist', 'build'].includes(entry.name)) {
+                    continue;
+                }
+                if (await isPartFolder(fullPath)) {
+                    continue;
                 }
+                await traverse(fullPath);
             }
             else if (entry.isFile()) {
                 const supportedExtensions = ['.json', '.bfy', '.yaml', '.yml', '.js', '.css'];
@@ -35,8 +51,9 @@ async function getFilesFromFolder(folderPath) {
 const UploadCommand = ({ targets }) => {
     const [status, setStatus] = useState('loading');
     const [error, setError] = useState('');
-    const [progress, setProgress] = useState({ current: 0, total: 0 });
+    const [progress, setProgress] = useState({ current: 0, total: 0, succeeded: 0, failed: 0 });
     const [currentFile, setCurrentFile] = useState('');
+    const [uploadErrors, setUploadErrors] = useState([]);
     useEffect(() => {
         const upload = async () => {
             try {
@@ -70,30 +87,35 @@ const UploadCommand = ({ targets }) => {
                         throw new Error(`Failed to process ${target}: ${err instanceof Error ? err.message : 'Unknown error'}`);
                     }
                 }
-                setProgress({ current: 0, total: allFiles.length });
-                const uploadHandler = new UploadHandler(api, {
-                    onProgress: (message, type) => {
-                        if (type === 'error') {
-                            console.error(message);
-                        }
-                    }
-                });
+                setProgress({ current: 0, total: allFiles.length, succeeded: 0, failed: 0 });
+                const uploadHandler = new UploadHandler(api);
+                let succeeded = 0;
+                let failed = 0;
+                const errors = [];
                 for (let i = 0; i < allFiles.length; i++) {
                     const file = allFiles[i];
                     setCurrentFile(file.path.split('/').pop() || file.path);
                     try {
                         const result = await uploadHandler.uploadFile(file.path);
                         if (!result.success) {
-                            console.error(`Failed to upload ${file.path}:`, result.message);
+                            errors.push({ file: file.path, message: result.message });
+                            failed++;
+                        }
+                        else {
+                            succeeded++;
                         }
-                        setProgress({ current: i + 1, total: allFiles.length });
+                        setProgress({ current: i + 1, total: allFiles.length, succeeded, failed });
                     }
                     catch (err) {
-                        console.error(`Failed to upload ${file.path}:`, err);
+                        const errMsg = err instanceof Error ? err.message : String(err);
+                        errors.push({ file: file.path, message: errMsg });
+                        failed++;
+                        setProgress({ current: i + 1, total: allFiles.length, succeeded, failed });
                     }
                 }
+                setUploadErrors(errors);
                 setStatus('complete');
-                setTimeout(() => process.exit(0), 2000);
+                setTimeout(() => process.exit(failed > 0 ? 1 : 0), 2000);
             }
             catch (err) {
                 setError(err instanceof Error ? err.message : 'Unknown error');
@@ -104,9 +126,19 @@ const UploadCommand = ({ targets }) => {
         upload();
     }, [targets]);
     return (React.createElement(Box, { flexDirection: "column" },
-        status === 'loading' && React.createElement(Text, { color: "yellow" }, "Loading configuration..."),
-        status === 'uploading' && (React.createElement(UploadProgress, { current: progress.current, total: progress.total, currentFile: currentFile, status: "uploading" })),
-        status === 'complete' && (React.createElement(UploadProgress, { current: progress.total, total: progress.total, currentFile: "", status: "complete" })),
+        status === 'loading' && React.createElement(Text, { color: "gray" }, "..."),
+        status === 'uploading' && (React.createElement(UploadProgress, { current: progress.current, total: progress.total, currentFile: currentFile, status: "uploading", succeeded: progress.succeeded, failed: progress.failed })),
+        status === 'complete' && (React.createElement(React.Fragment, null,
+            React.createElement(UploadProgress, { current: progress.total, total: progress.total, currentFile: "", status: "complete", succeeded: progress.succeeded, failed: progress.failed }),
+            uploadErrors.length > 0 && (React.createElement(Box, { flexDirection: "column", marginTop: 1 },
+                React.createElement(Text, { color: "red", bold: true }, "Failed uploads:"),
+                uploadErrors.map((err, idx) => (React.createElement(Box, { key: idx, flexDirection: "column", marginLeft: 1, marginTop: 1 },
+                    React.createElement(Text, { color: "yellow" },
+                        "\u2022 ",
+                        err.file),
+                    React.createElement(Text, { color: "gray", dimColor: true },
+                        "  ",
+                        err.message)))))))),
         status === 'error' && (React.createElement(UploadProgress, { current: 0, total: 0, currentFile: "", status: "error", error: error }))));
 };
 export default (targets) => {

package/dist/commands/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/commands/upload.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/commands/upload.tsx"],"names":[],"mappings":"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"}

package/dist/components/ConflictResolver.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import { ResourceDiff } from '../diff/types.js';
+export type ResolveAction = 'keep_local' | 'take_remote' | 'skip';
+interface ConflictResolverProps {
+    diff: ResourceDiff;
+    onResolve: (action: ResolveAction) => void;
+    onShowDetails?: () => void;
+    isApplying?: boolean;
+}
+export declare const ConflictResolver: React.FC<ConflictResolverProps>;
+export default ConflictResolver;
+//# sourceMappingURL=ConflictResolver.d.ts.map