fix: fall back when Daytona session API is unavailable

Author: cursoragent

packages/core/src/sandbox/daytona-sandbox.ts

@@ -340,13 +340,17 @@ export class DaytonaSandbox implements Sandbox {
 			// `maxBuffer` and load unbounded stdout — the inconsistency
 			// Cursor Bugbot flagged on PR #2748.
 			const maxBuffer = options.maxBuffer ?? EXEC_OUTPUT_MAX_BUFFER;
-			if (options.signal) {
+			const processApi = this.handle.process as DaytonaProcessApi;
+			if (options.signal?.aborted) {
+				return cancelledExecResult();
+			}
+			if (options.signal && this.hasSessionApi(processApi)) {
 				return await this.execWithSession(fullCommand, {
 					...options,
 					maxBuffer,
 				});
 			}
-			const result = await this.handle.process.executeCommand(fullCommand);
+			const result = await processApi.executeCommand(fullCommand);
 			return {
 				stdout: truncateOutput(result.result, maxBuffer),
 				stderr: "",

test/packages/core/daytona-sandbox-edge-cases.test.ts

@@ -186,7 +186,7 @@ describe("DaytonaSandbox Edge Cases", () => {
 	});
 
 	describe("abortable exec fallbacks", () => {
-		it("fails when abortable execution is requested without session APIs", async () => {
+		it("falls back to executeCommand when abortable execution lacks session APIs", async () => {
 			const handle = createMockHandle();
 			const sandbox = await createTestSandbox(handle);
 			const controller = new AbortController();
@@ -197,10 +197,12 @@ describe("DaytonaSandbox Edge Cases", () => {
 
 			expect(result).toEqual({
 				stdout: "",
-				stderr: "Daytona abortable execution requires session API support",
-				exitCode: 1,
+				stderr: "",
+				exitCode: 0,
 			});
-			expect(handle.process.executeCommand).not.toHaveBeenCalled();
+			expect(handle.process.executeCommand).toHaveBeenCalledWith(
+				"gh pr view 1",
+			);
 		});
 	});
 

test/packages/core/daytona-sandbox.test.ts

@@ -394,7 +394,7 @@ describe("DaytonaSandbox", () => {
 			expect(handle.process.executeCommand).not.toHaveBeenCalled();
 		});
 
-		it("fails before fallback executeCommand when abortable sessions are unavailable", async () => {
+		it("falls back to executeCommand when abortable sessions are unavailable", async () => {
 			const handle = createMockHandle();
 			handle.process.createSession = undefined as never;
 			handle.process.deleteSession = undefined as never;
@@ -408,11 +408,14 @@ describe("DaytonaSandbox", () => {
 				signal: controller.signal,
 			});
 
-			expect(result.exitCode).toBe(1);
-			expect(result.stderr).toContain(
-				"Daytona abortable execution requires session API support",
+			expect(result).toEqual({
+				stdout: "output\n",
+				stderr: "",
+				exitCode: 0,
+			});
+			expect(handle.process.executeCommand).toHaveBeenCalledWith(
+				"gh pr view 1",
 			);
-			expect(handle.process.executeCommand).not.toHaveBeenCalled();
 		});
 
 		it("deletes the remote session when the abort signal fires", async () => {