Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

feat(ok): send a queued message right away from its row (PRD-8508) (#4827)

Abrahamed2af63514d1
diff --git a/.changeset/prd-8508-queued-send-now.md b/.changeset/prd-8508-queued-send-now.md
new file mode 100644
index 000000000..35916458f
--- /dev/null
+++ b/.changeset/prd-8508-queued-send-now.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+A message queued behind a running agent turn can now be sent right away: Send now on the queued row stops the current run and sends that message next, ahead of anything else waiting.
diff --git a/knip.config.ts b/knip.config.ts
index 659eef71e..5b8951125 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -143,15 +143,11 @@ export default {
'packages/server': {
entry: ['src/**/*.test.ts', 'src/parse-worker.ts'],
project: 'src/**',
- ignoreDependencies: [
- '@types/shell-quote',
- ],
+ ignoreDependencies: ['@types/shell-quote'],
},
'packages/cli': {
entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],
- ignoreDependencies: [
- 'yjs',
- ],
+ ignoreDependencies: ['yjs'],
},
'packages/desktop': {
entry: [
diff --git a/packages/app/src/components/acp/ThreadView.dom.test.tsx b/packages/app/src/components/acp/ThreadView.dom.test.tsx
index e450b75c2..75f032041 100644
--- a/packages/app/src/components/acp/ThreadView.dom.test.tsx
+++ b/packages/app/src/components/acp/ThreadView.dom.test.tsx
@@ -48,6 +48,7 @@ let editQueuedResult: Promise<void> = Promise.resolve();
const editQueued = vi.fn((_threadId: string, _id: string, _content: string) => editQueuedResult);
const holdQueued = vi.fn((_threadId: string, _id: string, _held: boolean) => {});
const removeQueued = vi.fn((_threadId: string, _id: string) => {});
+const sendQueuedNow = vi.fn((_threadId: string, _id: string) => {});
const toastError = vi.fn((_message: string) => {});
const cancel = vi.fn((_threadId: string) => {});
const retryThread = vi.fn(async (_threadId: string) => {});
@@ -72,6 +73,7 @@ vi.doMock('@/lib/acp/thread-client', () => ({
editQueued,
holdQueued,
removeQueued,
+ sendQueuedNow,
setMode,
setConfigOption,
setContextWindow,
@@ -494,6 +496,7 @@ afterEach(() => {
editQueuedResult = Promise.resolve();
holdQueued.mockClear();
removeQueued.mockClear();
+ sendQueuedNow.mockClear();
toastError.mockClear();
cancel.mockClear();
retryThread.mockClear();
@@ -2384,6 +2387,53 @@ describe('ThreadView queued-message holds', () => {
expect(screen.queryByTestId('agent-thread-queued-release')).toBeNull();
});
+ test('mid-turn, Send now on a queued row jumps it ahead of the run', () => {
+ model = makeModel({ turnActive: true });
+ render(<ThreadView info={oneQueued('jump me')} />);
+
+ fireEvent.click(screen.getByTestId('agent-thread-queued-send-now'));
+ expect(sendQueuedNow).toHaveBeenCalledWith('thread-1', 'q1');
+ expect(steer).not.toHaveBeenCalled();
+ expect(removeQueued).not.toHaveBeenCalled();
+ expect(cancel).not.toHaveBeenCalled();
+ });
+
+ test('a held row offers Send now too, next to its release', () => {
+ model = makeModel({ turnActive: true });
+ render(<ThreadView info={oneQueued('parked text', true)} />);
+
+ const row = screen.getByTestId('agent-thread-queued');
+ expect(within(row).getByTestId('agent-thread-queued-release')).toBeTruthy();
+ fireEvent.click(within(row).getByTestId('agent-thread-queued-send-now'));
+ expect(sendQueuedNow).toHaveBeenCalledWith('thread-1', 'q1');
+ expect(holdQueued).not.toHaveBeenCalled();
+ });
+
+ test('with no run to interrupt, a held row only offers its release', () => {
+ model = makeModel({ turnActive: false });
+ render(
+ <ThreadView
+ info={makeInfo({
+ status: 'ready',
+ queue: [{ id: 'q1', content: 'parked text', ts: 1, held: true }],
+ })}
+ />,
+ );
+
+ expect(screen.queryByTestId('agent-thread-queued-send-now')).toBeNull();
+ expect(screen.getByTestId('agent-thread-queued-release')).toBeTruthy();
+ });
+
+ test('Send now says what it costs before it is pressed', async () => {
+ const user = userEvent.setup();
+ model = makeModel({ turnActive: true });
+ render(<ThreadView info={oneQueued()} />);
+
+ await user.hover(screen.getByTestId('agent-thread-queued-send-now'));
+ const tooltip = await screen.findByRole('tooltip');
+ expect(tooltip.textContent).toContain('Stops the current run and sends this instead');
+ });
+
test('an edit that lost its race says so instead of vanishing', async () => {
editQueuedResult = Promise.reject(new Error('queued message already dispatched'));
model = makeModel({ turnActive: true });
diff --git a/packages/app/src/components/acp/ThreadView.tsx b/packages/app/src/components/acp/ThreadView.tsx
index a580d4e20..76e1a8958 100644
--- a/packages/app/src/components/acp/ThreadView.tsx
+++ b/packages/app/src/components/acp/ThreadView.tsx
@@ -3950,7 +3950,7 @@ function ThreadComposer({
return (
<div className="p-2">
{queue.length > 0 && !archived ? (
- <QueuedMessageList threadId={info.threadId} queue={queue} />
+ <QueuedMessageList threadId={info.threadId} queue={queue} turnActive={turnActive} />
) : null}
{}
{/* biome-ignore lint/a11y/noStaticElementInteractions: pointer-only affordance — pressing the card's whitespace focuses the composer input; keyboard/AT users reach it via Tab. See focus-composer-on-card-pointer.ts. */}
@@ -4103,9 +4103,11 @@ function ThreadComposer({
function QueuedMessageList({
threadId,
queue,
+ turnActive,
}: {
threadId: string;
queue: readonly QueuedMessage[];
+ turnActive: boolean;
}): ReactNode {
const { t } = useLingui();
return (
@@ -4114,7 +4116,12 @@ function QueuedMessageList({
{t`Queued — sends when this run finishes`}
</span>
{queue.map((message) => (
- <QueuedMessageRow key={message.id} threadId={threadId} message={message} />
+ <QueuedMessageRow
+ key={message.id}
+ threadId={threadId}
+ message={message}
+ turnActive={turnActive}
+ />
))}
</div>
);
@@ -4123,9 +4130,11 @@ function QueuedMessageList({
function QueuedMessageRow({
threadId,
message,
+ turnActive,
}: {
threadId: string;
message: QueuedMessage;
+ turnActive: boolean;
}): ReactNode {
const { t } = useLingui();
const client = getAgentThreadClient();
@@ -4250,6 +4259,24 @@ function QueuedMessageRow({
</Button>
</>
) : null}
+ {turnActive ? (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ type="button"
+ size="icon-sm"
+ variant="ghost"
+ className="size-6 shrink-0 text-muted-foreground"
+ onClick={() => client.sendQueuedNow(threadId, message.id)}
+ aria-label={t`Send now`}
+ data-testid="agent-thread-queued-send-now"
+ >
+ <Zap className="size-3.5" aria-hidden="true" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent side="top">{t`Stops the current run and sends this instead`}</TooltipContent>
+ </Tooltip>
+ ) : null}
<Button
type="button"
size="icon-sm"
diff --git a/packages/app/src/lib/acp/thread-client.test.ts b/packages/app/src/lib/acp/thread-client.test.ts
index e292ab141..dfe077484 100644
--- a/packages/app/src/lib/acp/thread-client.test.ts
+++ b/packages/app/src/lib/acp/thread-client.test.ts
@@ -459,6 +459,14 @@ describe('queue edit settlement', () => {
{ op: 'queue_hold', threadId: 't1', id: 'q1', held: false },
]);
});
+
+ test('sendQueuedNow sends the jump-the-line frame verbatim', () => {
+ const { client, sent } = makeWiredClient();
+ client.sendQueuedNow('t1', 'q1');
+ expect(sent.filter((f) => f.op === 'queue_send_now')).toEqual([
+ { op: 'queue_send_now', threadId: 't1', id: 'q1' },
+ ]);
+ });
});
describe('retry and sign-in lifecycle', () => {
diff --git a/packages/app/src/lib/acp/thread-client.ts b/packages/app/src/lib/acp/thread-client.ts
index ae4ab5223..4eb47b055 100644
--- a/packages/app/src/lib/acp/thread-client.ts
+++ b/packages/app/src/lib/acp/thread-client.ts
@@ -273,6 +273,10 @@ export class AgentThreadClient {
this.send({ op: 'queue_remove', threadId, id });
}
+ sendQueuedNow(threadId: string, id: string): void {
+ this.send({ op: 'queue_send_now', threadId, id });
+ }
+
respondPermission(
threadId: string,
requestId: string,
diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.json
index 01f25df20..9de658d2b 100644
--- a/packages/app/src/locales/ar/messages.json
+++ b/packages/app/src/locales/ar/messages.json
@@ -2373,6 +2373,7 @@
"NnQapF": ["الفتح بالذكاء الاصطناعي ", ["targetDisplayName"]],
"NoY1k4": ["بنية استجابة الخادم غير صالحة"],
"NpC29w": ["أنشئ عنصر قائمة جديدًا من عنصر القائمة الحالي."],
+ "NpEm3p": ["الإرسال الآن"],
"NpRLRj": ["تراجع عن عمليات الحل لتغيير هذا."],
"NrFwux": ["فشل حفظ قواعد المحتوى — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index 241eff69c..93d1027a0 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -12530,6 +12530,10 @@ msgstr "إرسال ملاحظات…"
msgid "Send in this chat"
msgstr "إرسال في هذه المحادثة"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "الإرسال الآن"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "إرسال التقرير"
diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.json
index 98c3c74f8..dec48a07a 100644
--- a/packages/app/src/locales/bn/messages.json
+++ b/packages/app/src/locales/bn/messages.json
@@ -1989,6 +1989,7 @@
"NnQapF": ["AI ", ["targetDisplayName"], " দিয়ে খুলুন"],
"NoY1k4": ["সার্ভারের প্রতিক্রিয়ার গঠন অবৈধ"],
"NpC29w": ["বর্তমান তালিকা আইটেম থেকে একটি নতুন তালিকা আইটেম তৈরি করুন।"],
+ "NpEm3p": ["এখনই পাঠান"],
"NpRLRj": ["এটি পরিবর্তন করতে আপনার সমাধানগুলি পূর্বাবস্থায় ফেরান।"],
"NrFwux": ["বিষয়বস্তুর নিয়ম সংরক্ষণ করতে ব্যর্থ — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index ecca76559..8f68aa156 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -12526,6 +12526,10 @@ msgstr "মতামত পাঠান…"
msgid "Send in this chat"
msgstr "এই চ্যাটেই পাঠান"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "এখনই পাঠান"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "রিপোর্ট পাঠান"
diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.json
index 7e54739c4..ecc3c0da3 100644
--- a/packages/app/src/locales/en/messages.json
+++ b/packages/app/src/locales/en/messages.json
@@ -2062,6 +2062,7 @@
"NnQapF": ["Open with AI ", ["targetDisplayName"]],
"NoY1k4": ["Invalid server response shape"],
"NpC29w": ["Create a new list item from the current list item."],
+ "NpEm3p": ["Send now"],
"NpRLRj": ["Undo your resolutions to change this."],
"NrFwux": ["Failed to save content rules — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index c27b254c9..7af3de4dc 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -12530,6 +12530,10 @@ msgstr "Send feedback…"
msgid "Send in this chat"
msgstr "Send in this chat"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "Send now"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "Send report"
diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.json
index fc2ee4cf8..3b1169747 100644
--- a/packages/app/src/locales/es/messages.json
+++ b/packages/app/src/locales/es/messages.json
@@ -2397,6 +2397,7 @@
"NnQapF": ["Abrir con la IA ", ["targetDisplayName"]],
"NoY1k4": ["La estructura de la respuesta del servidor no es válida"],
"NpC29w": ["Crea un elemento de lista nuevo a partir del elemento actual."],
+ "NpEm3p": ["Enviar ahora"],
"NpRLRj": ["Deshaz tus resoluciones para cambiar esto."],
"NrFwux": ["No se pudieron guardar las reglas de contenido — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index 58f3dc09e..f8f8c145c 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -12530,6 +12530,10 @@ msgstr "Enviar comentarios…"
msgid "Send in this chat"
msgstr "Enviar en este chat"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "Enviar ahora"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "Enviar el informe"
diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.json
index df023316c..cc43c1515 100644
--- a/packages/app/src/locales/fr/messages.json
+++ b/packages/app/src/locales/fr/messages.json
@@ -2436,6 +2436,7 @@
"NnQapF": ["Ouvrir avec l'IA ", ["targetDisplayName"]],
"NoY1k4": ["Structure de réponse du serveur invalide"],
"NpC29w": ["Crée un nouvel élément de liste à partir de l'élément courant."],
+ "NpEm3p": ["Envoyer maintenant"],
"NpRLRj": ["Annulez vos résolutions pour modifier ceci."],
"NrFwux": ["Échec de l'enregistrement des règles de contenu — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index 04805371f..dd6c14c71 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -12530,6 +12530,10 @@ msgstr "Envoyer un retour…"
msgid "Send in this chat"
msgstr "Envoyer dans ce chat"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "Envoyer maintenant"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "Envoyer le rapport"
diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.json
index e585a8d6e..c17f5148b 100644
--- a/packages/app/src/locales/hi/messages.json
+++ b/packages/app/src/locales/hi/messages.json
@@ -1997,6 +1997,7 @@
"NnQapF": ["AI ", ["targetDisplayName"], " से खोलें"],
"NoY1k4": ["सर्वर प्रतिक्रिया की संरचना अमान्य है"],
"NpC29w": ["मौजूदा सूची आइटम से एक नया सूची आइटम बनाएँ।"],
+ "NpEm3p": ["अभी भेजें"],
"NpRLRj": ["इसे बदलने के लिए अपने समाधान पूर्ववत करें।"],
"NrFwux": ["सामग्री नियम सहेजने में विफल — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index 743a52097..0d60aa319 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -12526,6 +12526,10 @@ msgstr "प्रतिक्रिया भेजें…"
msgid "Send in this chat"
msgstr "इसी चैट में भेजें"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "अभी भेजें"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "रिपोर्ट भेजें"
diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.json
index 8b26ad101..2944eb7df 100644
--- a/packages/app/src/locales/id/messages.json
+++ b/packages/app/src/locales/id/messages.json
@@ -2080,6 +2080,7 @@
"NnQapF": ["Buka dengan AI ", ["targetDisplayName"]],
"NoY1k4": ["Bentuk respons server tidak valid"],
"NpC29w": ["Membuat item daftar baru dari item daftar saat ini."],
+ "NpEm3p": ["Kirim sekarang"],
"NpRLRj": ["Batalkan resolusi Anda untuk mengubah ini."],
"NrFwux": ["Gagal menyimpan aturan konten — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index 9911cb190..1fd2ca943 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -12526,6 +12526,10 @@ msgstr "Kirim masukan…"
msgid "Send in this chat"
msgstr "Kirim di obrolan ini"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "Kirim sekarang"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "Kirim laporan"
diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.json
index 92d523483..a4894b374 100644
--- a/packages/app/src/locales/ko/messages.json
+++ b/packages/app/src/locales/ko/messages.json
@@ -1995,6 +1995,7 @@
"NnQapF": ["AI로 ", ["targetDisplayName"], " 열기"],
"NoY1k4": ["잘못된 서버 응답 형식"],
"NpC29w": ["현재 목록 항목에서 새 목록 항목을 만듭니다."],
+ "NpEm3p": ["지금 전송"],
"NpRLRj": ["이 설정을 바꾸려면 해결을 실행 취소하세요."],
"NrFwux": ["콘텐츠 규칙을 저장하지 못했습니다: ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index b57ea38e5..5408395d6 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -12530,6 +12530,10 @@ msgstr "피드백 보내기…"
msgid "Send in this chat"
msgstr "이 채팅에서 전송"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "지금 전송"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "보고서 보내기"
diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.json
index da1f33814..2a52ef39c 100644
--- a/packages/app/src/locales/pseudo/messages.json
+++ b/packages/app/src/locales/pseudo/messages.json
@@ -2062,6 +2062,7 @@
"NnQapF": ["Ōƥēń ŵĩţĥ ÀĨ ", ["targetDisplayName"]],
"NoY1k4": ["Ĩńvàĺĩď śēŕvēŕ ŕēśƥōńśē śĥàƥē"],
"NpC29w": ["Ćŕēàţē à ńēŵ ĺĩśţ ĩţēḿ ƒŕōḿ ţĥē ćũŕŕēńţ ĺĩśţ ĩţēḿ."],
+ "NpEm3p": ["Śēńď ńōŵ"],
"NpRLRj": ["Ũńďō ŷōũŕ ŕēśōĺũţĩōńś ţō ćĥàńĝē ţĥĩś."],
"NrFwux": ["Ƒàĩĺēď ţō śàvē ćōńţēńţ ŕũĺēś — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index 654f8095f..ba1111996 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -12526,6 +12526,10 @@ msgstr ""
msgid "Send in this chat"
msgstr ""
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr ""
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr ""
diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.json
index 6a439cca2..8e5b0a4cb 100644
--- a/packages/app/src/locales/pt-BR/messages.json
+++ b/packages/app/src/locales/pt-BR/messages.json
@@ -2368,6 +2368,7 @@
"NnQapF": ["Abrir com a IA ", ["targetDisplayName"]],
"NoY1k4": ["Estrutura da resposta do servidor inválida"],
"NpC29w": ["Cria um novo item de lista a partir do item atual."],
+ "NpEm3p": ["Enviar agora"],
"NpRLRj": ["Desfaça suas resoluções para alterar isto."],
"NrFwux": ["Falha ao salvar as regras de conteúdo — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index 5457c8986..daa415cb5 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -12526,6 +12526,10 @@ msgstr "Enviar comentários…"
msgid "Send in this chat"
msgstr "Enviar neste chat"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "Enviar agora"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "Enviar o relatório"
diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.json
index 483c7062b..c91998016 100644
--- a/packages/app/src/locales/ur/messages.json
+++ b/packages/app/src/locales/ur/messages.json
@@ -2103,6 +2103,7 @@
"NnQapF": ["AI ", ["targetDisplayName"], " کے ساتھ کھولیں"],
"NoY1k4": ["سرور کے جواب کی ساخت غیر درست ہے"],
"NpC29w": ["موجودہ فہرست آئٹم سے نیا فہرست آئٹم بنائیں۔"],
+ "NpEm3p": ["ابھی بھیجیں"],
"NpRLRj": ["اسے تبدیل کرنے کے لیے اپنی ریزولوشنز واپس لیں۔"],
"NrFwux": ["مواد کے قواعد محفوظ نہیں ہو سکے — ", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index cccd8e317..7a9307755 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -12530,6 +12530,10 @@ msgstr "رائے بھیجیں…"
msgid "Send in this chat"
msgstr "اسی چیٹ میں بھیجیں"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "ابھی بھیجیں"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "رپورٹ بھیجیں"
diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.json
index 3c8969b99..9a2e6dffb 100644
--- a/packages/app/src/locales/zh-Hans/messages.json
+++ b/packages/app/src/locales/zh-Hans/messages.json
@@ -1792,6 +1792,7 @@
"NnQapF": ["用 AI ", ["targetDisplayName"], " 打开"],
"NoY1k4": ["服务器响应结构无效"],
"NpC29w": ["基于当前列表项创建一个新的列表项。"],
+ "NpEm3p": ["立即发送"],
"NpRLRj": ["撤销已做的解决操作后才能更改。"],
"NrFwux": ["保存内容规则失败——", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index 75adba2f0..66467c6f3 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -12530,6 +12530,10 @@ msgstr "发送反馈…"
msgid "Send in this chat"
msgstr "在当前对话中发送"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "立即发送"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "发送报告"
diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.json
index 7fe6c2e94..f67bcdf14 100644
--- a/packages/app/src/locales/zh-Hant/messages.json
+++ b/packages/app/src/locales/zh-Hant/messages.json
@@ -1810,6 +1810,7 @@
"NnQapF": ["用 AI ", ["targetDisplayName"], " 開啟"],
"NoY1k4": ["伺服器回應結構無效"],
"NpC29w": ["從目前的清單項目建立一個新的清單項目。"],
+ "NpEm3p": ["立即傳送"],
"NpRLRj": ["復原已做的解決操作後才能變更。"],
"NrFwux": ["儲存內容規則失敗——", ["0"]],
"Ns0z5o": [
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index 90d9155e3..d15cd3a21 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -12530,6 +12530,10 @@ msgstr "傳送意見回饋…"
msgid "Send in this chat"
msgstr "在目前對話中傳送"
+#: src/components/acp/ThreadView.tsx
+msgid "Send now"
+msgstr "立即傳送"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Send report"
msgstr "傳送回報"
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index a28cc2b18..8a60e5826 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,4 +1,3 @@
-
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
index 4fc2c11f9..6fcdc23f2 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { normalizeBridge } from '@inkeep/open-knowledge-core';
import { updateYFragment } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.ts
index 9f2f6feb6..40b5cdfd6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
index 2a085742b..93666af70 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.ts
index 878d5196b..867598d34 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
index 4ada3cf26..0970ac12f 100644
--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
@@ -1,4 +1,3 @@
-
import { randomUUID } from 'node:crypto';
import { afterEach, describe, expect, test } from 'vitest';
import { agentWriteMd, createTestServer, type TestServer } from './test-harness';
diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
index cbe2b705f..b632185e1 100644
--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
@@ -1,4 +1,3 @@
-
import { execFileSync } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { join } from 'node:path';
diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
index 89bc9b4d9..c530ce4ba 100644
--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
@@ -1,4 +1,3 @@
-
import { randomUUID } from 'node:crypto';
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
import type * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.ts
index a78aeb0e4..d3767adc9 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,4 +1,3 @@
-
import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.ts
index e7cc69c3f..b076f955c 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,4 +1,3 @@
-
import { writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.ts
index 9ddcd0730..7935e35f8 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,4 +1,3 @@
-
import { prependFrontmatter } from '@inkeep/open-knowledge-core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
diff --git a/packages/core/src/acp/thread-protocol.test.ts b/packages/core/src/acp/thread-protocol.test.ts
index 9249342ef..59b6abf11 100644
--- a/packages/core/src/acp/thread-protocol.test.ts
+++ b/packages/core/src/acp/thread-protocol.test.ts
@@ -155,6 +155,16 @@ describe('parseThreadClientFrame', () => {
expect(parseThreadClientFrame(JSON.stringify({ op: 'queue_remove', id: 'q1' }))).toBeNull();
});
+ test('queue_send_now requires threadId and id', () => {
+ expect(
+ parseThreadClientFrame(JSON.stringify({ op: 'queue_send_now', threadId: 't', id: 'q1' })),
+ ).toMatchObject({ op: 'queue_send_now', threadId: 't', id: 'q1' });
+ expect(
+ parseThreadClientFrame(JSON.stringify({ op: 'queue_send_now', threadId: 't' })),
+ ).toBeNull();
+ expect(parseThreadClientFrame(JSON.stringify({ op: 'queue_send_now', id: 'q1' }))).toBeNull();
+ });
+
test('permission_response validates the outcome union', () => {
expect(
parseThreadClientFrame(
diff --git a/packages/core/src/acp/thread-protocol.ts b/packages/core/src/acp/thread-protocol.ts
index d3a17dc76..a10f42178 100644
--- a/packages/core/src/acp/thread-protocol.ts
+++ b/packages/core/src/acp/thread-protocol.ts
@@ -283,6 +283,11 @@ export type ThreadClientFrame =
threadId: string;
id: string;
}
+ | {
+ op: 'queue_send_now';
+ threadId: string;
+ id: string;
+ }
| {
op: 'permission_response';
threadId: string;
@@ -390,6 +395,7 @@ const CLIENT_OPS = new Set([
'queue_edit',
'queue_hold',
'queue_remove',
+ 'queue_send_now',
'permission_response',
'runtime_consent_response',
'pi_bridge_consent_response',
@@ -504,6 +510,7 @@ export function parseThreadClientFrame(raw: string): ThreadClientFrame | null {
if (!str('threadId') || !str('id') || typeof frame.held !== 'boolean') return null;
return frame as unknown as ThreadClientFrame;
case 'queue_remove':
+ case 'queue_send_now':
if (!str('threadId') || !str('id')) return null;
return frame as unknown as ThreadClientFrame;
case 'permission_response': {
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index 2a597ec3d..f4cc8a286 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,4 +1,3 @@
-
import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';
export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index 01ef76a9f..8fb428b90 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,4 +1,3 @@
-
import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';
import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index fb0ba5a7c..fc267cbea 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,4 +1,3 @@
-
import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index fa3cfcd86..bfd7e3109 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,4 +1,3 @@
-
import type { Nodes, Parent, Root } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.ts
index 8be632ba4..4d3250d3a 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,4 +1,3 @@
-
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');
diff --git a/packages/server/src/acp/thread-manager.integration.test.ts b/packages/server/src/acp/thread-manager.integration.test.ts
index 51696a2e1..7e54f12bc 100644
--- a/packages/server/src/acp/thread-manager.integration.test.ts
+++ b/packages/server/src/acp/thread-manager.integration.test.ts
@@ -2865,6 +2865,123 @@ describe('AcpThreadManager prompt queueing', () => {
await manager.closeThread(info.threadId);
}, 40_000);
+
+ test('Send now pulls a queued entry out of line and steers with it', async () => {
+ const contentDir = tmp();
+ const localDir = tmp();
+ const releasePath = join(localDir, 'release-turn');
+ writeCancelHonoringGateAgent(localDir, releasePath);
+ const manager = makeManager(contentDir, localDir);
+ const info = await manager.createThread({ agent: { source: 'custom', id: 'steer-agent' } });
+ const events: Collected = [];
+ await manager.subscribe(info.threadId, 0, collect(events));
+ await waitUntil(() => manager.getInfo(info.threadId)?.status === 'ready', 15_000, 'ready');
+
+ manager.sendPrompt(info.threadId, 'WAIT at the gate');
+ await waitUntil(() => internals(manager).turnActive(info.threadId), 5_000, 'turn active');
+ manager.sendPrompt(info.threadId, 'patient one');
+ manager.sendPrompt(info.threadId, 'jump the line');
+ const target = (manager.getInfo(info.threadId)?.queue ?? [])[1];
+ if (target === undefined) throw new Error('queue entry missing');
+
+ expect(manager.sendQueuedNow(info.threadId, 'no-such-id')).toBe(false);
+ expect(manager.sendQueuedNow(info.threadId, target.id)).toBe(true);
+ expect(manager.getInfo(info.threadId)?.steer?.content).toBe('jump the line');
+ expect((manager.getInfo(info.threadId)?.queue ?? []).map((m) => m.content)).toEqual([
+ 'patient one',
+ ]);
+
+ await waitUntil(
+ () => events.filter((e) => e.event.kind === 'turn_ended').length === 3,
+ 20_000,
+ `three turn ends; got ${JSON.stringify(events.map((e) => e.event.kind))}`,
+ );
+ expect(stopReasons(events)[0]).toBe('cancelled');
+ expect(userMessages(events)).toEqual(['WAIT at the gate', 'jump the line', 'patient one']);
+ expect(manager.getInfo(info.threadId)?.steer).toBeUndefined();
+ expect(manager.getInfo(info.threadId)?.queue).toBeUndefined();
+
+ await manager.closeThread(info.threadId);
+ }, 40_000);
+
+ test('Send now ahead of a parked steer keeps that steer first in line, not dropped', async () => {
+ const contentDir = tmp();
+ const localDir = tmp();
+ const releasePath = join(localDir, 'release-turn');
+ writeGateAgent(localDir, releasePath);
+ const manager = makeManager(contentDir, localDir, { steerStallMs: 60_000 });
+ const info = await manager.createThread({ agent: { source: 'custom', id: 'gate-agent' } });
+ const events: Collected = [];
+ await manager.subscribe(info.threadId, 0, collect(events));
+ await waitUntil(() => manager.getInfo(info.threadId)?.status === 'ready', 15_000, 'ready');
+
+ manager.sendPrompt(info.threadId, 'WAIT at the gate');
+ await waitUntil(() => internals(manager).turnActive(info.threadId), 5_000, 'turn active');
+ manager.sendPrompt(info.threadId, 'queued first');
+ manager.steerPrompt(info.threadId, 'could not interrupt');
+ const queued = (manager.getInfo(info.threadId)?.queue ?? [])[0];
+ if (queued === undefined) throw new Error('queue entry missing');
+
+ expect(manager.sendQueuedNow(info.threadId, queued.id)).toBe(true);
+ expect(manager.getInfo(info.threadId)?.steer?.content).toBe('queued first');
+ expect((manager.getInfo(info.threadId)?.queue ?? []).map((m) => m.content)).toEqual([
+ 'could not interrupt',
+ ]);
+
+ writeFileSync(releasePath, 'go');
+ await waitUntil(
+ () => events.filter((e) => e.event.kind === 'turn_ended').length === 3,
+ 20_000,
+ `three turn ends; got ${JSON.stringify(events.map((e) => e.event.kind))}`,
+ );
+ expect(userMessages(events)).toEqual([
+ 'WAIT at the gate',
+ 'queued first',
+ 'could not interrupt',
+ ]);
+
+ await manager.closeThread(info.threadId);
+ }, 40_000);
+
+ test('Send now on a held entry with no run going just sends it', async () => {
+ const contentDir = tmp();
+ const localDir = tmp();
+ const releasePath = join(localDir, 'release-turn');
+ writeGateAgent(localDir, releasePath);
+ const manager = makeManager(contentDir, localDir);
+ const info = await manager.createThread({ agent: { source: 'custom', id: 'gate-agent' } });
+ const events: Collected = [];
+ await manager.subscribe(info.threadId, 0, collect(events));
+ await waitUntil(() => manager.getInfo(info.threadId)?.status === 'ready', 15_000, 'ready');
+
+ manager.sendPrompt(info.threadId, 'WAIT at the gate');
+ await waitUntil(() => internals(manager).turnActive(info.threadId), 5_000, 'turn active');
+ manager.sendPrompt(info.threadId, 'parked');
+ const entry = (manager.getInfo(info.threadId)?.queue ?? [])[0];
+ if (entry === undefined) throw new Error('queue entry missing');
+ manager.holdQueued(info.threadId, entry.id, true);
+
+ writeFileSync(releasePath, 'go');
+ await waitUntil(
+ () => events.filter((e) => e.event.kind === 'turn_ended').length === 1,
+ 20_000,
+ 'the gated turn ends',
+ );
+ await waitUntil(() => manager.getInfo(info.threadId)?.status === 'ready', 20_000, 'ready');
+ expect(manager.getInfo(info.threadId)?.queue?.length).toBe(1);
+
+ expect(manager.sendQueuedNow(info.threadId, entry.id)).toBe(true);
+ await waitUntil(
+ () => events.filter((e) => e.event.kind === 'turn_ended').length === 2,
+ 20_000,
+ 'two turn ends',
+ );
+ expect(userMessages(events)).toEqual(['WAIT at the gate', 'parked']);
+ expect(manager.getInfo(info.threadId)?.queue).toBeUndefined();
+ expect(manager.getInfo(info.threadId)?.steer).toBeUndefined();
+
+ await manager.closeThread(info.threadId);
+ }, 40_000);
});
describe.skipIf(process.platform === 'win32')('login-shell PATH fallback', () => {
diff --git a/packages/server/src/acp/thread-manager.ts b/packages/server/src/acp/thread-manager.ts
index 9953785f1..4f35c6f60 100644
--- a/packages/server/src/acp/thread-manager.ts
+++ b/packages/server/src/acp/thread-manager.ts
@@ -2140,6 +2140,25 @@ export class AcpThreadManager {
steerPrompt(threadId: string, content: string, attachments?: readonly AttachmentPart[]): void {
const t = this.mustGet(threadId);
+ this.assertSteerable(t);
+ this.steerWith(t, content, attachments);
+ }
+
+ sendQueuedNow(threadId: string, id: string): boolean {
+ const t = this.mustGet(threadId);
+ const queue = t.info.queue ?? [];
+ const message = queue.find((m) => m.id === id);
+ if (message === undefined) return false;
+ this.assertSteerable(t);
+ const parked = this.takeSteer(t);
+ const rest = queue.filter((m) => m.id !== id);
+ const next = parked === null ? rest : [queuedFromSteer(parked), ...rest];
+ t.info.queue = next.length > 0 ? next : undefined;
+ this.steerWith(t, message.content, message.attachments);
+ return true;
+ }
+
+ private assertSteerable(t: ThreadRecord): void {
if (t.info.archived === true) {
throw new ThreadOpError('not-ready', 'the thread is archived — resume it first');
}
@@ -2152,6 +2171,13 @@ export class AcpThreadManager {
if (t.sessionId === null || t.conn === null) {
throw new ThreadOpError('not-ready', 'thread has no live agent session');
}
+ }
+
+ private steerWith(
+ t: ThreadRecord,
+ content: string,
+ attachments?: readonly AttachmentPart[],
+ ): void {
if (!t.turnActive) {
this.dispatchPrompt(t, content, attachments, { echo: true });
return;
@@ -2173,15 +2199,7 @@ export class AcpThreadManager {
const steer = t.info.steer;
if (steer === undefined || t.closed || !t.turnActive) return;
t.info.steer = undefined;
- const demoted: QueuedMessage = {
- id: crypto.randomUUID(),
- content: steer.content,
- ts: steer.ts,
- };
- if (steer.attachments !== undefined && steer.attachments.length > 0) {
- demoted.attachments = steer.attachments;
- }
- t.info.queue = [demoted, ...(t.info.queue ?? [])];
+ t.info.queue = [queuedFromSteer(steer), ...(t.info.queue ?? [])];
this.emitInfo(t);
}
@@ -3356,6 +3374,14 @@ async function connectionFailureDetail(
};
}
+function queuedFromSteer(steer: SteerMessage): QueuedMessage {
+ const demoted: QueuedMessage = { id: crypto.randomUUID(), content: steer.content, ts: steer.ts };
+ if (steer.attachments !== undefined && steer.attachments.length > 0) {
+ demoted.attachments = steer.attachments;
+ }
+ return demoted;
+}
+
function isThreadClosed(t: ThreadRecord): boolean {
return t.closed || t.info.archived === true;
}
diff --git a/packages/server/src/acp/thread-socket.test.ts b/packages/server/src/acp/thread-socket.test.ts
index 315290564..b88e49cef 100644
--- a/packages/server/src/acp/thread-socket.test.ts
+++ b/packages/server/src/acp/thread-socket.test.ts
@@ -515,7 +515,7 @@ describe('/collab/thread socket — steer', () => {
});
describe('/collab/thread socket — queue ops', () => {
- test('queue_edit / queue_remove route to the manager; unknown thread → error frame', async () => {
+ test('queue_edit / queue_remove / queue_send_now route to the manager; unknown thread → error frame', async () => {
const manager = makeManager(tmp(), tmp());
await manager.init();
const socket = attachFakeSocket(manager);
@@ -538,10 +538,16 @@ describe('/collab/thread socket — queue ops', () => {
JSON.stringify({ op: 'queue_edit', threadId: 'missing', id: 'q1', content: 'new text' }),
);
socket.emit(JSON.stringify({ op: 'queue_remove', threadId: 'missing', id: 'q1' }));
+ socket.emit(JSON.stringify({ op: 'queue_send_now', threadId: 'missing', id: 'q1' }));
socket.emit(JSON.stringify({ op: 'queue_edit', threadId: 'missing', id: 'q1', content: '' }));
- await awaitErrors(3);
-
- expect(errors().map((f) => f.code)).toEqual(['unknown-thread', 'unknown-thread', 'bad-frame']);
+ await awaitErrors(4);
+
+ expect(errors().map((f) => f.code)).toEqual([
+ 'unknown-thread',
+ 'unknown-thread',
+ 'unknown-thread',
+ 'bad-frame',
+ ]);
expect(errors()[0]?.threadId).toBe('missing');
});
@@ -566,6 +572,7 @@ describe('/collab/thread socket — queue ops', () => {
JSON.stringify({ op: 'queue_edit', threadId, id: 'gone', content: 'my correction' }),
);
socket.emit(JSON.stringify({ op: 'queue_hold', threadId, id: 'gone', held: true }));
+ socket.emit(JSON.stringify({ op: 'queue_send_now', threadId, id: 'gone' }));
socket.emit(
JSON.stringify({
op: 'queue_edit',
diff --git a/packages/server/src/acp/thread-socket.ts b/packages/server/src/acp/thread-socket.ts
index e0e2d034c..59d0d7b58 100644
--- a/packages/server/src/acp/thread-socket.ts
+++ b/packages/server/src/acp/thread-socket.ts
@@ -135,6 +135,10 @@ export function attachAcpThreadSocket(
manager.removeQueued(frame.threadId, frame.id);
return;
}
+ case 'queue_send_now': {
+ manager.sendQueuedNow(frame.threadId, frame.id);
+ return;
+ }
case 'permission_response': {
manager.respondPermission(frame.threadId, frame.requestId, frame.outcome);
return;