diff --git a/server/src/services/native-runtime/native-session-executor.ts b/server/src/services/native-runtime/native-session-executor.ts index bdf7d3ae00c..328ebbab345 100644 --- a/server/src/services/native-runtime/native-session-executor.ts +++ b/server/src/services/native-runtime/native-session-executor.ts @@ -13400,7 +13400,7 @@ async function executePaperclipNativeSessionAttempt( ? sourceFailureCode : disposition.failureCode; const providerFailure = providerFailureFromError(error); - const startupFailureSignature = recoveryEvidence.recoveryMode === "bootstrap_retry" + const startupFailureSignature = recoveryEvidence.recoveryMode === "bootstrap_retry" || remoteStartupRejection ? nativeStartupFailureSignature(providerFailure) : null; const startupRejectedAction = repeatedRemoteStartupFailure && providerFailure ? nativeRepeatedStartupFailureAction(providerFailure.message) : NATIVE_PROVIDER_STARTUP_REJECTED_ACTION; diff --git a/server/src/services/native-runtime/native-startup-rejected-retry.integration.test.ts b/server/src/services/native-runtime/native-startup-rejected-retry.integration.test.ts index b2421734634..44605b8f4ba 100644 --- a/server/src/services/native-runtime/native-startup-rejected-retry.integration.test.ts +++ b/server/src/services/native-runtime/native-startup-rejected-retry.integration.test.ts @@ -46,7 +46,8 @@ describe("native session.open the provider rejected before any provider work", ( message: "error creating thread: failed to load AGENTS.md instructions for environment `local`: fs sandbox helper failed with status exit status: 1: bwrap: loopback: Failed RTM_NEWADDR: Operation not permitted", ...fields }); - async function rejectSessionOpen(failure: Error, attempt = 0, options: { remote?: boolean; recoveryHistory?: Record[] } = {}) { + async function rejectSessionOpen(failure: Error, attempt = 0, + options: { remote?: boolean; recoveryHistory?: Record[]; resumesProviderSession?: boolean } = {}) { const issueId = randomUUID(); await db.insert(issues).values({ id: issueId, companyId, title: "Plan the change", status: "in_progress", workMode: "standard", assigneeAgentId: agentId, createdByUserId: "board-user", responsibleUserId: "board-user" }); @@ -71,7 +72,10 @@ describe("native session.open the provider rejected before any provider work", ( contract: buildNativeCompletionContract(issue, { revision: contract.revision }) }, interactionResponses: [], credentialBindings: [], }; - await db.update(heartbeatRuns).set({ runnerProfileJson: { nativeExecutionInput: execution } }).where(eq(heartbeatRuns.id, runId)); + const sessionCheckpoint = options.resumesProviderSession + ? { sessionId: native.normalizedSessionId, providerSessionId: randomUUID(), terminal: null } : undefined; + await db.update(heartbeatRuns).set({ runnerProfileJson: { nativeExecutionInput: execution, + ...(sessionCheckpoint ? { sessionCheckpoint } : {}) } }).where(eq(heartbeatRuns.id, runId)); provider.execute.mockReset().mockRejectedValue(failure); await executePaperclipNativeSession({ db, execution, runnerInstanceId: native.runnerInstanceId, ...(options.remote ? { runnerExecutionTarget: { kind: "remote", transport: "sandbox", providerKey: "test", remoteCwd: "/workspace", @@ -149,4 +153,16 @@ describe("native session.open the provider rejected before any provider work", ( const [issue] = await db.select().from(issues).where(eq(issues.id, issueId)); await expect(taskInterruptionPresentation(db, issue)).resolves.toMatchObject({ state: "failed", canRetry: true }); }, 120_000); + + it("stops a repeated remote startup rejection on a run that resumes its predecessor's provider session", async () => { + const first = await rejectSessionOpen(exitProven(rejection(startupFailure())), 0, { remote: true, resumesProviderSession: true }); + expect(first.coordinator).toMatchObject({ phase: "retryable_failure", + failureDetail: expect.objectContaining({ recoveryMode: "exact_checkpoint_resume", originalFailureCode: "provider_session_open_rejected" }) }); + const firstHistory = first.coordinator.recoveryHistory as Record[]; + expect(firstHistory.at(-1)).toMatchObject({ disposition: "retryable_failure", startupFailureSignature: expect.any(String) }); + const { coordinator } = await rejectSessionOpen(exitProven(rejection(startupFailure())), 1, { remote: true, + resumesProviderSession: true, recoveryHistory: firstHistory }); + expect(coordinator).toMatchObject({ phase: "terminal_failure", failureCode: NATIVE_PROVIDER_STARTUP_REJECTED, nextAttemptAt: null, + failureDetail: expect.objectContaining({ nextAction: expect.stringContaining("bwrap: loopback: Failed RTM_NEWADDR") }) }); + }, 120_000); });