Skip to content

Commit 144f3c3

Browse files
committed
fix(mobile): 编辑恢复草稿时清除过期回填记录
草稿文本变化时仅移除旧的 composerRecall,保留上下文引用;原文未变时继续保留捕获的空白。 扩展恢复、编辑、再次持久化和发送的回归用例,覆盖纯文本与保留上下文引用的草稿。 变更范围检查全部通过,包含 18 个文件中的 362 个测试。
1 parent 6b21964 commit 144f3c3

2 files changed

Lines changed: 40 additions & 12 deletions

File tree

‎apps/mobile/src/state/use-composer-drafts.test.ts‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ import {
170170
collectComposerContextReferences,
171171
composerRecallContext,
172172
formatComposerContextReference,
173+
recallComposerText,
173174
} from "@t3tools/shared/composerContextReferences";
175+
import { serializeComposerMessageForServer } from "../lib/composerContext";
174176
import { appAtomRegistry } from "./atom-registry";
175177
import { startComposerDraftOperation } from "./composerDraftOperations";
176178
import { threadOutboxManager } from "./thread-outbox";
@@ -476,17 +478,39 @@ describe("mobile composer drafts", () => {
476478
},
477479
);
478480

479-
it("keeps recall provenance through a recovered draft's unchanged save", () => {
480-
const context = { version: 1, records: [], composerRecall: " original\n" } as const;
481-
const restored = decodePersistedComposerState({
482-
schemaVersion: 1,
483-
drafts: { thread: { text: "original", attachments: [], context } },
484-
}).drafts.thread!;
485-
expect(
486-
composerRecallContext("original", restored.text, restored.context, "original")
487-
?.composerRecall,
488-
).toBe(" original\n");
489-
});
481+
it.each([0, 1])(
482+
"keeps recall provenance only through a recovered draft's unchanged save (%s records)",
483+
(recordCount) => {
484+
const referenceDraft = contextDraft(0, recordCount);
485+
const references = referenceDraft.text ? ` ${referenceDraft.text}` : "";
486+
const text = `original${references}`;
487+
const context = { ...referenceDraft.context!, composerRecall: " original\n" };
488+
const restored = decodePersistedComposerState({
489+
schemaVersion: 1,
490+
drafts: { thread: { text, attachments: [], context } },
491+
}).drafts.thread!;
492+
appAtomRegistry.set(composerDraftsAtom, { thread: restored });
493+
setComposerDraftText("thread", text);
494+
const unchanged = getComposerDraftSnapshot("thread");
495+
expect(
496+
composerRecallContext(text, unchanged.text, unchanged.context, text)?.composerRecall,
497+
).toBe(" original\n");
498+
const unchangedMessage = serializeComposerMessageForServer(unchanged.text, unchanged.context);
499+
expect(recallComposerText(unchangedMessage.text, unchangedMessage.context)).toBe(
500+
" original\n",
501+
);
502+
503+
const editedAuthored = " changed after recovery\n";
504+
setComposerDraftText("thread", `${editedAuthored}${references}`);
505+
const edited = decodePersistedComposerState({
506+
schemaVersion: 1,
507+
drafts: { thread: getComposerDraftSnapshot("thread") },
508+
}).drafts.thread!;
509+
const sent = serializeComposerMessageForServer(edited.text, edited.context);
510+
expect(recallComposerText(sent.text, sent.context)).toBe(editedAuthored);
511+
expect(edited.context?.records).toEqual(context.records);
512+
},
513+
);
490514

491515
it("retains a pick matching cached state until the live shell confirms it", () => {
492516
const environmentId = EnvironmentId.make("environment-1");

‎apps/mobile/src/state/use-composer-drafts.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,11 @@ export function setComposerDraftText(draftKey: string, value: string): void {
12861286
let removed: ReadonlyArray<DraftComposerAttachment> = [];
12871287
updateComposerDrafts((current) => {
12881288
const existing = normalizeDraft(current[draftKey]);
1289-
const context = referencedComposerContext(value, existing.context);
1289+
let context = referencedComposerContext(value, existing.context);
1290+
if (value !== existing.text && context?.composerRecall !== undefined) {
1291+
const { composerRecall: _previousRecall, ...editedContext } = context;
1292+
context = editedContext;
1293+
}
12901294
const draft = withReferencedContextFiles(existing, value, context);
12911295
removed = existing.attachments.filter((attachment) => !draft.attachments.includes(attachment));
12921296
return withComposerDraft(current, draftKey, draft);

0 commit comments

Comments
 (0)