Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): 同步删除恢复草稿中的文字和附件
Dash3442e5ea3948
diff --git a/apps/mobile/app/sessions/new.tsx b/apps/mobile/app/sessions/new.tsxindex 1a6c274c00..170f9e1f94 100644--- a/apps/mobile/app/sessions/new.tsx+++ b/apps/mobile/app/sessions/new.tsx@@ -855,10 +855,11 @@ export default function NewRemoteSessionScreen() {router.replace('/devices');return true;}, [router]);- useNewSessionDurableEdit({+ const { edit: editRecoveredDraft, flush: flushRecoveredDraft } = useNewSessionDurableEdit({sessionId: String(params.recoverySessionId ?? ''), deviceId: routeDeviceId, owner: outboxOwner,leaveForeignRecovery: leaveForeignOutboxRecovery,onError: error => setError(formatRemoteError(error)),+ onEdited: record => { outboxRecoveryRef.current = record; },onRestore: record => {outboxRecoveryRef.current = record;userTouchedDeviceRef.current = true;@@ -2179,10 +2180,11 @@ export default function NewRemoteSessionScreen() {const patchDraft = useCallback((patch: Partial<NewSessionDraft>) => {if (patch.firstMessage !== undefined) {firstMessageRef.current = patch.firstMessage;+ if (!creatingRef.current) editRecoveredDraft({ firstMessage: patch.firstMessage });voiceDictionaryLearningTrackerRef.current?.inspectDraft(patch.firstMessage);}setDraft((current) => ({ ...current, ...patch }));- }, []);+ }, [editRecoveredDraft]);const openPluginPalette = useCallback(() => {const next = composerDocumentProjectedText(appendComposerPluginTrigger(textComposerDocument(firstMessageRef.current)));@@ -2210,9 +2212,10 @@ export default function NewRemoteSessionScreen() {const setFirstMessageDraft = useCallback((next: SetStateAction<string>) => {const value = typeof next === 'function' ? next(firstMessageRef.current) : next;firstMessageRef.current = value;+ if (!creatingRef.current) editRecoveredDraft({ firstMessage: value });setDraft((current) => ({ ...current, firstMessage: value }));voiceDictionaryLearningTrackerRef.current?.inspectDraft(value);- }, []);+ }, [editRecoveredDraft]);const handleFirstMessageInputContentSizeChange = useCallback((event: TextInputContentSizeChangeEvent) => {const nextHeight = Math.max(@@ -4502,6 +4505,7 @@ export default function NewRemoteSessionScreen() {}, [setFirstMessageDraft]);const removeAttachment = useCallback((id: string) => {+ if (!creatingRef.current) editRecoveredDraft({ removeAttachmentId: id });// 已上传中转区的对象移除时 best-effort 回收,避免未发送附件在 OSS 留孤儿(同会话页)。const removed = attachments.find((item) => item.id === id);if (removed) discardMobileUploadedAttachment(removed, { getToken: () => auth.getAccessToken() });@@ -4524,7 +4528,7 @@ export default function NewRemoteSessionScreen() {// 标注附件退场时同步清「矢量笔迹 + 原图副本」的再编辑真相。composerAnnotationsRef.current?.forgetAttachment(id);releaseUploadedSources([id]);- }, [attachments, auth]);+ }, [attachments, auth, editRecoveredDraft]);// 圈点标注(托盘再编辑)与附件管线的接线(新建会话页无聊天场景,chat 配置不用)。const composerAnnotations = useComposerImageAnnotations({@@ -4789,6 +4793,10 @@ export default function NewRemoteSessionScreen() {const deviceAtCreate = selectedDeviceId;if (selectedDeviceRef.current !== deviceAtCreate) return;const ensureDeviceAlive = (): boolean => selectedDeviceRef.current === deviceAtCreate;+ // A full submission below saves the current form again, so an earlier+ // incremental write failure must not permanently block another attempt.+ await flushRecoveredDraft().catch(() => undefined);+ if (!isCurrentOwner() || !ensureDeviceAlive()) return;if (voiceRecordingActiveRef.current || voiceState === 'listening') {const latestDraftText = await finishVoiceRecording();if (!isCurrentOwner()) return;@@ -5369,6 +5377,7 @@ export default function NewRemoteSessionScreen() {draft,remoteAgentPick,finishVoiceRecording,+ flushRecoveredDraft,leaveForeignOutboxRecovery,getPresenceAvailability,maker,diff --git a/apps/mobile/src/__tests__/newSessionCreationPersistence.test.ts b/apps/mobile/src/__tests__/newSessionCreationPersistence.test.tsindex f062eade7a..027227dabe 100644--- a/apps/mobile/src/__tests__/newSessionCreationPersistence.test.ts+++ b/apps/mobile/src/__tests__/newSessionCreationPersistence.test.ts@@ -9,7 +9,7 @@ import type { MobileLocalAttachmentUploadCandidate } from '../session/mobileLocaimport { retainOutboxFile, durableOutboxUploadUri, removeRetainedOutboxFiles } from '../session/durableOutboxFiles';import { cancelledCreationDraft, outboxCreationRetryIdentity } from '../session/cancelledCreationDraft';import { buildOutboxItem } from '../session/sessionOutbox';-import { persistNewSessionCreationDraft } from '../session/persistNewSessionCreationDraft';+import { persistNewSessionCreationDraft, persistNewSessionDraftEdit } from '../session/persistNewSessionCreationDraft';import { returnNewSessionToEdit } from '../session/returnNewSessionToEdit';import { mergeNewSessionEditFollowUps } from '../session/mergeNewSessionEditFollowUps';import { createDurableOutboxDelivery } from '../session/durableOutboxDelivery';@@ -430,6 +430,103 @@ async function saveDraftFixture() {}))!;}+// Unit regression for manual edits after recovery (2026-10-17): the old form+// changed only React state, so reopening restored deleted text and attachments.+// Real store + production edit entry cover persistence and ordered writes here;+// the React hook suite covers the form handoff, which prior removal tests miss.+it('persists rapid partial deletion and attachment removal before resubmit and cold recovery', async () => {+ const original = await saveDraftFixture();+ const saved = await mobileDurableOutbox.update(original, cancelledCreationDraft(original));+ const leave = completeNewSessionDurableEdit(saved.item.sessionId, 'pc')!;+ await Promise.all([+ persistNewSessionDraftEdit(saved, { firstMessage: 'keep my' }),+ persistNewSessionDraftEdit(saved, { removeAttachmentId: 'photo' }),+ persistNewSessionDraftEdit(saved, { firstMessage: 'keep' }),+ ]);+ leave();+ await mobileDurableOutbox.activate('');+ await mobileDurableOutbox.activate(getMobileAuthOwner().accountKey);+ const recovered = findNewSessionEditDraft('pc')!;+ expect(recovered.creation?.draft.firstMessage).toBe('keep');+ expect(recovered.item.text).toBe('keep');+ expect(recovered.item.attachmentSlots).toEqual([]);+ expect(recovered.item.slotMeta).toEqual([]);+ expect(recovered.uploads).toEqual([]);+ expect(files.retained.size).toBe(0);+ const submitted = await persistNewSessionCreationDraft({ record: recovered, recovering: recovered,+ getUploadedSource: () => undefined, isCurrent: () => true });+ expect(submitted?.item.text).toBe('keep');+ expect(submitted?.uploads).toEqual([]);+});++it('removes one recovered attachment while preserving the remaining bytes and upload slot on resubmit', async () => {+ const original = await saveDraftFixture();+ const first = await mobileDurableOutbox.update(original, cancelledCreationDraft(original));+ await saveFollowUpFixture(first);+ const merged = (await mergeNewSessionEditFollowUps(first.item.sessionId, 'pc'))!;+ const deletedUri = durableOutboxUploadUri(merged, merged.uploads[0]);+ const keptUri = durableOutboxUploadUri(merged, merged.uploads[1]);+ const edited = (await persistNewSessionDraftEdit(merged, { removeAttachmentId: 'photo' }))!;+ expect(edited.item.attachmentSlots.map(a => a?.id)).toEqual(['second-photo']);+ expect(edited.uploads[0].slot).toBe(0);+ expect(files.retained.has(deletedUri)).toBe(false);+ expect(files.retained.has(keptUri)).toBe(true);+ const resent = (await persistNewSessionCreationDraft({ record: edited, recovering: edited,+ getUploadedSource: () => undefined, isCurrent: () => true }))!;+ expect(resent.uploads).toHaveLength(1);+ expect(files.retained.get(durableOutboxUploadUri(resent, resent.uploads[0]))).toBe(keptUri);+});++it.each(['text-first', 'attachment-first'] as const)('clearing recovered input deletes the record, including late edits and cold reload: %s', async order => {+ const original = await saveDraftFixture();+ const saved = await mobileDurableOutbox.update(original, cancelledCreationDraft(original));+ const leave = completeNewSessionDurableEdit(saved.item.sessionId, 'pc')!;+ const changes = [{ firstMessage: '' }, { removeAttachmentId: 'photo' }];+ if (order === 'attachment-first') changes.reverse();+ await Promise.all(changes.map(change => persistNewSessionDraftEdit(saved, change)));+ expect(await persistNewSessionDraftEdit(saved, { firstMessage: 'late edit' })).toBeNull();+ leave();+ await mobileDurableOutbox.activate('');+ await mobileDurableOutbox.activate(getMobileAuthOwner().accountKey);+ expect(mobileDurableOutbox.getSnapshot()).toEqual([]);+ expect(disk.data.size).toBe(0);+ expect(files.retained.size).toBe(0);+ expect(findNewSessionEditDraft('pc')).toBeUndefined();+ expect(getNewSessionCreationTask(saved.item.sessionId)).toBeNull();+});++it.each(['save', 'remove'] as const)('reports failed draft %s without deleting still-owned bytes', async failure => {+ const original = await saveDraftFixture();+ const saved = await mobileDurableOutbox.update(original, cancelledCreationDraft(original));+ const empty = await persistNewSessionDraftEdit(saved, { firstMessage: '' });+ disk.fail = failure === 'save';+ disk.failRemove = failure === 'remove';+ await expect(persistNewSessionDraftEdit(empty!, failure === 'save'+ ? { firstMessage: 'changed' } : { removeAttachmentId: 'photo' })).rejects.toThrow('unavailable');+ expect(mobileDurableOutbox.getSnapshot()[0]).toBe(empty);+ expect(files.retained.size).toBe(1);+ disk.fail = false;+ disk.failRemove = false;+ const submitted = await persistNewSessionCreationDraft({ recovering: empty,+ record: { ...empty!, creation: { ...empty!.creation!, draft: { ...empty!.creation!.draft, firstMessage: 'current form' } },+ item: { ...empty!.item, text: 'current form', attachmentSlots: [], slotMeta: [] } },+ getUploadedSource: () => undefined, isCurrent: () => true });+ expect(submitted?.item.text).toBe('current form');+ expect(submitted?.uploads).toEqual([]);+});++it.each(['account', 'deleted', 'handed-off'] as const)('does not edit or recreate records after %s', async change => {+ const original = await saveDraftFixture();+ const saved = await mobileDurableOutbox.update(original, cancelledCreationDraft(original));+ if (change === 'deleted') await mobileDurableOutbox.remove(saved);+ if (change === 'handed-off') await mobileDurableOutbox.update(saved, { suspended: false, state: 'queued' });+ const pending = persistNewSessionDraftEdit(saved, { firstMessage: '' });+ if (change === 'account') setMobileAuthOwner('bob');+ if (change === 'deleted') await expect(pending).resolves.toBeNull();+ else await expect(pending).rejects.toThrow(change === 'account' ? 'OUTBOX_OWNER_CHANGED' : 'OUTBOX_STALE_WRITE');+ expect(mobileDurableOutbox.getSnapshot()[0]?.item.text).toBe(change === 'deleted' ? undefined : saved.item.text);+});+it.each(['deleted', 'archived'])('retires saved recovery on %s, including editor release and cold reload', async status => {const original = await saveDraftFixture();const saved = await mobileDurableOutbox.update(original, cancelledCreationDraft(original));@@ -649,6 +746,17 @@ it.each([false, true])('recovers sent follow-ups before composer input, retainin]);});+it.each([false, true])('preserves literal quote markers unless the follow-up encodes product quotes: %s', async quotesEncoded => {+ const original = await saveDraftFixture();+ const first = await mobileDurableOutbox.update(original, cancelledCreationDraft(original));+ const followUp = await saveFollowUpFixture(first);+ const text = '> <!-- cindy-composer-quote -->\n> quoted text\n\nreply';+ await mobileDurableOutbox.update(followUp, { item: { ...followUp.item, text, quotesEncoded } });+ const restored = await mergeNewSessionEditFollowUps(first.item.sessionId, 'pc');+ expect(restored?.creation?.draft.firstMessage).toBe(first.creation!.draft.firstMessage + '\n\n'+ + (quotesEncoded ? '> quoted text\n\nreply' : text));+});+it('finishes interrupted source removal after reload without duplicating merged content', async () => {const original = await saveDraftFixture();const first = await mobileDurableOutbox.update(original, cancelledCreationDraft(original));diff --git a/apps/mobile/src/__tests__/useNewSessionDraftRecovery.test.tsx b/apps/mobile/src/__tests__/useNewSessionDraftRecovery.test.tsxindex 74da5a8ddc..27595ebd3f 100644--- a/apps/mobile/src/__tests__/useNewSessionDraftRecovery.test.tsx+++ b/apps/mobile/src/__tests__/useNewSessionDraftRecovery.test.tsx@@ -9,6 +9,7 @@ import { useAutoResumeNewSessionDraft, useNewSessionDurableEdit } from '@/sessioconst outbox = vi.hoisted(() => ({records: [] as DurableOutboxRecord[], listeners: new Set<() => void>(),ready: vi.fn(), claim: vi.fn(), release: vi.fn(), find: vi.fn(), merge: vi.fn(),+ saveEdit: vi.fn(),}));vi.mock('@/session/mobileDurableOutbox', () => ({getCurrentMobileOutboxRecords: () => outbox.records,@@ -25,16 +26,19 @@ vi.mock('@/session/newSessionCreation', () => ({findNewSessionEditDraft: outbox.find,}));vi.mock('@/session/mergeNewSessionEditFollowUps', () => ({ mergeNewSessionEditFollowUps: outbox.merge }));+vi.mock('@/session/persistNewSessionCreationDraft', () => ({ persistNewSessionDraftEdit: outbox.saveEdit }));type EditProps = Omit<Parameters<typeof useNewSessionDurableEdit>[0], 'onRestore'>;type ResumeProps = Omit<Parameters<typeof useAutoResumeNewSessionDraft>[0], 'onResume'>;+let editorActions: ReturnType<typeof useNewSessionDurableEdit>;function Editor(props: EditProps) {const [record, setRecord] = useState<DurableOutboxRecord>();const [text, setText] = useState('');- useNewSessionDurableEdit({ ...props, onRestore: saved => {+ const recovery = useNewSessionDurableEdit({ ...props, onRestore: saved => {setRecord(saved); setText(saved.creation.draft.firstMessage);} });+ editorActions = recovery;return <><span>{text}</span><span>{record?.error}</span>- <button onClick={() => setText('New input')}>Edit</button></>;+ <button onClick={() => { setText('New input'); recovery.edit({ firstMessage: 'New input' }); }}>Edit</button></>;}function BlankForm(props: ResumeProps) {const [route, setRoute] = useState('');@@ -74,7 +78,10 @@ beforeEach(() => {}];outbox.find.mockReset().mockImplementation(() => outbox.records[0]);outbox.merge.mockReset().mockImplementation(async () => outbox.records[0]);- edit = { sessionId: 'task', deviceId: 'device', owner, leaveForeignRecovery: () => false };+ outbox.saveEdit.mockReset().mockImplementation(async (record, change) => ({+ ...record, creation: { ...record.creation, draft: { ...record.creation.draft, firstMessage: change.firstMessage } },+ }));+ edit = { sessionId: 'task', deviceId: 'device', owner, leaveForeignRecovery: () => false, onEdited: vi.fn() };hasInput = false;resume = { enabled: true, deviceId: 'device', workingDir: '/repo', owner, hasInput: () => hasInput };container = document.createElement('div');@@ -98,6 +105,9 @@ it('restores text and the saved failure once, preserving edits across renders anawait renderEdit();await notify();expect(container.textContent).toBe('New inputModel unavailableEdit');+ expect(edit.onEdited).toHaveBeenCalledWith(expect.objectContaining({+ creation: expect.objectContaining({ draft: expect.objectContaining({ firstMessage: 'New input' }) }),+ }));expect(outbox.claim).toHaveBeenCalledOnce();expect(outbox.release).not.toHaveBeenCalled();await act(async () => root.render(null));@@ -105,6 +115,44 @@ it('restores text and the saved failure once, preserving edits across renders anexpect(outbox.listeners.size).toBe(0);});+it('waits for deletion to be saved, then releases the recovery record without resaving later input', async () => {+ await renderEdit();+ await act(async () => ready());+ let finish!: (value: null) => void;+ outbox.saveEdit.mockReturnValueOnce(new Promise(resolve => { finish = resolve; }));+ editorActions.edit({ firstMessage: '' });+ let flushed = false;+ const flush = editorActions.flush().then(() => { flushed = true; });+ expect(flushed).toBe(false);+ await act(async () => { finish(null); await flush; });+ expect(edit.onEdited).toHaveBeenLastCalledWith(null);+ act(() => container.querySelector('button')!.click());+ expect(outbox.saveEdit).toHaveBeenCalledOnce();+});++it.each(['newer-edit', 'unmount', 'owner-switch', 'failure'] as const)('settles a pending edit without restoring stale form ownership: %s', async event => {+ edit.onError = vi.fn();+ await renderEdit();+ await act(async () => ready());+ let finish!: (value: DurableOutboxRecord) => void;+ let fail!: (error: Error) => void;+ outbox.saveEdit.mockReturnValueOnce(new Promise((resolve, reject) => { finish = resolve; fail = reject; }));+ editorActions.edit({ firstMessage: 'older' });+ const pending = editorActions.flush();+ if (event === 'newer-edit') await act(async () => { editorActions.edit({ firstMessage: 'newer' }); await editorActions.flush(); });+ if (event === 'unmount') await act(async () => root.render(null));+ if (event === 'owner-switch') setMobileAuthOwner('bob');+ if (event === 'failure') {+ const error = new Error('disk unavailable');+ await act(async () => { fail(error); await expect(pending).rejects.toThrow('disk unavailable'); });+ expect(edit.onError).toHaveBeenCalledWith(error);+ } else await act(async () => { finish(outbox.records[0]); await pending; });+ expect(edit.onEdited).toHaveBeenCalledTimes(event === 'newer-edit' ? 1 : 0);+ if (event === 'newer-edit') expect(edit.onEdited).toHaveBeenCalledWith(expect.objectContaining({+ creation: expect.objectContaining({ draft: expect.objectContaining({ firstMessage: 'newer' }) }),+ }));+});+it.each(['account', 'device', 'prepared', 'foreign-route', 'unmount', 'owner-switch'] as const)('ignores ineligible or late durable recovery: %s', async change => {if (change === 'account') outbox.records[0].accountId = 'other';diff --git a/apps/mobile/src/session/durableOutbox.ts b/apps/mobile/src/session/durableOutbox.tsindex 4f2cff41a6..71d4a090f7 100644--- a/apps/mobile/src/session/durableOutbox.ts+++ b/apps/mobile/src/session/durableOutbox.ts@@ -73,6 +73,14 @@ export function isDurableOutboxSettled(record: DurableOutboxRecord): boolean {return record.cleanupOutcome !== undefined;}+/** A failed creation belongs to its editor until a new creation takes it over. */+export function isDurableCreationDraft(record: DurableOutboxRecord): boolean {+ return record.suspended === true && record.state === 'failed'+ && !!(record.creation?.editReady || record.creation?.cancelled)+ && !record.prepared && !record.enqueueStarted && record.sendAtMs === undefined+ && !record.cancelRequested && !isDurableOutboxSettled(record);+}+/*** 已移交被控端的记录:持久投递已收下(或已落定)。会话 FIFO 只派发第一条未移交的记录,* 移交后的记录只做对账,不再挡后面的消息。@@ -126,7 +134,7 @@ export function createDurableOutbox(storage: OutboxStorage, reconcileDraft?: (};const mutate = async (record: DurableOutboxRecord,- next: DurableOutboxRecord | null,+ change: DurableOutboxRecord | null | ((current: DurableOutboxRecord) => DurableOutboxRecord | null),adding = false,expectedRecords: readonly DurableOutboxRecord[] = [],): Promise<DurableOutboxRecord | null> => {@@ -135,8 +143,14 @@ export function createDurableOutbox(storage: OutboxStorage, reconcileDraft?: (return serialize(async () => {assertOwner(record.accountId, epoch);const current = records.find((r) => keyFor(r) === keyFor(record));- if (adding ? current !== undefined : current !== record)+ const editing = typeof change === 'function';+ // Keystrokes share this store's write queue; each edits the preceding saved+ // revision, never an old render snapshot. Clearing does not permit re-add.+ if (editing && !current) return null;+ if (editing ? (!current || current.item.sessionId !== record.item.sessionId || !isDurableCreationDraft(current))+ : adding ? current !== undefined : current !== record)throw new Error("OUTBOX_STALE_WRITE");+ const next = editing ? change(current!) : change;if (expectedRecords.some((expected) => !records.includes(expected)))throw new Error("OUTBOX_STALE_WRITE");if (next && keyFor(next) !== keyFor(record)) throw new Error("OUTBOX_IDENTITY_CHANGED");@@ -247,6 +261,8 @@ export function createDurableOutbox(storage: OutboxStorage, reconcileDraft?: (deviceId: record.deviceId,}, false, expectedRecords) as Promise<DurableOutboxRecord>,remove: (record: DurableOutboxRecord) => mutate(record, null),+ editCreationDraft: (record: DurableOutboxRecord, edit: (current: DurableOutboxRecord) => DurableOutboxRecord | null) =>+ mutate(record, edit),ready: (): Promise<void> => store.activate(accountId),};return store;diff --git a/apps/mobile/src/session/mergeNewSessionEditFollowUps.ts b/apps/mobile/src/session/mergeNewSessionEditFollowUps.tsindex afe400a63d..627233d5f4 100644--- a/apps/mobile/src/session/mergeNewSessionEditFollowUps.ts+++ b/apps/mobile/src/session/mergeNewSessionEditFollowUps.ts@@ -33,7 +33,7 @@ export async function mergeNewSessionEditFollowUps(sessionId: string, deviceId:const text = [first.creation.draft.firstMessage];let omitted = 0;for (const record of pending) {- text.push(stripChatQuoteMarkerLines(record.item.text));+ text.push(record.item.quotesEncoded ? stripChatQuoteMarkerLines(record.item.text) : record.item.text);for (let slot = 0; slot < record.item.attachmentSlots.length; slot++) {const upload = record.uploads.find(u => u.slot === slot);// Queued uploads already own durable bytes even before receiving a remote reference.diff --git a/apps/mobile/src/session/newSessionCreation.ts b/apps/mobile/src/session/newSessionCreation.tsindex bb2679347d..fa3005ed2b 100644--- a/apps/mobile/src/session/newSessionCreation.ts+++ b/apps/mobile/src/session/newSessionCreation.ts@@ -51,7 +51,7 @@ import {import type { DeviceProvidersPayload } from '@/device-link/deviceProvidersCache';import { remoteSessionStore } from '@/session/remoteSessionStore';import { getCurrentMobileOutboxRecords, holdDurableOutboxCreation, isDurableOutboxCreationHeld, mobileDurableOutbox, persistCancelledCreationDraft, suspendCreationDraftForCleanup } from './mobileDurableOutbox';-import { isDurableOutboxSettled, type DurableOutboxRecord } from './durableOutbox';+import { isDurableCreationDraft, type DurableOutboxRecord } from './durableOutbox';import { isExplicitRemoteNotFoundError } from './newSessionWorktree';import { mergeAttachmentsWithinLimit } from './attachments';import type { MobileLocalAttachmentUploadCandidate } from './mobileLocalAttachmentUpload';@@ -576,10 +576,7 @@ export function holdNewSessionCreationDraft(sessionId: string): () => void {function isDurableEditRecord(record: DurableOutboxRecord): boolean {return record.accountId === getMobileAuthOwner().accountKey- && record.suspended === true && record.state === 'failed'- && !!(record.creation?.editReady || record.creation?.cancelled)- && !record.prepared && !record.enqueueStarted && record.sendAtMs === undefined- && !record.cancelRequested && !isDurableOutboxSettled(record);+ && isDurableCreationDraft(record);}function getDurableEditTask(sessionId: string): NewSessionCreationTask | null {diff --git a/apps/mobile/src/session/persistNewSessionCreationDraft.ts b/apps/mobile/src/session/persistNewSessionCreationDraft.tsindex 9c9b778e1f..4538766a7b 100644--- a/apps/mobile/src/session/persistNewSessionCreationDraft.ts+++ b/apps/mobile/src/session/persistNewSessionCreationDraft.ts@@ -1,9 +1,46 @@import { i18n } from '@/i18n';+import { getMobileAuthOwner, isMobileAuthOwnerCurrent } from '@/auth/authOwnerGeneration';import type { DurableOutboxRecord } from './durableOutbox';import type { MobileLocalAttachmentUploadCandidate } from './mobileLocalAttachmentUpload';import { durableOutboxUploadUri, outboxAttachmentNeedsLocalBytes, removeRetainedOutboxFiles, retainOutboxFile } from './durableOutboxFiles';import { getCurrentMobileOutboxRecords, mobileDurableOutbox } from './mobileDurableOutbox';+export type NewSessionDraftEdit = { firstMessage?: string; removeAttachmentId?: string };++/** User edits replace recovered content; an empty recovery is discarded permanently. */+export async function persistNewSessionDraftEdit(record: DurableOutboxRecord, edit: NewSessionDraftEdit): Promise<DurableOutboxRecord | null> {+ const owner = getMobileAuthOwner();+ const guard = () => {+ if (owner.accountKey !== record.accountId || !isMobileAuthOwnerCurrent(owner)) throw new Error('OUTBOX_OWNER_CHANGED');+ };+ guard();+ let removed: DurableOutboxRecord | undefined;+ const saved = await mobileDurableOutbox.editCreationDraft(record, current => {+ guard();+ const slots = current.item.attachmentSlots.map((attachment, slot) => ({ attachment, slot }))+ .filter(({ attachment }) => attachment && attachment.id !== edit.removeAttachmentId);+ const firstMessage = edit.firstMessage ?? current.creation!.draft.firstMessage;+ const uploads = current.uploads.filter(upload => slots.some(({ slot }) => slot === upload.slot));+ removed = { ...current, uploads: current.uploads.filter(upload => !uploads.includes(upload)) };+ if (!firstMessage.trim() && !slots.length) return null;+ return {+ ...current,+ creation: { ...current.creation!, draft: { ...current.creation!.draft, firstMessage } },+ uploads: uploads.map(upload => ({ ...upload, slot: slots.findIndex(({ slot }) => slot === upload.slot) })),+ item: { ...current.item, text: firstMessage,+ attachmentSlots: slots.map(({ attachment }) => attachment),+ slotMeta: slots.map(({ slot }) => current.item.slotMeta[slot]),+ slotByLocalId: {}, waitingIds: [], failedIds: [],+ agentReferences: [], pastedTextRanges: [], slashCommandRanges: [], quotesEncoded: false,+ },+ };+ });+ // Delete only bytes no longer referenced by the committed revision. Startup+ // reconciliation already handles a failed local cleanup; do not undo the edit.+ if (removed?.uploads.length) await removeRetainedOutboxFiles(removed).catch(() => undefined);+ return saved;+}+/** Save attachment bytes before the form reserves a worktree or hands off creation. */export async function persistNewSessionCreationDraft({ record, recovering, getUploadedSource, isCurrent }: {record: DurableOutboxRecord;diff --git a/apps/mobile/src/session/useNewSessionDraftRecovery.ts b/apps/mobile/src/session/useNewSessionDraftRecovery.tsindex 4e6a672355..d98c2c9dbb 100644--- a/apps/mobile/src/session/useNewSessionDraftRecovery.ts+++ b/apps/mobile/src/session/useNewSessionDraftRecovery.ts@@ -1,23 +1,41 @@-import { useEffect, useRef } from 'react';+import { useCallback, useEffect, useRef } from 'react';import { isMobileAuthOwnerCurrent, type MobileAuthOwnerGeneration } from '@/auth/authOwnerGeneration';import type { DurableOutboxRecord } from './durableOutbox';import { getCurrentMobileOutboxRecords, mobileDurableOutbox } from './mobileDurableOutbox';import { completeNewSessionDurableEdit, findNewSessionEditDraft } from './newSessionCreation';import { mergeNewSessionEditFollowUps } from './mergeNewSessionEditFollowUps';+import { persistNewSessionDraftEdit, type NewSessionDraftEdit } from './persistNewSessionCreationDraft';type CreationRecord = DurableOutboxRecord & { creation: NonNullable<DurableOutboxRecord['creation']> };/** The form owns one edit claim until its recovery route changes or unmounts. */-export function useNewSessionDurableEdit({ sessionId, deviceId, owner, leaveForeignRecovery, onRestore, onError }: {+export function useNewSessionDurableEdit({ sessionId, deviceId, owner, leaveForeignRecovery, onRestore, onEdited, onError }: {sessionId: string;deviceId: string;owner: MobileAuthOwnerGeneration;leaveForeignRecovery: () => boolean;onRestore: (record: CreationRecord) => void;+ onEdited?: (record: DurableOutboxRecord | null) => void;onError?: (error: unknown) => void;}) {- const callbacks = useRef({ leaveForeignRecovery, onRestore, onError });- callbacks.current = { leaveForeignRecovery, onRestore, onError };+ const callbacks = useRef({ leaveForeignRecovery, onRestore, onEdited, onError });+ callbacks.current = { leaveForeignRecovery, onRestore, onEdited, onError };+ const editingRecord = useRef<DurableOutboxRecord | null>(null);+ const pendingEdit = useRef<Promise<unknown>>(Promise.resolve());+ const edit = useCallback((change: NewSessionDraftEdit) => {+ const record = editingRecord.current;+ if (!record || record.item.sessionId !== sessionId || record.deviceId !== deviceId || !isMobileAuthOwnerCurrent(owner)) return;+ const pending: Promise<void> = persistNewSessionDraftEdit(record, change).then(saved => {+ if (pendingEdit.current !== pending || !isMobileAuthOwnerCurrent(owner) || editingRecord.current?.item.sessionId !== sessionId) return;+ editingRecord.current = saved;+ callbacks.current.onEdited?.(saved);+ });+ pendingEdit.current = pending;+ void pending.catch(error => {+ if (pendingEdit.current === pending && isMobileAuthOwnerCurrent(owner) && editingRecord.current?.item.sessionId === sessionId) callbacks.current.onError?.(error);+ });+ }, [sessionId, deviceId, owner]);+ const flush = useCallback(() => pendingEdit.current, []);useEffect(() => {if (callbacks.current.leaveForeignRecovery() || !sessionId) return;let active = true;@@ -34,6 +52,7 @@ export function useNewSessionDurableEdit({ sessionId, deviceId, owner, leaveForeif (!active || !isMobileAuthOwnerCurrent(owner) || !saved?.creation || saved.prepared|| !getCurrentMobileOutboxRecords().includes(saved)) return;restored = true;+ editingRecord.current = saved;callbacks.current.onRestore(saved as CreationRecord);releaseEditClaim = completeNewSessionDurableEdit(sessionId, deviceId);}).catch(error => {@@ -42,8 +61,9 @@ export function useNewSessionDurableEdit({ sessionId, deviceId, owner, leaveFore};const unsubscribe = mobileDurableOutbox.subscribe(restore);void mobileDurableOutbox.ready().then(restore);- return () => { active = false; unsubscribe(); releaseEditClaim?.(); };+ return () => { active = false; editingRecord.current = null; pendingEdit.current = Promise.resolve(); unsubscribe(); releaseEditClaim?.(); };}, [sessionId, deviceId, owner]);+ return { edit, flush };}/** Resume only while this form is still blank when asynchronous storage becomes ready. */diff --git a/docs/dev-rules/mobile-development.md b/docs/dev-rules/mobile-development.mdindex e57c159c27..a087237bb0 100644--- a/docs/dev-rules/mobile-development.md+++ b/docs/dev-rules/mobile-development.md@@ -122,8 +122,10 @@ iOS 的系统选图器在确认后立即把选中项交给现有附件队列。领取前保留失败任务,重新进入时自动返回编辑,禁止重试已回收的创建;不写全局单槽,不混入普通新建表单。持久发件箱保存完成后同样保留失败任务与恢复入口,直到匹配账号、设备和任务的新建表单实际恢复内容才清理任务;离页重进不重复回收或保存,也不解除暂停自动发送。- 返回编辑意图写入持久发件箱;退出编辑或应用重启后保留草稿,不重建任务列表行,- 不启动创建管线。空白新建页自动恢复当前设备(项目入口还须匹配目录)的最新未领取草稿;+ 返回编辑意图写入持久发件箱;退出编辑或应用重启后保留草稿,不重建任务列表行,不启动创建管线。+ 恢复后用户修改文字或移除附件,同步更新原恢复记录;文字和附件清空后删除记录及其附件副本,+ 离页、重启和迟到的旧编辑不得恢复已删除内容。再次提交先等待这些编辑落盘。+ 空白新建页自动恢复当前设备(项目入口还须匹配目录)的最新未领取草稿;不覆盖用户已输入的文字、附件、模型或目录选择,也不覆盖带预设内容的新建入口。文件选择器、上传和粘贴占位按同步状态判定已有输入;接收到系统分享的表单不再自动领取旧草稿。明确删除或归档失败任务时复用 worktree 回收,并持久结束发件箱恢复;列表、详情与批量入口一致,