fix(app): insert consecutive dropped file mentions in composer (#60463)

This commit is contained in:
Luke Parker
2026-10-30 14:25:55 +10:00
committed by GitHub
Unverified
parent bf94de965d
commit f1627d98e3
2 changed files with 75 additions and 19 deletions
@@ -104,4 +104,47 @@ describe("Composer store", () => {
])
expect(prompt.state.cursor).toBe(9)
})
test("inserts consecutive mentions without a range and replaces typed triggers after an existing mention", () => {
const prompt = createComposerEditorActions(
createStore<ComposerPersistedState>({
prompt: [{ type: "text", content: "", start: 0, end: 0 }],
context: { items: [] },
}),
)
prompt.addMention({ type: "file", path: "src/a.ts", content: "@src/a.ts", start: 0, end: 0 })
prompt.addMention({ type: "file", path: "src/b.ts", content: "@src/b.ts", start: 0, end: 0 })
expect(prompt.state.prompt).toEqual([
{ type: "file", path: "src/a.ts", content: "@src/a.ts", start: 0, end: 9 },
{ type: "text", content: " ", start: 9, end: 10 },
{ type: "file", path: "src/b.ts", content: "@src/b.ts", start: 10, end: 19 },
{ type: "text", content: " ", start: 19, end: 20 },
])
expect(prompt.state.cursor).toBe(20)
prompt.addText("@src/c")
prompt.addMention({ type: "file", path: "src/c.ts", content: "@src/c.ts", start: 0, end: 0 })
expect(prompt.state.prompt).toEqual([
{ type: "file", path: "src/a.ts", content: "@src/a.ts", start: 0, end: 9 },
{ type: "text", content: " ", start: 9, end: 10 },
{ type: "file", path: "src/b.ts", content: "@src/b.ts", start: 10, end: 19 },
{ type: "text", content: " ", start: 19, end: 20 },
{ type: "file", path: "src/c.ts", content: "@src/c.ts", start: 20, end: 29 },
{ type: "text", content: " ", start: 29, end: 30 },
])
expect(prompt.state.cursor).toBe(30)
prompt.setPrompt([{ type: "file", path: "src/a.ts", content: "@src/a.ts", start: 0, end: 9 }], 9)
prompt.addMention({ type: "file", path: "src/b.ts", content: "@src/b.ts", start: 0, end: 0 })
expect(prompt.state.prompt).toEqual([
{ type: "file", path: "src/a.ts", content: "@src/a.ts", start: 0, end: 9 },
{ type: "file", path: "src/b.ts", content: "@src/b.ts", start: 9, end: 18 },
{ type: "text", content: " ", start: 18, end: 19 },
])
expect(prompt.state.cursor).toBe(19)
})
})
+32 -19
View File
@@ -80,14 +80,19 @@ export function createComposerEditorActions(input: ComposerStateStoreInput) {
mention: ComposerFilePart | ComposerAgentPart | ComposerSkillPart | ComposerSessionPart,
range?: { start: number; end: number },
) {
const text = store()
.prompt.map((part) => ("content" in part ? part.content : ""))
.join("")
const prompt = withOffsets(store().prompt)
const length = promptLength(prompt)
const end = range?.end ?? Math.min(store().cursor ?? length, length)
const end = range?.end ?? store().cursor ?? text.length
const start = range?.start ?? text.slice(0, end).lastIndexOf("@")
setStore()("prompt", insertMention(store().prompt, start < 0 ? end : start, end, mention))
setStore()("cursor", (start < 0 ? end : start) + mention.content.length + 1)
const part = prompt.find(
(item): item is Extract<ComposerPrompt[number], { type: "text" }> =>
item.type === "text" && end >= item.start && end <= item.end,
)
const index = part ? part.content.slice(0, end - part.start).lastIndexOf("@") : -1
const start = range?.start ?? (part && index >= 0 ? part.start + index : end)
setStore()("prompt", insertMention(prompt, start, end, mention))
setStore()("cursor", start + mention.content.length + 1)
clearRetry()
},
removeAttachment(id: string) {
@@ -132,28 +137,36 @@ function insertMention(
end: number,
mention: ComposerFilePart | ComposerAgentPart | ComposerSkillPart | ComposerSessionPart,
): ComposerPrompt {
if (start === 0 && end === 0) {
return withOffsets([mention, { type: "text", content: " ", start: 0, end: 0 }, ...prompt])
}
let position = 0
let inserted = false
const parts = prompt.flatMap<ComposerPrompt[number]>((part) => {
if (isAttachment(part)) return [part]
const partStart = position
position += part.content.length
if (part.type !== "text" || start < partStart || end > position) return [part]
const before = part.content.slice(0, start - partStart)
const after = part.content.slice(end - partStart)
if (inserted) return [part]
return [
...(before ? [{ type: "text" as const, content: before, start: 0, end: 0 }] : []),
mention,
{ type: "text" as const, content: ` ${after}`, start: 0, end: 0 },
]
if (part.type === "text" && start >= partStart && end <= position) {
inserted = true
const before = part.content.slice(0, start - partStart)
const after = part.content.slice(end - partStart)
return [
...(before ? [{ type: "text" as const, content: before, start: 0, end: 0 }] : []),
mention,
{ type: "text" as const, content: ` ${after}`, start: 0, end: 0 },
]
}
if (start !== end || start > partStart) return [part]
inserted = true
return [mention, { type: "text", content: " ", start: 0, end: 0 }, part]
})
if (!inserted && start === end) parts.push(mention, { type: "text", content: " ", start: 0, end: 0 })
return withOffsets(parts)
}