mirror of
https://github.com/anomalyco/opencode.git
synced 2026-11-21 04:12:08 +03:00
fix(app): count queued quotes and annotations as attachments (#60235)
This commit is contained in:
committed by
GitHub
Unverified
parent
f99bc07445
commit
82666b6612
@@ -667,6 +667,14 @@ test("editing drops a file whose mention was deleted and keeps unmentioned conte
|
||||
test("editing a comment-only prompt keeps its notes once", async ({ page }) => {
|
||||
const note = "The user made the following comment regarding line 2 of /repo/app.ts: check the guard"
|
||||
const mock = createQueueMock([note])
|
||||
mock.rows[0].payload.files = [
|
||||
{
|
||||
data: "aGk=",
|
||||
mime: "text/plain",
|
||||
source: { type: "uri", uri: "file:///repo/app.ts?start=2&end=2" },
|
||||
name: "app.ts",
|
||||
},
|
||||
]
|
||||
mock.rows[0].payload.metadata = {
|
||||
displayText: "",
|
||||
comments: [
|
||||
@@ -679,8 +687,8 @@ test("editing a comment-only prompt keeps its notes once", async ({ page }) => {
|
||||
],
|
||||
}
|
||||
const view = await openQueue(page, mock)
|
||||
// With no display text, the editor shows the note itself, so the edit owns it as text.
|
||||
await view.rows.getByText(note, { exact: true }).click()
|
||||
// The queue counts the context file; the existing editor still loads its model-visible note as text.
|
||||
await view.rows.getByRole("button", { name: "1 attachment", exact: true }).click()
|
||||
await expect(view.input).toHaveText(note)
|
||||
await view.input.press("End")
|
||||
await view.input.pressSequentially(", please")
|
||||
|
||||
@@ -45,3 +45,21 @@ export default {
|
||||
export const Short = { args: { count: 3 } }
|
||||
|
||||
export const Scrolling = { args: { count: 6 } }
|
||||
|
||||
export const WithContext = {
|
||||
render: () => (
|
||||
<div class="w-full max-w-[560px]">
|
||||
<SessionQueuePanel
|
||||
queue={{
|
||||
...view(() => 0),
|
||||
rows: () => [
|
||||
{ id: "quote", text: "Update the queue context", attachments: 1 },
|
||||
{ id: "notes", text: "Compare the reference notes", attachments: 2 },
|
||||
{ id: "file", text: "Keep the queue compact", attachments: 1 },
|
||||
{ id: "context-only", text: "", attachments: 2 },
|
||||
],
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
),
|
||||
}
|
||||
|
||||
@@ -51,6 +51,88 @@ const edited = (id: string) => ({ id, text: "edited", attachments: 1, pending: t
|
||||
// One edit's life in the strip: sent from the composer, re-admitted by the server, its originals
|
||||
// cancelled last first, then settled once the server's queue reflects it, or rolled back on failure.
|
||||
describe("queuedPromptRows", () => {
|
||||
const quote = { type: "quote" as const, text: "Earlier answer" }
|
||||
|
||||
const annotation = {
|
||||
type: "note" as const,
|
||||
origin: "browser",
|
||||
label: "Save button",
|
||||
icon: "select-element",
|
||||
subject: 'the "Save" button',
|
||||
comment: "",
|
||||
}
|
||||
|
||||
const file = { path: "src/app.ts", comment: "Keep this" }
|
||||
|
||||
const files = [
|
||||
{
|
||||
data: "aGk=",
|
||||
mime: "text/plain",
|
||||
source: { type: "uri" as const, uri: "file:///repo/src/app.ts" },
|
||||
name: "app.ts",
|
||||
},
|
||||
]
|
||||
|
||||
test.each([
|
||||
{
|
||||
name: "text with a quote",
|
||||
displayText: "Summarize this",
|
||||
comments: [quote],
|
||||
files: [],
|
||||
visible: { text: "Summarize this", attachments: 1 },
|
||||
},
|
||||
{
|
||||
name: "text with an annotation without a comment",
|
||||
displayText: "Inspect this",
|
||||
comments: [annotation],
|
||||
files: [],
|
||||
visible: { text: "Inspect this", attachments: 1 },
|
||||
},
|
||||
{
|
||||
name: "quote-only context without model framing",
|
||||
displayText: "",
|
||||
comments: [quote],
|
||||
files: [],
|
||||
visible: { text: "", attachments: 1 },
|
||||
},
|
||||
{
|
||||
name: "trimmed text with mixed comments without double counting the context file",
|
||||
displayText: " Check these\n",
|
||||
comments: [quote, annotation, file],
|
||||
files,
|
||||
visible: { text: "Check these", attachments: 3 },
|
||||
},
|
||||
{
|
||||
name: "pending edited text with the original preserved comments",
|
||||
displayText: "Original text",
|
||||
comments: [quote, annotation, file],
|
||||
files,
|
||||
pending: true,
|
||||
visible: { text: "edited", attachments: 3 },
|
||||
},
|
||||
{
|
||||
name: "pending context-only edit retains its raw edited text",
|
||||
displayText: "",
|
||||
comments: [quote],
|
||||
files: [],
|
||||
pending: true,
|
||||
visible: { text: "edited", attachments: 1 },
|
||||
},
|
||||
])("shows $name", ({ displayText, comments, files, pending, visible }) => {
|
||||
const item = {
|
||||
...queued[0],
|
||||
payload: {
|
||||
text: "Raw model-visible framing and context",
|
||||
files: [...files],
|
||||
metadata: { displayText, comments: [...comments] },
|
||||
},
|
||||
} satisfies SessionInboxInfo
|
||||
|
||||
expect(queuedPromptRows([item], pending ? [sent()] : [])).toStrictEqual([
|
||||
{ id: item.id, pending: pending || undefined, ...visible },
|
||||
])
|
||||
})
|
||||
|
||||
test.each([
|
||||
[
|
||||
"shows a sent edit on the original row and marks the rows it rewrites as pending",
|
||||
|
||||
@@ -543,14 +543,18 @@ export function queuedPromptRows(items: QueuedPrompt[], sent: SentEdit[] = [], g
|
||||
|
||||
if (sent.some((entry) => entry.original === item.id && entry.admitted && entry.delivery === "steer")) return []
|
||||
|
||||
const presentation = readPromptPresentation(item.payload.metadata)
|
||||
// Text-only edits preserve the original context suffix. A context-only edit currently loads that suffix as text.
|
||||
const comments = !edit || presentation?.displayText.trim() ? (presentation?.comments ?? []) : []
|
||||
|
||||
return [
|
||||
{
|
||||
id: item.id,
|
||||
text: edit ? edit.text : queuedPromptText(item),
|
||||
attachments: edit
|
||||
? edit.attachments
|
||||
: (item.payload.files?.length ?? 0) +
|
||||
(readPromptPresentation(item.payload.metadata)?.attachments.length ?? 0),
|
||||
text: edit ? edit.text : (presentation?.displayText.trim() ?? queuedPromptText(item)),
|
||||
attachments:
|
||||
(edit ? edit.attachments : (item.payload.files?.length ?? 0) + (presentation?.attachments.length ?? 0)) +
|
||||
// File comments already contribute their context file; quotes and plugin notes have no file.
|
||||
comments.filter((comment) => comment.type === "quote" || comment.type === "note").length,
|
||||
pending: moves.some(([old, next]) => old === item.id || next === item.id) ? true : undefined,
|
||||
},
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user