Merge pull request #578: fix(uploads): show the server's reason when a prompt upload fails

This commit is contained in:
Codeman maintainer committed 2026-10-10 02:53:26 +02:00
commit 33ad314bea
2 files changed
+15 -1

No files matched your search

+3 -1
View File
@@ -150,6 +150,7 @@ Object.assign(CodemanApp.prototype, {
const total = files.length; const total = files.length;
let done = 0; let done = 0;
let failed = 0; let failed = 0;
let failReason = ''; // first server reason, shown in the toast so a failure is not just a count
const results = new Array(total); // preserve selection order for insertion const results = new Array(total); // preserve selection order for insertion
const progress = () => const progress = () =>
this.showToast(`Uploading ${Math.min(done + 1, total)}/${total} image${total > 1 ? 's' : ''}…`, 'info'); this.showToast(`Uploading ${Math.min(done + 1, total)}/${total} image${total > 1 ? 's' : ''}…`, 'info');
@@ -173,6 +174,7 @@ Object.assign(CodemanApp.prototype, {
results[i] = await this._uploadPasteImage(sessionId, normalized); results[i] = await this._uploadPasteImage(sessionId, normalized);
} catch (err) { } catch (err) {
failed++; failed++;
if (!failReason && err && err.message) failReason = err.message;
console.warn('Image upload failed:', err); console.warn('Image upload failed:', err);
results[i] = null; results[i] = null;
} finally { } finally {
@@ -196,7 +198,7 @@ Object.assign(CodemanApp.prototype, {
// Final status: successes, plus any failures / cap so nothing is silent. // Final status: successes, plus any failures / cap so nothing is silent.
const parts = []; const parts = [];
if (paths.length > 0) parts.push(`${paths.length} image${paths.length > 1 ? 's' : ''} ready`); if (paths.length > 0) parts.push(`${paths.length} image${paths.length > 1 ? 's' : ''} ready`);
if (failed > 0) parts.push(`${failed} failed`); if (failed > 0) parts.push(failReason ? `${failed} failed: ${failReason}` : `${failed} failed`);
if (capped) parts.push(`max ${this._maxBatchImages} per batch`); if (capped) parts.push(`max ${this._maxBatchImages} per batch`);
const tone = paths.length > 0 ? (failed > 0 || capped ? 'info' : 'success') : 'error'; const tone = paths.length > 0 ? (failed > 0 || capped ? 'info' : 'success') : 'error';
this.showToast(parts.join(' · ') || 'No images uploaded', tone); this.showToast(parts.join(' · ') || 'No images uploaded', tone);
+12
View File
@@ -238,4 +238,16 @@ describe('image upload insertion policy', () => {
expect(app._uploadPasteImage).toHaveBeenCalledWith('session-b', { path: '/tmp/pane-b.png' }); expect(app._uploadPasteImage).toHaveBeenCalledWith('session-b', { path: '/tmp/pane-b.png' });
expect(app._sendInputAsync).toHaveBeenCalledWith('session-b', '/tmp/pane-b.png', { useMux: true }); expect(app._sendInputAsync).toHaveBeenCalledWith('session-b', '/tmp/pane-b.png', { useMux: true });
}); });
it('shows the server reason in the toast when an upload fails', async () => {
const app = loadImageInputApp();
const reason = 'Prompt uploads are not supported for remote (SSH) sessions';
app._uploadPasteImage = vi.fn(async () => {
throw new Error(reason);
});
await app._uploadAndInsertImages([{ path: '/tmp/shot.png' }]);
expect(app.showToast).toHaveBeenCalledWith(`1 failed: ${reason}`, 'error');
});
}); });