Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Stop offering resume after a failed agent restart (PRD-9331) (#6188)

Andrew Mikofalvye2d4a877bac1
diff --git a/.changeset/prd-9331-resume-after-failed-retry.md b/.changeset/prd-9331-resume-after-failed-retry.md
new file mode 100644
index 000000000..a4a5dbbfa
--- /dev/null
+++ b/.changeset/prd-9331-resume-after-failed-retry.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+An agent chat whose Retry or context window change failed no longer offers Resume, which could only fail because the chat had no agent session left.
diff --git a/packages/server/src/acp/thread-manager.integration.test.ts b/packages/server/src/acp/thread-manager.integration.test.ts
index 786811e8e..f61c5b56f 100644
--- a/packages/server/src/acp/thread-manager.integration.test.ts
+++ b/packages/server/src/acp/thread-manager.integration.test.ts
@@ -5732,6 +5732,60 @@ describe('AcpThreadManager resumability signal', () => {
expect(rehydrated?.resumable).toBe(true);
}, 45_000);
+ test('a failed retry discards the session, so the thread stops offering resume', async () => {
+ const contentDir = tmp();
+ const localDir = tmp();
+ writeResumableAgentEntry(localDir, 'resume-agent', { FAKE_CAPS: 'resume', FAIL_PROMPT: '1' });
+ const manager = makeManager(contentDir, localDir);
+ await manager.init();
+ const info = await manager.createThread({ agent: { source: 'custom', id: 'resume-agent' } });
+ await waitUntil(() => manager.getInfo(info.threadId)?.status === 'ready', 15_000, 'ready');
+ manager.sendPrompt(info.threadId, 'fail this prompt');
+ await waitUntil(
+ () => manager.getInfo(info.threadId)?.status === 'error',
+ 5000,
+ 'prompt failure',
+ );
+ expect(manager.getInfo(info.threadId)?.resumable).toBe(true);
+
+ writeMarkerGatedAgentEntry(localDir, 'resume-agent', join(tmp(), 'never-written'));
+ await expect(manager.retryThread(info.threadId)).rejects.toThrow(/harness not installed/);
+ expect(internals(manager).sessionId(info.threadId)).toBeNull();
+ expect(manager.getInfo(info.threadId)?.resumable).toBe(false);
+
+ await manager.closeThread(info.threadId);
+ expect(manager.getInfo(info.threadId)?.archived).toBe(true);
+ expect(manager.getInfo(info.threadId)?.resumable).toBe(false);
+ await expect(manager.resumeThread(info.threadId)).rejects.toMatchObject({
+ code: 'resume-unsupported',
+ });
+ }, 45_000);
+
+ test('a context window change that fails to start discards the session, so the thread stops offering resume', async () => {
+ const contentDir = tmp();
+ const localDir = tmp();
+ writeResumableAgentEntry(localDir, 'codex-acp', { FAKE_CAPS: 'resume' });
+ const manager = makeManager(contentDir, localDir);
+ await manager.init();
+ const info = await manager.createThread({
+ agent: { source: 'custom', id: 'codex-acp' },
+ settings: { contextWindow: 272_000 },
+ });
+ await waitUntil(() => manager.getInfo(info.threadId)?.status === 'ready', 15_000, 'ready');
+ expect(manager.getInfo(info.threadId)?.resumable).toBe(true);
+
+ writeMarkerGatedAgentEntry(localDir, 'codex-acp', join(tmp(), 'never-written'));
+ await expect(manager.setContextWindow(info.threadId, 872_000)).rejects.toMatchObject({
+ code: 'spawn-failed',
+ });
+ expect(internals(manager).sessionId(info.threadId)).toBeNull();
+ expect(manager.getInfo(info.threadId)?.resumable).toBe(false);
+
+ await manager.closeThread(info.threadId);
+ expect(manager.getInfo(info.threadId)?.archived).toBe(true);
+ expect(manager.getInfo(info.threadId)?.resumable).toBe(false);
+ }, 45_000);
+
test('an agent that only loads sessions counts as resumable too', async () => {
const contentDir = tmp();
const localDir = tmp();
diff --git a/packages/server/src/acp/thread-manager.ts b/packages/server/src/acp/thread-manager.ts
index 8059aec78..6c855f1d9 100644
--- a/packages/server/src/acp/thread-manager.ts
+++ b/packages/server/src/acp/thread-manager.ts
@@ -353,6 +353,7 @@ interface ThreadRecord {
sessionId: string | null;
sessionBeforeRestart: {
sessionId: string | null;
+ resumable: ThreadInfo['resumable'];
contextWindow: ThreadInfo['contextWindow'];
} | null;
agentSessionId: string;
@@ -2453,7 +2454,11 @@ export class AcpThreadManager {
t.launchSettings = { ...t.launchSettings, contextWindow: Math.floor(tokens) };
t.resumeInFlight = true;
let applied = false;
- t.sessionBeforeRestart = { sessionId: t.sessionId, contextWindow: t.info.contextWindow };
+ t.sessionBeforeRestart = {
+ sessionId: t.sessionId,
+ resumable: t.info.resumable,
+ contextWindow: t.info.contextWindow,
+ };
try {
const { custom } = await this.resolveAgentInfo(t.agentRef);
await this.teardownFailedAgent(t);
@@ -2511,7 +2516,11 @@ export class AcpThreadManager {
throw new ThreadOpError('not-ready', 'a retry is already in progress');
}
t.resumeInFlight = true;
- t.sessionBeforeRestart = { sessionId: t.sessionId, contextWindow: t.info.contextWindow };
+ t.sessionBeforeRestart = {
+ sessionId: t.sessionId,
+ resumable: t.info.resumable,
+ contextWindow: t.info.contextWindow,
+ };
try {
resetSharedLoginShellPathProvider();
this.healthyInterpreters.clear();
@@ -3855,6 +3864,7 @@ export class AcpThreadManager {
private async teardownFailedAgent(t: ThreadRecord): Promise<void> {
t.sessionId = null;
+ t.info.resumable = false;
t.info.contextWindow = null;
await this.stopFailedAgent(t);
}
@@ -3865,6 +3875,7 @@ export class AcpThreadManager {
if (previous === null || t.sessionId !== null) return false;
if (isThreadClosed(t)) {
t.sessionId = previous.sessionId;
+ t.info.resumable = previous.resumable;
t.info.contextWindow = previous.contextWindow;
}
return true;
@@ -3910,10 +3921,11 @@ export class AcpThreadManager {
chatGrants: _chatGrants,
...info
} = t.info;
+ const restarting = t.sessionId === null ? t.sessionBeforeRestart : null;
return {
version: 1,
- info,
- sessionId: t.sessionId ?? t.sessionBeforeRestart?.sessionId ?? null,
+ info: restarting === null ? info : { ...info, resumable: restarting.resumable },
+ sessionId: t.sessionId ?? restarting?.sessionId ?? null,
cwd: t.cwd,
agentRef: t.agentRef,
docName: t.docName,