Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
fix(ok): notice a turn that has gone silent and say so (PRD-8279) (#4888)
Abraham74c91921bd6d
diff --git a/.changeset/prd-8279-turn-stall-notice.md b/.changeset/prd-8279-turn-stall-notice.mdnew file mode 100644index 000000000..f5802e055--- /dev/null+++ b/.changeset/prd-8279-turn-stall-notice.md@@ -0,0 +1,5 @@+---+"@inkeep/open-knowledge": patch+---++When an agent goes quiet for three minutes mid-turn, the conversation says so and counts the minutes, so you can decide whether to stop it. The notice clears as soon as the agent responds again; waiting on a permission prompt does not count.diff --git a/packages/app/src/components/acp/ThreadView.dom.test.tsx b/packages/app/src/components/acp/ThreadView.dom.test.tsxindex 79c220a80..143e85b6e 100644--- a/packages/app/src/components/acp/ThreadView.dom.test.tsx+++ b/packages/app/src/components/acp/ThreadView.dom.test.tsx@@ -2382,6 +2382,69 @@ describe('ThreadView queue rescue on Stop', () => {});});+describe('ThreadView stalled turn', () => {+ test('a silent turn says how long the agent has been quiet', () => {+ model = makeModel({ turnActive: true });+ render(+ <ThreadView info={makeInfo({ status: 'running', stalledSince: Date.now() - 4 * 60_000 })} />,+ );+ const strip = screen.getByTestId('agent-thread-stalled');+ const region = screen.getByTestId('agent-thread-stalled-region');+ expect(region.getAttribute('role')).toBe('status');+ expect(region.getAttribute('aria-live')).toBe('polite');+ expect(strip.textContent).toContain('for 4 minutes');+ expect(strip.textContent).toContain('If it looks stuck, Stop and try again.');+ });++ test('a stall that appears mid-session shows its real age on first paint', () => {+ model = makeModel({ turnActive: true });+ const { rerender } = render(<ThreadView info={makeInfo({ status: 'running' })} />);+ expect(screen.queryByTestId('agent-thread-stalled')).toBeNull();++ rerender(+ <ThreadView info={makeInfo({ status: 'running', stalledSince: Date.now() - 3 * 60_000 })} />,+ );+ expect(screen.getByTestId('agent-thread-stalled').textContent).toContain('for 3 minutes');+ });++ test('a stall that just started reads as one minute, never zero', () => {+ model = makeModel({ turnActive: true });+ render(<ThreadView info={makeInfo({ status: 'running', stalledSince: Date.now() })} />);+ expect(screen.getByTestId('agent-thread-stalled').textContent).toContain('for 1 minute.');+ });++ test('the live region is already in the DOM before a stall, so the text lands in it', () => {+ model = makeModel({ turnActive: true });+ const { rerender } = render(<ThreadView info={makeInfo({ status: 'running' })} />);+ const region = screen.getByTestId('agent-thread-stalled-region');+ expect(region.textContent).toBe('');++ rerender(+ <ThreadView info={makeInfo({ status: 'running', stalledSince: Date.now() - 5 * 60_000 })} />,+ );+ expect(screen.getByTestId('agent-thread-stalled-region')).toBe(region);+ expect(region.textContent).toContain('for 5 minutes');+ });++ test('pressing Stop retires the notice instead of telling you to press it again', () => {+ model = makeModel({ turnActive: true });+ render(+ <ThreadView info={makeInfo({ status: 'running', stalledSince: Date.now() - 60_000 })} />,+ );+ expect(screen.getByTestId('agent-thread-stalled')).toBeTruthy();++ fireEvent.click(screen.getByTestId('agent-thread-cancel'));+ expect(cancel).toHaveBeenCalledWith('thread-1');+ expect(screen.queryByTestId('agent-thread-stalled')).toBeNull();+ });++ test('once the turn is over the notice goes away', () => {+ model = makeModel({ turnActive: false });+ render(<ThreadView info={makeInfo({ status: 'ready', stalledSince: Date.now() - 60_000 })} />);+ expect(screen.queryByTestId('agent-thread-stalled')).toBeNull();+ });+});+describe('ThreadView steer now', () => {test('mid-turn with a draft, Steer now sends the correction and clears the composer', () => {model = makeModel({ turnActive: true });diff --git a/packages/app/src/components/acp/ThreadView.tsx b/packages/app/src/components/acp/ThreadView.tsxindex 5bd8a20ce..7f2dc04b7 100644--- a/packages/app/src/components/acp/ThreadView.tsx+++ b/packages/app/src/components/acp/ThreadView.tsx@@ -211,6 +211,7 @@ import {import { transcriptItemId } from './transcript-item-id';import { type ResendTarget, UserMessageActions, UserMessageEditor } from './UserMessageActions';import { useDelayedInstallStatus } from './use-delayed-install-status';+import { useMinutesSince } from './use-minutes-since';import { activeToolKind, useThinkingLine, workingStatusText } from './working-status';const CANCEL_STALL_MS = 10_000;@@ -575,6 +576,7 @@ export function ThreadView({const lastSeq = state?.lastSeq ?? null;const [cancelPending, setCancelPending] = useState(false);const [cancelStalled, setCancelStalled] = useState(false);+ const stalledMinutes = useMinutesSince(info.stalledSince);const [planApprovalPending, setPlanApprovalPending] = useState(false);useEffect(() => {@@ -1238,6 +1240,21 @@ export function ThreadView({</p>) : null}</div>+ <div role="status" aria-live="polite" data-testid="agent-thread-stalled-region">+ {info.stalledSince !== undefined && turnActive && !cancelPending && !cancelStalled ? (+ <div+ className="flex items-center gap-2 border-amber-500/30 border-t bg-amber-500/5 px-3 py-1.5 text-amber-700 text-xs dark:text-amber-400"+ data-testid="agent-thread-stalled"+ >+ <span className="flex-1">+ {t`Nothing from ${agentName} for ${plural(stalledMinutes, {+ one: '# minute',+ other: '# minutes',+ })}. If it looks stuck, Stop and try again.`}+ </span>+ </div>+ ) : null}+ </div>{info.steer !== undefined && !archived ? (<divclassName="flex items-center gap-2 border-t bg-muted/40 px-3 py-1.5 text-muted-foreground text-xs"diff --git a/packages/app/src/components/acp/use-minutes-since.dom.test.tsx b/packages/app/src/components/acp/use-minutes-since.dom.test.tsxnew file mode 100644index 000000000..43eee2c92--- /dev/null+++ b/packages/app/src/components/acp/use-minutes-since.dom.test.tsx@@ -0,0 +1,37 @@+import { act, renderHook } from '@testing-library/react';+import { afterEach, describe, expect, test, vi } from 'vitest';+import { useMinutesSince } from './use-minutes-since';++describe('useMinutesSince', () => {+ afterEach(() => {+ vi.useRealTimers();+ });++ test('a stall that begins after mount reads its true age on the very first render', () => {+ vi.useFakeTimers();+ vi.setSystemTime(new Date('2026-09-23T10:00:00Z'));+ const { result, rerender } = renderHook((since: number | undefined) => useMinutesSince(since), {+ initialProps: undefined as number | undefined,+ });+ expect(result.current).toBe(0);++ act(() => {+ vi.setSystemTime(new Date('2026-09-23T10:10:00Z'));+ });+ rerender(Date.now() - 3 * 60_000);+ expect(result.current).toBe(3);+ });++ test('the count keeps up with the clock while the stall lasts', () => {+ vi.useFakeTimers();+ vi.setSystemTime(new Date('2026-09-23T10:00:00Z'));+ const since = Date.now() - 60_000;+ const { result } = renderHook(() => useMinutesSince(since));+ expect(result.current).toBe(1);++ act(() => {+ vi.advanceTimersByTime(2 * 60_000);+ });+ expect(result.current).toBe(3);+ });+});diff --git a/packages/app/src/components/acp/use-minutes-since.test.ts b/packages/app/src/components/acp/use-minutes-since.test.tsnew file mode 100644index 000000000..5d868863f--- /dev/null+++ b/packages/app/src/components/acp/use-minutes-since.test.ts@@ -0,0 +1,12 @@+import { describe, expect, test } from 'vitest';+import { minutesSince } from './use-minutes-since';++describe('minutesSince', () => {+ test('floors to whole minutes and never reads zero', () => {+ const since = 1_000_000;+ expect(minutesSince(since, since)).toBe(1);+ expect(minutesSince(since, since + 59_000)).toBe(1);+ expect(minutesSince(since, since + 60_000)).toBe(1);+ expect(minutesSince(since, since + 4 * 60_000 + 30_000)).toBe(4);+ });+});diff --git a/packages/app/src/components/acp/use-minutes-since.ts b/packages/app/src/components/acp/use-minutes-since.tsnew file mode 100644index 000000000..ea6f6980d--- /dev/null+++ b/packages/app/src/components/acp/use-minutes-since.ts@@ -0,0 +1,18 @@+import { useLayoutEffect, useState } from 'react';++const TICK_MS = 30_000;++export function minutesSince(since: number, now: number): number {+ return Math.max(1, Math.floor((now - since) / 60_000));+}++export function useMinutesSince(since: number | undefined): number {+ const [now, setNow] = useState(0);+ useLayoutEffect(() => {+ if (since === undefined) return;+ setNow(Date.now());+ const timer = setInterval(() => setNow(Date.now()), TICK_MS);+ return () => clearInterval(timer);+ }, [since]);+ return since === undefined ? 0 : minutesSince(since, now);+}diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.jsonindex 48323e241..3e6523bb3 100644--- a/packages/app/src/locales/ar/messages.json+++ b/packages/app/src/locales/ar/messages.json@@ -5269,6 +5269,24 @@"pWT04I": ["يجري التحقق..."],"pWbsW6": ["يجري تحميل المستندات"],"pXB6SL": ["مجلد المهارة نفسه — المصدر الذي تنسخ منه المواقع الأخرى أو ترتبط به"],+ "pZ-2hM": [+ "لا شيء من ",+ ["agentName"],+ " منذ ",+ [+ "stalledMinutes",+ "plural",+ {+ "zero": ["#", " دقيقة"],+ "one": ["دقيقة واحدة"],+ "two": ["دقيقتين"],+ "few": ["#", " دقائق"],+ "many": ["#", " دقيقة"],+ "other": ["#", " دقيقة"]+ }+ ],+ ". إن بدا عالقًا، أوقفه وحاول مجددًا."+ ],"pZ91JC": ["تمت تهيئة OpenKnowledge في ",["gitRoot"],diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.poindex 65aaa4fb2..cd1518b83 100644--- a/packages/app/src/locales/ar/messages.po+++ b/packages/app/src/locales/ar/messages.po@@ -9610,6 +9610,10 @@ msgstr "لا شيء ({0} لا يمكن أن يطابق مستندًا)"msgid "nothing ({0} is not a valid pattern)"msgstr "لا شيء ({0} ليس نمطًا صالحًا)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "لا شيء من {agentName} منذ {stalledMinutes, plural, zero {# دقيقة} one {دقيقة واحدة} two {دقيقتين} few {# دقائق} many {# دقيقة} other {# دقيقة}}. إن بدا عالقًا، أوقفه وحاول مجددًا."+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "لا يغادر أي شيء جهازك حتى تراجع التقرير وترسله."diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.jsonindex 029646ed9..e51bbc0ae 100644--- a/packages/app/src/locales/bn/messages.json+++ b/packages/app/src/locales/bn/messages.json@@ -4504,6 +4504,12 @@"pWT04I": ["পরীক্ষা করা হচ্ছে…"],"pWbsW6": ["নথি লোড হচ্ছে"],"pXB6SL": ["স্কিলের নিজের ফোল্ডার — যে উৎস থেকে অন্য জায়গাগুলো অনুলিপি করে বা লিংক করে"],+ "pZ-2hM": [+ ["agentName"],+ " থেকে ",+ ["stalledMinutes", "plural", { "one": ["#", " মিনিট"], "other": ["#", " মিনিট"] }],+ " ধরে কিছুই আসেনি। আটকে গেছে মনে হলে, থামিয়ে আবার চেষ্টা করুন।"+ ],"pZ91JC": [["gitRoot"],"-এ OpenKnowledge চালু করা হয়েছে: ",diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.poindex be3534914..7d9e6ffde 100644--- a/packages/app/src/locales/bn/messages.po+++ b/packages/app/src/locales/bn/messages.po@@ -9606,6 +9606,10 @@ msgstr "কিছুই নয় ({0} কোনো নথির সঙ্গেmsgid "nothing ({0} is not a valid pattern)"msgstr "কিছুই নয় ({0} একটি বৈধ প্যাটার্ন নয়)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "{agentName} থেকে {stalledMinutes, plural, one {# মিনিট} other {# মিনিট}} ধরে কিছুই আসেনি। আটকে গেছে মনে হলে, থামিয়ে আবার চেষ্টা করুন।"+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "রিপোর্ট পরীক্ষা করে না পাঠানো পর্যন্ত কম্পিউটার থেকে কিছুই বাইরে যায় না।"diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.jsonindex e7d0885e9..f83de3e50 100644--- a/packages/app/src/locales/en/messages.json+++ b/packages/app/src/locales/en/messages.json@@ -4656,6 +4656,13 @@"pWT04I": ["Checking..."],"pWbsW6": ["Loading docs"],"pXB6SL": ["The skill's own folder — the source other locations copy or link from"],+ "pZ-2hM": [+ "Nothing from ",+ ["agentName"],+ " for ",+ ["stalledMinutes", "plural", { "one": ["#", " minute"], "other": ["#", " minutes"] }],+ ". If it looks stuck, Stop and try again."+ ],"pZ91JC": ["Initialized OpenKnowledge at ",["gitRoot"],diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.poindex 3b0973492..2b008952c 100644--- a/packages/app/src/locales/en/messages.po+++ b/packages/app/src/locales/en/messages.po@@ -9610,6 +9610,10 @@ msgstr "nothing ({0} cannot match a doc)"msgid "nothing ({0} is not a valid pattern)"msgstr "nothing ({0} is not a valid pattern)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "Nothing leaves your computer until you review and send the report."diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.jsonindex 07a80a592..3aac13c1f 100644--- a/packages/app/src/locales/es/messages.json+++ b/packages/app/src/locales/es/messages.json@@ -5382,6 +5382,17 @@"pXB6SL": ["La carpeta propia de la habilidad: el origen del que copian o al que enlazan las demás ubicaciones"],+ "pZ-2hM": [+ "Nada de ",+ ["agentName"],+ " desde hace ",+ [+ "stalledMinutes",+ "plural",+ { "one": ["#", " minuto"], "many": ["#", " minutos"], "other": ["#", " minutos"] }+ ],+ ". Si parece atascado, detenlo y vuelve a intentarlo."+ ],"pZ91JC": ["OpenKnowledge se inicializó en ",["gitRoot"],diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.poindex 4efea6bf7..e956b07bf 100644--- a/packages/app/src/locales/es/messages.po+++ b/packages/app/src/locales/es/messages.po@@ -9610,6 +9610,10 @@ msgstr "nada ({0} no puede coincidir con un documento)"msgid "nothing ({0} is not a valid pattern)"msgstr "nada ({0} no es un patrón válido)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "Nada de {agentName} desde hace {stalledMinutes, plural, one {# minuto} many {# minutos} other {# minutos}}. Si parece atascado, detenlo y vuelve a intentarlo."+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "Nada sale de tu equipo hasta que revises y envíes el informe."diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.jsonindex 989bdeddf..dc24d3cc4 100644--- a/packages/app/src/locales/fr/messages.json+++ b/packages/app/src/locales/fr/messages.json@@ -5425,6 +5425,17 @@"pXB6SL": ["Le dossier propre à la compétence — la source depuis laquelle les autres emplacements copient ou pointent"],+ "pZ-2hM": [+ "Rien de ",+ ["agentName"],+ " depuis ",+ [+ "stalledMinutes",+ "plural",+ { "one": ["#", " minute"], "many": ["#", " minutes"], "other": ["#", " minutes"] }+ ],+ ". Si ça semble bloqué, arrêtez et réessayez."+ ],"pZ91JC": ["OpenKnowledge initialisé dans ",["gitRoot"],diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.poindex d87cc5800..7158dad94 100644--- a/packages/app/src/locales/fr/messages.po+++ b/packages/app/src/locales/fr/messages.po@@ -9610,6 +9610,10 @@ msgstr "rien ({0} ne peut correspondre à aucun document)"msgid "nothing ({0} is not a valid pattern)"msgstr "rien ({0} n'est pas un motif valide)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "Rien de {agentName} depuis {stalledMinutes, plural, one {# minute} many {# minutes} other {# minutes}}. Si ça semble bloqué, arrêtez et réessayez."+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "Rien ne quitte votre ordinateur avant la vérification et l’envoi du rapport."diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.jsonindex 15636fb63..711a5a164 100644--- a/packages/app/src/locales/hi/messages.json+++ b/packages/app/src/locales/hi/messages.json@@ -4501,6 +4501,12 @@"pWT04I": ["जाँचा जा रहा है…"],"pWbsW6": ["दस्तावेज़ लोड हो रहे हैं"],"pXB6SL": ["स्किल का अपना फ़ोल्डर — वह स्रोत जिससे बाकी स्थान प्रति बनाते या लिंक करते हैं"],+ "pZ-2hM": [+ ["agentName"],+ " से ",+ ["stalledMinutes", "plural", { "one": ["#", " मिनट"], "other": ["#", " मिनट"] }],+ " से कुछ नहीं आया। अगर अटका हुआ लगे, तो रोकें और फिर कोशिश करें।"+ ],"pZ91JC": [["gitRoot"]," पर OpenKnowledge आरंभ किया गया: ",diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.poindex 912e9f180..877d584fe 100644--- a/packages/app/src/locales/hi/messages.po+++ b/packages/app/src/locales/hi/messages.po@@ -9606,6 +9606,10 @@ msgstr "कुछ नहीं ({0} किसी दस्तावेज़ सmsgid "nothing ({0} is not a valid pattern)"msgstr "कुछ नहीं ({0} एक मान्य पैटर्न नहीं है)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "{agentName} से {stalledMinutes, plural, one {# मिनट} other {# मिनट}} से कुछ नहीं आया। अगर अटका हुआ लगे, तो रोकें और फिर कोशिश करें।"+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "रिपोर्ट की जाँच करके भेजने तक आपके कंप्यूटर से कुछ भी बाहर नहीं जाता।"diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.jsonindex 44f8c6686..5d4fae251 100644--- a/packages/app/src/locales/id/messages.json+++ b/packages/app/src/locales/id/messages.json@@ -4690,6 +4690,13 @@"pXB6SL": ["Folder milik keterampilan itu sendiri — sumber tempat lokasi lain menyalin atau menaut"],+ "pZ-2hM": [+ "Tidak ada kabar dari ",+ ["agentName"],+ " selama ",+ ["stalledMinutes", "plural", { "other": ["#", " menit"] }],+ ". Jika tampak macet, hentikan dan coba lagi."+ ],"pZ91JC": ["OpenKnowledge diinisialisasi di ",["gitRoot"],diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.poindex 65870950b..ff509a86e 100644--- a/packages/app/src/locales/id/messages.po+++ b/packages/app/src/locales/id/messages.po@@ -9606,6 +9606,10 @@ msgstr "tidak apa pun ({0} tidak bisa cocok dengan sebuah dokumen)"msgid "nothing ({0} is not a valid pattern)"msgstr "tidak apa pun ({0} bukan pola yang valid)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "Tidak ada kabar dari {agentName} selama {stalledMinutes, plural, other {# menit}}. Jika tampak macet, hentikan dan coba lagi."+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "Tidak ada yang dikirim dari komputer sampai laporan ditinjau dan dikirim."diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.jsonindex 57502f9e1..0c7a3f16e 100644--- a/packages/app/src/locales/ko/messages.json+++ b/packages/app/src/locales/ko/messages.json@@ -4483,6 +4483,12 @@"pWT04I": ["확인 중…"],"pWbsW6": ["문서 불러오는 중"],"pXB6SL": ["스킬 자체의 폴더. 다른 위치가 복사하거나 링크하는 소스입니다"],+ "pZ-2hM": [+ ["stalledMinutes", "plural", { "other": ["#", "분"] }],+ " 동안 ",+ ["agentName"],+ "에서 아무 응답이 없습니다. 멈춘 것 같으면 중지하고 다시 시도하세요."+ ],"pZ91JC": [["gitRoot"],"에서 OpenKnowledge를 초기화했습니다. .git 폴더가 포함되어 있어 ",diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.poindex 4e22636ed..d1a2dedb7 100644--- a/packages/app/src/locales/ko/messages.po+++ b/packages/app/src/locales/ko/messages.po@@ -9610,6 +9610,10 @@ msgstr "없음 ({0}로는 문서와 일치하지 않음)"msgid "nothing ({0} is not a valid pattern)"msgstr "없음 ({0}로는 유효한 패턴이 아님)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "{stalledMinutes, plural, other {#분}} 동안 {agentName}에서 아무 응답이 없습니다. 멈춘 것 같으면 중지하고 다시 시도하세요."+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "보고서를 검토하고 보내기 전에는 어떤 정보도 컴퓨터 밖으로 전송되지 않습니다."diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.jsonindex 7bc0b4f51..cbf971e6d 100644--- a/packages/app/src/locales/pseudo/messages.json+++ b/packages/app/src/locales/pseudo/messages.json@@ -4656,6 +4656,13 @@"pWT04I": ["Ćĥēćķĩńĝ..."],"pWbsW6": ["Ĺōàďĩńĝ ďōćś"],"pXB6SL": ["Ţĥē śķĩĺĺ'ś ōŵń ƒōĺďēŕ — ţĥē śōũŕćē ōţĥēŕ ĺōćàţĩōńś ćōƥŷ ōŕ ĺĩńķ ƒŕōḿ"],+ "pZ-2hM": [+ "Ńōţĥĩńĝ ƒŕōḿ ",+ ["agentName"],+ " ƒōŕ ",+ ["stalledMinutes", "plural", { "one": ["#", " ḿĩńũţē"], "other": ["#", " ḿĩńũţēś"] }],+ ". Ĩƒ ĩţ ĺōōķś śţũćķ, Śţōƥ àńď ţŕŷ àĝàĩń."+ ],"pZ91JC": ["Ĩńĩţĩàĺĩźēď ŌƥēńĶńōŵĺēďĝē àţ ",["gitRoot"],diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.poindex 2ee9b30e6..1783c4588 100644--- a/packages/app/src/locales/pseudo/messages.po+++ b/packages/app/src/locales/pseudo/messages.po@@ -9606,6 +9606,10 @@ msgstr ""msgid "nothing ({0} is not a valid pattern)"msgstr ""+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr ""+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr ""diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.jsonindex 99be76df6..f4d2c63eb 100644--- a/packages/app/src/locales/pt-BR/messages.json+++ b/packages/app/src/locales/pt-BR/messages.json@@ -5268,6 +5268,17 @@"pXB6SL": ["A pasta própria da habilidade — a fonte de onde os outros locais copiam ou para onde apontam"],+ "pZ-2hM": [+ "Nada de ",+ ["agentName"],+ " há ",+ [+ "stalledMinutes",+ "plural",+ { "one": ["#", " minuto"], "many": ["#", " minutos"], "other": ["#", " minutos"] }+ ],+ ". Se parecer travado, pare e tente de novo."+ ],"pZ91JC": ["OpenKnowledge inicializado em ",["gitRoot"],diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.poindex ae7d8a053..9432856a3 100644--- a/packages/app/src/locales/pt-BR/messages.po+++ b/packages/app/src/locales/pt-BR/messages.po@@ -9606,6 +9606,10 @@ msgstr "nada ({0} não pode corresponder a um documento)"msgid "nothing ({0} is not a valid pattern)"msgstr "nada ({0} não é um padrão válido)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "Nada de {agentName} há {stalledMinutes, plural, one {# minuto} many {# minutos} other {# minutos}}. Se parecer travado, pare e tente de novo."+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "Nada sai do computador até que o relatório seja revisado e enviado."diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.jsonindex 72bdfd17e..59f7cde31 100644--- a/packages/app/src/locales/ur/messages.json+++ b/packages/app/src/locales/ur/messages.json@@ -4755,6 +4755,12 @@"pWT04I": ["جانچا جا رہا ہے..."],"pWbsW6": ["دستاویزات لوڈ ہو رہی ہیں"],"pXB6SL": ["مہارت کا اپنا فولڈر — وہ ماخذ جس سے دیگر مقامات نقل کرتے یا جڑتے ہیں"],+ "pZ-2hM": [+ ["agentName"],+ " کی طرف سے ",+ ["stalledMinutes", "plural", { "one": ["#", " منٹ"], "other": ["#", " منٹ"] }],+ " سے کچھ نہیں آیا۔ اگر پھنسا ہوا لگے تو روکیں اور دوبارہ کوشش کریں۔"+ ],"pZ91JC": [["gitRoot"]," پر OpenKnowledge شروع کر دیا گیا: ",diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.poindex 877545afd..4753e704b 100644--- a/packages/app/src/locales/ur/messages.po+++ b/packages/app/src/locales/ur/messages.po@@ -9610,6 +9610,10 @@ msgstr "کچھ نہیں ({0} کسی دستاویز سے مماثل نہیں ہوmsgid "nothing ({0} is not a valid pattern)"msgstr "کچھ نہیں ({0} درست پیٹرن نہیں ہے)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "{agentName} کی طرف سے {stalledMinutes, plural, one {# منٹ} other {# منٹ}} سے کچھ نہیں آیا۔ اگر پھنسا ہوا لگے تو روکیں اور دوبارہ کوشش کریں۔"+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "رپورٹ کا جائزہ لے کر بھیجنے تک کمپیوٹر سے کچھ بھی باہر نہیں جاتا۔"diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.jsonindex c6efae04b..7c6fe3ad3 100644--- a/packages/app/src/locales/zh-Hans/messages.json+++ b/packages/app/src/locales/zh-Hans/messages.json@@ -4059,6 +4059,12 @@"pWT04I": ["正在检查…"],"pWbsW6": ["正在加载文档"],"pXB6SL": ["技能自己的文件夹——其他位置从这里复制或链接"],+ "pZ-2hM": [+ ["agentName"],+ " 已有 ",+ ["stalledMinutes", "plural", { "other": ["#", " 分钟"] }],+ "没有任何响应。如果看起来卡住了,请停止并重试。"+ ],"pZ91JC": ["已在 ",["gitRoot"],diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.poindex 74b4d9592..1154111d2 100644--- a/packages/app/src/locales/zh-Hans/messages.po+++ b/packages/app/src/locales/zh-Hans/messages.po@@ -9610,6 +9610,10 @@ msgstr "无({0} 无法匹配任何文档)"msgid "nothing ({0} is not a valid pattern)"msgstr "无({0} 不是有效的模式)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "{agentName} 已有 {stalledMinutes, plural, other {# 分钟}}没有任何响应。如果看起来卡住了,请停止并重试。"+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "在您检查并发送报告之前,任何信息都不会离开您的计算机。"diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.jsonindex 76a08cf16..44518458c 100644--- a/packages/app/src/locales/zh-Hant/messages.json+++ b/packages/app/src/locales/zh-Hant/messages.json@@ -4079,6 +4079,12 @@"pWT04I": ["正在檢查…"],"pWbsW6": ["正在載入文件"],"pXB6SL": ["技能自己的資料夾——其他位置從這裡複製或連結"],+ "pZ-2hM": [+ ["agentName"],+ " 已有 ",+ ["stalledMinutes", "plural", { "other": ["#", " 分鐘"] }],+ "沒有任何回應。如果看起來卡住了,請停止並重試。"+ ],"pZ91JC": ["已在 ",["gitRoot"],diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.poindex b293e1731..8927e2c92 100644--- a/packages/app/src/locales/zh-Hant/messages.po+++ b/packages/app/src/locales/zh-Hant/messages.po@@ -9610,6 +9610,10 @@ msgstr "無({0} 無法比對到任何文件)"msgid "nothing ({0} is not a valid pattern)"msgstr "無({0} 不是有效的模式)"+#: src/components/acp/ThreadView.tsx+msgid "Nothing from {agentName} for {stalledMinutes, plural, one {# minute} other {# minutes}}. If it looks stuck, Stop and try again."+msgstr "{agentName} 已有 {stalledMinutes, plural, other {# 分鐘}}沒有任何回應。如果看起來卡住了,請停止並重試。"+#: src/components/ReportBugDialogBody.tsxmsgid "Nothing leaves your computer until you review and send the report."msgstr "在您檢查並傳送報告之前,任何資訊都不會離開您的電腦。"diff --git a/packages/core/src/acp/thread-protocol.ts b/packages/core/src/acp/thread-protocol.tsindex a10f42178..212967f4e 100644--- a/packages/core/src/acp/thread-protocol.ts+++ b/packages/core/src/acp/thread-protocol.ts@@ -129,6 +129,7 @@ export interface ThreadInfo {resumable?: boolean;queue?: QueuedMessage[];steer?: SteerMessage;+ stalledSince?: number;signInOutput?: string[];}diff --git a/packages/server/src/acp/thread-manager.integration.test.ts b/packages/server/src/acp/thread-manager.integration.test.tsindex d3e31d95c..8913b14c0 100644--- a/packages/server/src/acp/thread-manager.integration.test.ts+++ b/packages/server/src/acp/thread-manager.integration.test.ts@@ -83,6 +83,7 @@ function makeManager(authenticateTimeoutMs?: number;unwatchedTurnCancelMs?: number;unwatchedTurnKillMs?: number;+ turnStallMs?: number;isIgnoredPath?: (relPosix: string) => boolean;registry?: AcpRegistry;runtimeInstall?: AcpThreadManagerOptions['runtimeInstall'];@@ -3004,6 +3005,235 @@ describe('AcpThreadManager prompt queueing', () => {await manager.closeThread(info.threadId);}, 40_000);++ function writeStutterAgent(localDir: string, releasePath: string): void {+ writeRequestingAgentEntry(+ localDir,+ 'stutter-agent',+ `+ notify({ sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'one;' } });+ const fs = await import('node:fs');+ while (!fs.existsSync(${JSON.stringify(releasePath)})) {+ await new Promise((r) => setTimeout(r, 20));+ }+ notify({ sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'two;' } });+ await new Promise((r) => setTimeout(r, 900));+ finish();+`,+ );+ }++ test('a turn that goes silent is flagged as stalled, and the flag is never persisted', async () => {+ const contentDir = tmp();+ const localDir = tmp();+ writeGateAgent(localDir, join(localDir, 'release-turn'));+ const warn = vi.spyOn(log, 'warn');+ const manager = makeManager(contentDir, localDir, { turnStallMs: 250 });+ await manager.init();+ const info = await manager.createThread({ agent: { source: 'custom', id: 'gate-agent' } });+ await manager.subscribe(info.threadId, 0, () => {});+ 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');+ await waitUntil(+ () => manager.getInfo(info.threadId)?.stalledSince !== undefined,+ 5_000,+ 'stall flagged',+ );+ const stalledSince = manager.getInfo(info.threadId)?.stalledSince ?? 0;+ expect(Date.now() - stalledSince).toBeGreaterThanOrEqual(250);+ expect(warn).toHaveBeenCalledWith(+ expect.objectContaining({ threadId: info.threadId, silentMs: expect.any(Number) }),+ '[acp-threads] turn stalled: no agent activity',+ );++ await manager.closeThread(info.threadId);+ const manager2 = makeManager(contentDir, localDir);+ await manager2.init();+ expect(manager2.getInfo(info.threadId)).toBeDefined();+ expect(manager2.getInfo(info.threadId)?.stalledSince).toBeUndefined();+ }, 40_000);++ test('typing while the agent is quiet neither delays the notice nor restarts its count', async () => {+ const contentDir = tmp();+ const localDir = tmp();+ writeGateAgent(localDir, join(localDir, 'release-turn'));+ const manager = makeManager(contentDir, localDir, { turnStallMs: 400 });+ const info = await manager.createThread({ agent: { source: 'custom', id: 'gate-agent' } });+ await manager.subscribe(info.threadId, 0, () => {});+ 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');+ await new Promise((resolve) => setTimeout(resolve, 150));+ const queuedAt = Date.now();+ manager.sendPrompt(info.threadId, 'queued while the agent is quiet');+ expect(manager.getInfo(info.threadId)?.lastActivityAt).toBeGreaterThanOrEqual(queuedAt);++ await waitUntil(+ () => manager.getInfo(info.threadId)?.stalledSince !== undefined,+ 5_000,+ 'stall flagged',+ );+ expect(manager.getInfo(info.threadId)?.stalledSince ?? Number.POSITIVE_INFINITY).toBeLessThan(+ queuedAt,+ );++ await manager.closeThread(info.threadId);+ }, 40_000);++ function writeReadingAgent(localDir: string, releasePath: string, readPath: string): void {+ writeRequestingAgentEntry(+ localDir,+ 'reading-agent',+ `+ notify({ sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'one;' } });+ const fs = await import('node:fs');+ while (!fs.existsSync(${JSON.stringify(releasePath)})) {+ await new Promise((r) => setTimeout(r, 20));+ }+ await request('fs/read_text_file', { sessionId: msg.params.sessionId, path: ${JSON.stringify(readPath)} });+ await new Promise((r) => setTimeout(r, 300));+ finish();+`,+ );+ }++ test('a client file read from a quiet agent counts as activity', async () => {+ const contentDir = tmp();+ const localDir = tmp();+ const releasePath = join(localDir, 'release-turn');+ const readPath = join(contentDir, 'note.md');+ writeFileSync(readPath, '# hello\n');+ writeReadingAgent(localDir, releasePath, readPath);+ const infoLog = vi.spyOn(log, 'info');+ const manager = makeManager(contentDir, localDir, { turnStallMs: 250 });+ const info = await manager.createThread({ agent: { source: 'custom', id: 'reading-agent' } });+ await manager.subscribe(info.threadId, 0, () => {});+ await waitUntil(() => manager.getInfo(info.threadId)?.status === 'ready', 15_000, 'ready');++ manager.sendPrompt(info.threadId, 'go');+ await waitUntil(+ () => manager.getInfo(info.threadId)?.stalledSince !== undefined,+ 5_000,+ 'stall flagged',+ );+ writeFileSync(releasePath, 'go');+ await waitUntil(+ () => infoLog.mock.calls.some((call) => call[1] === '[acp-threads] turn resumed after stall'),+ 5_000,+ 'the file read cleared the stall',+ );+ await waitUntil(() => !internals(manager).turnActive(info.threadId), 20_000, 'turn ended');++ await manager.closeThread(info.threadId);+ }, 40_000);++ test('Stop retires the stall flag at once, even while the agent ignores the cancel', async () => {+ const contentDir = tmp();+ const localDir = tmp();+ writeGateAgent(localDir, join(localDir, 'release-turn'));+ const manager = makeManager(contentDir, localDir, { turnStallMs: 250 });+ const info = await manager.createThread({ agent: { source: 'custom', id: 'gate-agent' } });+ await manager.subscribe(info.threadId, 0, () => {});+ await waitUntil(() => manager.getInfo(info.threadId)?.status === 'ready', 15_000, 'ready');++ manager.sendPrompt(info.threadId, 'WAIT at the gate');+ await waitUntil(+ () => manager.getInfo(info.threadId)?.stalledSince !== undefined,+ 5_000,+ 'stall flagged',+ );+ manager.cancel(info.threadId);+ expect(manager.getInfo(info.threadId)?.stalledSince).toBeUndefined();+ expect(internals(manager).turnActive(info.threadId)).toBe(true);++ await manager.closeThread(info.threadId);+ }, 40_000);++ test('a turn waiting on your permission is not a stall', async () => {+ const localDir = tmp();+ writeExampleAgentEntry(localDir);+ const warn = vi.spyOn(log, 'warn');+ const manager = makeManager(tmp(), localDir, { turnStallMs: 200 });+ const info = await manager.createThread({ agent: { source: 'custom', id: 'example' } });+ 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, 'Improve my project please');+ await waitUntil(+ () => manager.getInfo(info.threadId)?.status === 'awaiting_permission',+ 20_000,+ 'permission pending',+ );+ const stallWarnings = (): number =>+ warn.mock.calls.filter((call) => call[1] === '[acp-threads] turn stalled: no agent activity')+ .length;+ const before = stallWarnings();+ expect(manager.getInfo(info.threadId)?.stalledSince).toBeUndefined();+ await new Promise((resolve) => setTimeout(resolve, 700));+ expect(manager.getInfo(info.threadId)?.stalledSince).toBeUndefined();+ expect(stallWarnings()).toBe(before);++ const request = events+ .map((e) => e.event)+ .find(+ (e): e is Extract<ThreadEvent, { kind: 'permission_request' }> =>+ e.kind === 'permission_request',+ );+ if (request === undefined) throw new Error('permission request missing');+ manager.respondPermission(info.threadId, request.requestId, { kind: 'cancelled' });+ expect(manager.getInfo(info.threadId)?.stalledSince).toBeUndefined();++ await manager.closeThread(info.threadId);+ }, 45_000);++ test('the stall clears the moment the agent speaks again, and the turn logs its lifecycle', async () => {+ const contentDir = tmp();+ const localDir = tmp();+ const releasePath = join(localDir, 'release-turn');+ writeStutterAgent(localDir, releasePath);+ const infoLog = vi.spyOn(log, 'info');+ const warn = vi.spyOn(log, 'warn');+ const manager = makeManager(contentDir, localDir, { turnStallMs: 250 });+ const info = await manager.createThread({ agent: { source: 'custom', id: 'stutter-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, 'go');+ await waitUntil(+ () => manager.getInfo(info.threadId)?.stalledSince !== undefined,+ 5_000,+ 'first stall',+ );+ writeFileSync(releasePath, 'go');+ await waitUntil(+ () => infoLog.mock.calls.some((call) => call[1] === '[acp-threads] turn resumed after stall'),+ 5_000,+ 'stall cleared on activity',+ );+ await waitUntil(+ () => events.filter((e) => e.event.kind === 'turn_ended').length === 1,+ 20_000,+ 'turn ended',+ );+ expect(manager.getInfo(info.threadId)?.stalledSince).toBeUndefined();+ expect(agentText(events)).toBe('one;two;');+ const messages = infoLog.mock.calls.map((call) => call[1]);+ expect(messages).toContain('[acp-threads] turn started');+ const ended = infoLog.mock.calls.find((call) => call[1] === '[acp-threads] turn ended');+ const endedFields = ended?.[0] as { durationMs?: number } | undefined;+ expect(endedFields).toMatchObject({ threadId: info.threadId, outcome: 'end_turn' });+ expect(endedFields?.durationMs).toBeGreaterThan(0);+ expect(+ warn.mock.calls.filter((call) => call[1] === '[acp-threads] turn stalled: no agent activity'),+ ).toHaveLength(2);++ 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.tsindex 383cd673d..35ce5d516 100644--- a/packages/server/src/acp/thread-manager.ts+++ b/packages/server/src/acp/thread-manager.ts@@ -27,6 +27,7 @@ import {type SessionUpdate,type SetSessionConfigOptionRequest,type SetSessionConfigOptionResponse,+ type StopReason,type ToolCallUpdate,} from '@agentclientprotocol/sdk';import {@@ -162,6 +163,7 @@ const REPLAY_CHUNK_SIZE = 512;const DEFAULT_UNWATCHED_TURN_CANCEL_MS = 10 * 60 * 1000;const DEFAULT_UNWATCHED_TURN_KILL_MS = 20 * 60 * 1000;const DEFAULT_STEER_STALL_MS = 10_000;+const DEFAULT_TURN_STALL_MS = 3 * 60 * 1000;const DEFAULT_AUTHENTICATE_TIMEOUT_MS = 5 * 60 * 1000;const STDERR_TAIL_LINES = 40;const SIGN_IN_OUTPUT_LINES = 6;@@ -321,6 +323,9 @@ interface ThreadRecord {turnActive: boolean;cancelRequested: boolean;steerStallTimer: ReturnType<typeof setTimeout> | null;+ stallTimer: ReturnType<typeof setTimeout> | null;+ turnStartedAt: number | null;+ agentActivityAt: number;unwatchedSince: number | null;unwatchedCancelSent: boolean;pendingBroadcast: ThreadEvent[];@@ -406,6 +411,7 @@ export interface AcpThreadManagerOptions {authenticateTimeoutMs?: number;unwatchedTurnCancelMs?: number;unwatchedTurnKillMs?: number;+ turnStallMs?: number;}export function buildOkMcpStdioCommand(@@ -450,6 +456,7 @@ export class AcpThreadManager {private readonly authenticateTimeoutMs: number;private readonly unwatchedTurnCancelMs: number;private readonly unwatchedTurnKillMs: number;+ private readonly turnStallMs: number;private readonly persistence: ThreadPersistenceStore;private readonly resolveLoginShellPath: () => Promise<string | null>;private readonly healthyInterpreters = new Set<string>();@@ -467,6 +474,7 @@ export class AcpThreadManager {this.authenticateTimeoutMs = opts.authenticateTimeoutMs ?? DEFAULT_AUTHENTICATE_TIMEOUT_MS;this.unwatchedTurnCancelMs = opts.unwatchedTurnCancelMs ?? DEFAULT_UNWATCHED_TURN_CANCEL_MS;this.unwatchedTurnKillMs = opts.unwatchedTurnKillMs ?? DEFAULT_UNWATCHED_TURN_KILL_MS;+ this.turnStallMs = opts.turnStallMs ?? DEFAULT_TURN_STALL_MS;this.persistence = new ThreadPersistenceStore({primaryDir: opts.globalDir ?? opts.localDir,legacyDir: opts.globalDir !== null ? opts.localDir : null,@@ -653,6 +661,9 @@ export class AcpThreadManager {turnActive: false,cancelRequested: false,steerStallTimer: null,+ stallTimer: null,+ turnStartedAt: null,+ agentActivityAt: now,unwatchedSince: now,unwatchedCancelSent: false,pendingBroadcast: [],@@ -919,6 +930,7 @@ export class AcpThreadManager {this.handlePermissionRequest(record, ctx.params.toolCall, ctx.params.options),).onRequest(acpMethods.client.fs.readTextFile, async (ctx) => {+ this.touchTurnActivity(record);try {return await this.handleFsRead(ctx.params.path,@@ -956,20 +968,24 @@ export class AcpThreadManager {}}).onRequest(acpMethods.client.terminal.create, (ctx) => {- record.info.lastActivityAt = Date.now();+ this.touchTurnActivity(record);return terminals.create(ctx.params);})- .onRequest(acpMethods.client.terminal.output, (ctx) =>- terminals.output(ctx.params.terminalId),- )- .onRequest(acpMethods.client.terminal.waitForExit, (ctx) =>- terminals.waitForExit(ctx.params.terminalId),- )+ .onRequest(acpMethods.client.terminal.output, (ctx) => {+ this.touchTurnActivity(record);+ return terminals.output(ctx.params.terminalId);+ })+ .onRequest(acpMethods.client.terminal.waitForExit, (ctx) => {+ this.touchTurnActivity(record);+ return terminals.waitForExit(ctx.params.terminalId);+ }).onRequest(acpMethods.client.terminal.kill, async (ctx) => {+ this.touchTurnActivity(record);await terminals.kill(ctx.params.terminalId);return {};}).onRequest(acpMethods.client.terminal.release, async (ctx) => {+ this.touchTurnActivity(record);await terminals.release(ctx.params.terminalId);return {};})@@ -2349,6 +2365,70 @@ export class AcpThreadManager {return steer;}+ private armStallTimer(t: ThreadRecord, delayMs = this.turnStallMs): void {+ if (t.stallTimer !== null) clearTimeout(t.stallTimer);+ const timer = setTimeout(() => this.checkStall(t), delayMs);+ timer.unref?.();+ t.stallTimer = timer;+ }++ private checkStall(t: ThreadRecord): void {+ t.stallTimer = null;+ if (t.closed || !t.turnActive || t.info.stalledSince !== undefined) return;+ if (t.pendingPermissions.size > 0) {+ this.armStallTimer(t);+ return;+ }+ const silentMs = Date.now() - t.agentActivityAt;+ if (silentMs < this.turnStallMs) {+ this.armStallTimer(t, this.turnStallMs - silentMs);+ return;+ }+ t.info.stalledSince = t.agentActivityAt;+ this.opts.log.warn(+ { threadId: t.info.threadId, agentId: t.info.agent.id, silentMs },+ '[acp-threads] turn stalled: no agent activity',+ );+ this.emitInfo(t);+ }++ private touchTurnActivity(t: ThreadRecord): void {+ const now = Date.now();+ t.agentActivityAt = now;+ t.info.lastActivityAt = now;+ if (t.info.stalledSince === undefined) return;+ const stalledForMs = Date.now() - t.info.stalledSince;+ t.info.stalledSince = undefined;+ this.opts.log.info(+ { threadId: t.info.threadId, agentId: t.info.agent.id, stalledForMs },+ '[acp-threads] turn resumed after stall',+ );+ this.emitInfo(t);+ if (t.turnActive) this.armStallTimer(t);+ }++ private clearStall(t: ThreadRecord): void {+ if (t.stallTimer !== null) {+ clearTimeout(t.stallTimer);+ t.stallTimer = null;+ }+ t.info.stalledSince = undefined;+ }++ private logTurnEnded(t: ThreadRecord, outcome: StopReason | 'failed'): void {+ const startedAt = t.turnStartedAt;+ t.turnStartedAt = null;+ this.opts.log.info(+ {+ threadId: t.info.threadId,+ agentId: t.info.agent.id,+ outcome,+ durationMs: startedAt === null ? undefined : Date.now() - startedAt,+ },+ '[acp-threads] turn ended',+ );+ }+editQueued(threadId: string, id: string, content: string): boolean {const t = this.mustGet(threadId);const queue = t.info.queue ?? [];@@ -2475,8 +2555,15 @@ export class AcpThreadManager {}t.turnActive = true;t.cancelRequested = false;- this.appendEvent(t, { kind: 'turn_started', ts: Date.now() });+ t.turnStartedAt = Date.now();+ t.agentActivityAt = t.turnStartedAt;+ this.appendEvent(t, { kind: 'turn_started', ts: t.turnStartedAt });this.emitStatus(t, 'running');+ this.opts.log.info(+ { threadId: t.info.threadId, agentId: t.info.agent.id },+ '[acp-threads] turn started',+ );+ this.armStallTimer(t);const sessionId = t.sessionId;const promptBuild = buildPromptBlocks(@@ -2521,6 +2608,8 @@ export class AcpThreadManager {requestPromise.then((response) => {t.turnActive = false;+ this.clearStall(t);+ this.logTurnEnded(t, response.stopReason);if (isThreadClosed(t)) return;this.appendEvent(t, {kind: 'turn_ended',@@ -2543,6 +2632,8 @@ export class AcpThreadManager {}).catch(async (err) => {t.turnActive = false;+ this.clearStall(t);+ this.logTurnEnded(t, t.cancelRequested ? 'cancelled' : 'failed');if (isThreadClosed(t)) return;this.appendEvent(t, { kind: 'turn_ended', stopReason: 'cancelled', ts: Date.now() });if (t.sessionId !== null && t.conn !== null) {@@ -2596,6 +2687,9 @@ export class AcpThreadManager {}if (t.conn === null || t.sessionId === null) return;if (t.turnActive) t.cancelRequested = true;+ const wasStalled = t.info.stalledSince !== undefined;+ this.clearStall(t);+ if (wasStalled) this.emitInfo(t);this.failPendingPermissions(t);this.restoreRunningAfterPermission(t);t.conn.agent@@ -2779,6 +2873,7 @@ export class AcpThreadManager {if (pending === undefined) return;t.pendingPermissions.delete(requestId);clearTimeout(pending.timer);+ this.touchTurnActivity(t);if (outcome.kind === 'selected') {pending.resolve({ outcome: { outcome: 'selected', optionId: outcome.optionId } });this.appendEvent(t, {@@ -2850,6 +2945,7 @@ export class AcpThreadManager {clearTimeout(t.flushTimer);t.flushTimer = null;}+ this.clearStall(t);await this.persistence.whenIdle(threadId);await this.persistence.delete(threadId);this.opts.log.info({ threadId }, '[acp-threads] empty thread discarded on close');@@ -2885,6 +2981,7 @@ export class AcpThreadManager {clearTimeout(t.flushTimer);t.flushTimer = null;}+ this.clearStall(t);await this.persistence.whenIdle(threadId);await this.persistence.delete(threadId);this.opts.log.info({ threadId }, '[acp-threads] thread deleted');@@ -2905,7 +3002,7 @@ export class AcpThreadManager {toolCall: ToolCallUpdate,options: PermissionOption[],): Promise<RequestPermissionResponse> {- record.info.lastActivityAt = Date.now();+ this.touchTurnActivity(record);const decision = this.opts.permissions.decide(record.info.agent.id, toolCall, options);if (decision.auto !== null) {const requestId = crypto.randomUUID();@@ -2963,7 +3060,7 @@ export class AcpThreadManager {}private handleSessionUpdate(record: ThreadRecord, notification: SessionNotification): void {- record.info.lastActivityAt = Date.now();+ this.touchTurnActivity(record);const update: SessionUpdate = notification.update;if (update.sessionUpdate === 'current_mode_update' && record.info.modes) {record.info.modes = { ...record.info.modes, currentModeId: update.currentModeId };@@ -3015,7 +3112,7 @@ export class AcpThreadManager {requestedPath: string,content: string,): Promise<void> {- record.info.lastActivityAt = Date.now();+ this.touchTurnActivity(record);const target = await this.confinePath(requestedPath);if (target.docName !== null) {const session = await this.opts.sessionManager.getSession(@@ -3175,6 +3272,7 @@ export class AcpThreadManager {if (status === 'exited' || status === 'error') {t.info.queue = undefined;this.clearSteer(t);+ this.clearStall(t);}t.info.status = status;t.info.lastActivityAt = Date.now();@@ -3249,7 +3347,13 @@ export class AcpThreadManager {}private buildMeta(t: ThreadRecord): PersistedThreadMeta {- const { queue: _queue, steer: _steer, signInOutput: _signInOutput, ...info } = t.info;+ const {+ queue: _queue,+ steer: _steer,+ signInOutput: _signInOutput,+ stalledSince: _stalledSince,+ ...info+ } = t.info;return {version: 1,info,@@ -3430,6 +3534,9 @@ function rehydratedRecord(meta: PersistedThreadMeta): ThreadRecord {turnActive: false,cancelRequested: false,steerStallTimer: null,+ stallTimer: null,+ turnStartedAt: null,+ agentActivityAt: Date.now(),unwatchedSince: null,unwatchedCancelSent: false,pendingBroadcast: [],