Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): 断开时带图消息写等待、真实上传失败时标出那张图
zqchris53f822b85f1c
diff --git a/apps/mobile/src/__tests__/pendingSendItems.test.ts b/apps/mobile/src/__tests__/pendingSendItems.test.tsindex 3bfe5fe5db..c893b354c1 100644--- a/apps/mobile/src/__tests__/pendingSendItems.test.ts+++ b/apps/mobile/src/__tests__/pendingSendItems.test.ts@@ -350,18 +350,20 @@ describe('buildPendingSendItems', () => {expect(items[2].actions).toBeNull();});- it('holds a ready local send as waiting while disconnected, but keeps uploads and failures as they are', () => {+ it('holds local sends as waiting while disconnected, including unfinished uploads, but keeps failures', () => {const [ready, uploading, failed] = build({outboxWaitingFor: 'computer',outbox: [outboxItem('ready'),- outboxItem('uploading', { attachmentCount: 1, uploadedCount: 0 }),+ outboxItem('uploading', { attachmentCount: 1, uploadedCount: 0, thumbnails: [{ key: 'uploading-slot-0', uri: 'file:///a.jpg', ossRef: null, uploading: true }] }),outboxItem('failed', { failed: true }),],});expect(ready).toMatchObject({ phase: 'waiting', waitingFor: 'computer' });expect(isPendingSendItemSelected(ready, 'ready')).toBe(true);- expect(uploading.phase).toBe('uploading');+ // 断开时附件上传也停着:写等待,图片不转圈。+ expect(uploading).toMatchObject({ phase: 'waiting', waitingFor: 'computer' });+ expect(uploading.thumbs.every((thumb) => !thumb.uploading)).toBe(true);expect(failed.phase).toBe('failed');expect(build({ outbox: [outboxItem('ready')] })[0].phase).toBe('sending');});diff --git a/apps/mobile/src/__tests__/sessionOutbox.test.ts b/apps/mobile/src/__tests__/sessionOutbox.test.tsindex dfaeebe540..5b3b8020ed 100644--- a/apps/mobile/src/__tests__/sessionOutbox.test.ts+++ b/apps/mobile/src/__tests__/sessionOutbox.test.ts@@ -475,18 +475,25 @@ describe('outboxDisplayItem', () => {expect(enqueueFailed.errorText).toBe('RPC boom');});- it('只把没传上去的那张图标成失败,其余图与上传中的图不受影响', () => {- const item = outboxItemWithUploadFailure(buildOutboxItem({- clientId: 'c-1', sessionId: 's-1', text: 'hi', permissionModeAtSend: 'ask', readyAttachments: [],+ it('发件箱整条上传失败时,只在没传上去的那张图上标失败,其后未开始的图不再转圈', () => {+ // 与 durableOutboxDisplayItem 的真实输出同形:失败只记在整条 phase / enqueueError 上,failedIds 为空。+ const item = { ...buildOutboxItem({+ clientId: 'c-1', sessionId: 's-1', text: 'hi', permissionModeAtSend: 'ask', readyAttachments: [attachmentFor('ok.jpg')],+ readyPreviews: ['file:///tmp/ok.jpg'],claimedUploads: [{ localId: 'u-a', failed: false, kind: 'image', previewUri: 'file:///tmp/a.jpg' },{ localId: 'u-b', failed: false, kind: 'image', previewUri: 'file:///tmp/b.jpg' },],- }), 'u-b');- expect(outboxDisplayItem(item).thumbnails).toEqual([- { key: 'c-1-slot-0', uri: 'file:///tmp/a.jpg', ossRef: null, uploading: true },- { key: 'c-1-slot-1', uri: 'file:///tmp/b.jpg', ossRef: null, uploading: false, failed: true },+ }), phase: 'failed' as const, enqueueError: 'upload failed' };+ expect(item.failedIds).toEqual([]);+ expect(outboxDisplayItem(item).thumbnails.map(({ key, uploading, failed }) => ({ key, uploading, failed }))).toEqual([+ { key: 'c-1-slot-0', uploading: false, failed: undefined },+ { key: 'c-1-slot-1', uploading: false, failed: true },+ { key: 'c-1-slot-2', uploading: false, failed: undefined },]);+ // 入队失败(附件都已落定)不标任何图片。+ const enqueueFailed = { ...itemWith(), phase: 'failed' as const, enqueueError: 'RPC boom' };+ expect(outboxDisplayItem(enqueueFailed).thumbnails.some((thumb) => thumb.failed)).toBe(false);});it('图片槽出缩略格(本地预览 / 落定 ossRef / 上传中态),文件槽走计数行', () => {diff --git a/apps/mobile/src/session/pendingSendItems.ts b/apps/mobile/src/session/pendingSendItems.tsindex b733c0a237..0cdc77a102 100644--- a/apps/mobile/src/session/pendingSendItems.ts+++ b/apps/mobile/src/session/pendingSendItems.ts@@ -449,18 +449,18 @@ export function buildPendingSendItems(input: BuildPendingSendItemsInput): Mobileif (seen.has(item.clientId) || input.hiddenClientIds.has(item.clientId)) continue;seen.add(item.clientId);const uploadsPending = item.attachmentCount > 0 && item.uploadedCount < item.attachmentCount;- // 上传走云端,不依赖电脑:传完了才进入「等连上」。- const waitingFor = !item.failed && !uploadsPending ? input.outboxWaitingFor ?? null : null;+ // 断开时整条投递(含附件上传)都停着:附件没传完也写「等连上」,图片不再转圈。+ const waitingFor = !item.failed ? input.outboxWaitingFor ?? null : null;items.push({type: 'pending_send',key: pendingSendItemKey(item.clientId),clientId: item.clientId,text: item.quotesEncoded ? stripChatQuoteMarkerLines(item.text) : item.text,sentInlineTokens: buildPendingSentInlineTokens(item),- phase: item.failed ? 'failed' : uploadsPending ? 'uploading' : waitingFor ? 'waiting' : 'sending',+ phase: item.failed ? 'failed' : waitingFor ? 'waiting' : uploadsPending ? 'uploading' : 'sending',...(waitingFor ? { waitingFor } : {}),queueIndex: null,- thumbs: item.thumbnails,+ thumbs: waitingFor ? item.thumbnails.map((thumb) => ({ ...thumb, uploading: false })) : item.thumbnails,fileCount: item.fileCount,fileNames: item.fileNames,attachmentCount: item.attachmentCount,diff --git a/apps/mobile/src/session/sessionOutbox.ts b/apps/mobile/src/session/sessionOutbox.tsindex 14bdee3ad6..a885a54a26 100644--- a/apps/mobile/src/session/sessionOutbox.ts+++ b/apps/mobile/src/session/sessionOutbox.ts@@ -469,6 +469,13 @@ export function outboxDisplayItem(item: MobileOutboxItem): MobileOutboxDisplayItlet fileCount = 0;const fileNames: string[] = [];const failedSlots = new Set(item.failedIds.map((localId) => item.slotByLocalId[localId]));+ // 发件箱按槽序逐个上传、遇错即停,失败只记在整条上:还没落定的第一个槽就是没传上去的那个,+ // 其后的槽还没开始传。失败后没有槽在上传。+ const failed = item.phase === 'failed';+ if (failed && failedSlots.size === 0) {+ const firstMissing = item.attachmentSlots.findIndex((slot) => slot === null);+ if (firstMissing >= 0) failedSlots.add(firstMissing);+ }item.attachmentSlots.forEach((slot, index) => {const meta = item.slotMeta[index];if (meta?.kind !== 'image') {@@ -480,7 +487,7 @@ export function outboxDisplayItem(item: MobileOutboxItem): MobileOutboxDisplayItkey: `${item.clientId}-slot-${index}`,uri: meta.previewUri,ossRef: slot ? (slot.url ?? slot.path) : null,- uploading: slot === null && !failedSlots.has(index),+ uploading: slot === null && !failed,...(slot === null && failedSlots.has(index) ? { failed: true } : {}),});});