@emmaneugene/pi-cursor-sdk 0.3.7 → 0.4.1

package/src/cursor-provider-turn-runner.ts

@@ -3,7 +3,6 @@ import { drainExistingCursorLiveRunBeforeSend } from "./cursor-provider-live-run
 import { invalidateSessionAgent } from "./cursor-session-agent.js";
 import { getCursorSessionCwd, getCursorSessionScopeKey } from "./cursor-session-scope.js";
 import { installCursorSdkProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
-import type { CursorRuntime } from "./cursor-config.js";
 import { CursorSdkEventDebugSink } from "./cursor-sdk-event-debug.js";
 import { awaitFinalizeCursorRunOutcome } from "./cursor-provider-turn-finalize.js";
 import {
@@ -22,24 +21,22 @@ import type {
 	CursorProviderTurnRunnerParams,
 	CursorProviderTurnSendResult,
 	LiveCursorProviderTurnRuntime,
-	LocalCursorProviderTurnPrepareResult,
 } from "./cursor-provider-turn-types.js";
 
 export type { CursorProviderTurnRunnerParams } from "./cursor-provider-turn-types.js";
 
-type LocalLivePreparedTurn = LocalCursorProviderTurnPrepareResult & { runtime: LiveCursorProviderTurnRuntime };
+type LivePreparedTurn = CursorProviderTurnPrepareResult & { runtime: LiveCursorProviderTurnRuntime };
 
-function requireLocalLivePreparedTurn(prepared: CursorProviderTurnPrepareResult): LocalLivePreparedTurn {
-	if (prepared.runtimeTarget !== "local" || prepared.runtime.kind !== "live") {
-		throw new Error("Cursor live run requires a local live prepared turn");
+function requireLivePreparedTurn(prepared: CursorProviderTurnPrepareResult): LivePreparedTurn {
+	if (prepared.runtime.kind !== "live") {
+		throw new Error("Cursor live run requires a live prepared turn");
 	}
-	return prepared as LocalLivePreparedTurn;
+	return prepared as LivePreparedTurn;
 }
 
 export class CursorProviderTurnRunner {
 	private sdkEventDebug: CursorSdkEventDebugSink | undefined;
 	private resolvedApiKey: string | undefined;
-	private runtimeTarget: CursorRuntime | undefined;
 
 	constructor(private readonly params: CursorProviderTurnRunnerParams) {}
 
@@ -61,7 +58,6 @@ export class CursorProviderTurnRunner {
 			sdkEventDebug: () => this.sdkEventDebug,
 			sdkProcessErrorGuard,
 			resolvedApiKey: () => this.resolvedApiKey,
-			runtimeTarget: () => this.runtimeTarget,
 		});
 
 		try {
@@ -74,25 +70,16 @@ export class CursorProviderTurnRunner {
 			});
 			sdkEventDebugRef.current = this.sdkEventDebug;
 			this.sdkEventDebug?.recordContextSnapshot(context);
-			// Resolved once here, before any drain await, so the drain decision and the
-			// prepare dispatch below always act on the same config snapshot.
 			const resolvedConfig = resolveCursorProviderTurnConfig(cwd);
-			this.runtimeTarget = resolvedConfig.runtime.value;
-			if (resolvedConfig.runtime.value === "local") {
-				// The observed local-executor closed-pipe EPIPE is contained only from this
-				// turn's pre-send live-run drain through run completion; for live runs the
-				// finalizer holds the guard until run.wait() settles. A hit marks
-				// this scope's pooled agent transport dead so the next acquire recreates it.
-				const localScopeKey = getCursorSessionScopeKey();
-				sdkProcessErrorGuard.containLocalTransportClosedPipe(() =>
-					invalidateSessionAgent(localScopeKey, { deadTransport: true }),
-				);
-				if (
-					(await drainExistingCursorLiveRunBeforeSend(stream, partial, model, context, options?.signal, this.sdkEventDebug)) ===
-					"stream_ended"
-				) {
-					return;
-				}
+			const localScopeKey = getCursorSessionScopeKey();
+			sdkProcessErrorGuard.containLocalTransportClosedPipe(() =>
+				invalidateSessionAgent(localScopeKey, { deadTransport: true }),
+			);
+			if (
+				(await drainExistingCursorLiveRunBeforeSend(stream, partial, model, context, options?.signal, this.sdkEventDebug)) ===
+				"stream_ended"
+			) {
+				return;
 			}
 			this.throwIfAborted();
 
@@ -112,12 +99,11 @@ export class CursorProviderTurnRunner {
 				sdkEventDebug: this.sdkEventDebug,
 				sdkProcessErrorGuard,
 				throwIfAborted: () => this.throwIfAborted(),
-				resolvedApiKey: this.resolvedApiKey,
 			});
 			const { send } = sendResult;
 
 			if (prepared.runtime.kind === "live") {
-				const livePrepared = requireLocalLivePreparedTurn(prepared);
+				const livePrepared = requireLivePreparedTurn(prepared);
 				liveCompletion = runFinalizer.startLiveRunCompletion({
 					send,
 					prepared: livePrepared,
@@ -152,7 +138,6 @@ export class CursorProviderTurnRunner {
 				kind: "direct",
 				prepared,
 				outcome: finalized.outcome,
-				displayOnlyTraceBlock: finalized.displayOnlyTraceBlock,
 			});
 		} catch (error) {
 			await runFinalizer.applyTerminalEvent({ kind: "error", prepared, error });
@@ -167,7 +152,6 @@ export class CursorProviderTurnRunner {
 			sdkEventDebug: () => this.sdkEventDebug,
 			sdkProcessErrorGuard: installCursorSdkProcessErrorGuard(),
 			resolvedApiKey: () => this.resolvedApiKey,
-			runtimeTarget: () => this.runtimeTarget,
 		});
 		await runFinalizer.applyTerminalEvent({ kind: "error", prepared: undefined, error });
 		await runFinalizer.cleanup(undefined, undefined, undefined);

package/src/cursor-provider-turn-send.ts

@@ -1,9 +1,5 @@
 import type { SendOptions } from "@cursor/sdk";
 import { countCursorAgentMessages } from "./cursor-agent-message-web-tools.js";
-import {
-	createCursorCloudLifecyclePersistenceError,
-	recordCursorCloudLifecycleSafely,
-} from "./cursor-cloud-lifecycle.js";
 import { CursorLiveRunAbortError } from "./cursor-live-run-coordinator.js";
 import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import { consumeCursorLocalForceOverride } from "./cursor-runtime-state.js";
@@ -22,25 +18,6 @@ export interface SendCursorProviderTurnParams {
 	sdkEventDebug: CursorSdkEventDebugSink | undefined;
 	sdkProcessErrorGuard: ReturnType<typeof installCursorSdkProcessErrorGuard>;
 	throwIfAborted: () => void;
-	resolvedApiKey?: string;
-}
-
-const CLOUD_LEDGER_CANCEL_TIMEOUT_MS = 5000;
-
-async function requestBoundedCloudRunCancellation(run: Awaited<ReturnType<CursorProviderTurnPrepareResult["agent"]["send"]>>): Promise<boolean> {
-	let timer: ReturnType<typeof setTimeout> | undefined;
-	const timeout = new Promise<false>((resolve) => {
-		timer = setTimeout(() => resolve(false), CLOUD_LEDGER_CANCEL_TIMEOUT_MS);
-		timer.unref?.();
-	});
-	try {
-		return await Promise.race([
-			Promise.resolve().then(() => run.cancel()).then(() => true, () => false),
-			timeout,
-		]);
-	} finally {
-		if (timer) clearTimeout(timer);
-	}
 }
 
 function recordDebug(action: () => void): void {
@@ -52,7 +29,7 @@ function recordDebug(action: () => void): void {
 }
 
 export async function sendCursorProviderTurn(sendParams: SendCursorProviderTurnParams): Promise<CursorProviderTurnSendResult> {
-	const { params, prepared, sdkEventDebug, sdkProcessErrorGuard, throwIfAborted, resolvedApiKey } = sendParams;
+	const { params, prepared, sdkEventDebug, sdkProcessErrorGuard, throwIfAborted } = sendParams;
 	const { options } = params;
 	const { agent, cwd, payload, meta, runtime } = prepared;
 	const { turnCoordinator, liveRun } = runtime;
@@ -75,12 +52,10 @@ export async function sendCursorProviderTurn(sendParams: SendCursorProviderTurnP
 		abortRegistration?.signal.addEventListener("abort", abortListener, { once: true });
 		throwIfAborted();
 		let cursorAgentMessageOffset: number | undefined;
-		if (prepared.runtimeTarget === "local") {
-			try {
-				cursorAgentMessageOffset = await countCursorAgentMessages(agent.agentId, cwd, prepared.sessionAgentLease.store);
-			} catch (error) {
-				recordDebug(() => sdkEventDebug?.recordError("cursor_agent_message_count", error));
-			}
+		try {
+			cursorAgentMessageOffset = await countCursorAgentMessages(agent.agentId, cwd, prepared.sessionAgentLease.store);
+		} catch (error) {
+			recordDebug(() => sdkEventDebug?.recordError("cursor_agent_message_count", error));
 		}
 		throwIfAborted();
 		recordDebug(() => sdkEventDebug?.recordSendMeta({
@@ -111,20 +86,14 @@ export async function sendCursorProviderTurn(sendParams: SendCursorProviderTurnP
 			},
 		};
 		throwIfAborted();
-		if (prepared.runtimeTarget === "local" && consumeCursorLocalForceOverride(prepared.localForce)) {
+		if (consumeCursorLocalForceOverride(prepared.localForce)) {
 			sendOptions.local = { force: true };
 		}
 		const runPromise = agent.send(payload, sendOptions);
 		// Record at send initiation (promise created), including later reject/cancel paths.
-		if (prepared.runtimeTarget === "local") {
-			recordCursorSessionAgentLineage(agent.agentId);
-		}
+		recordCursorSessionAgentLineage(agent.agentId);
 		const run = await runPromise;
 		sdkRun = run;
-		if (prepared.runtimeTarget === "cloud" && !recordCursorCloudLifecycleSafely({ agentId: run.agentId, runId: run.id }, resolvedApiKey)) {
-			const cancellationConfirmed = await requestBoundedCloudRunCancellation(run);
-			throw createCursorCloudLifecyclePersistenceError(run.agentId, "run", cancellationConfirmed, resolvedApiKey);
-		}
 		recordDebug(() => sdkEventDebug?.recordRunMeta({
 			runId: run.id,
 			requestId: run.requestId,

package/src/cursor-provider-turn-types.ts

@@ -48,13 +48,7 @@ interface CursorProviderTurnRuntimeBase {
 	billedTurnUsage?: CursorSdkTurnUsage;
 }
 
-/**
- * Runtime-agnostic lifecycle operations for a prepared turn.
- *
- * Local implementations delegate to the session agent lease; cloud
- * implementations no-op the local-only operations (commitSend,
- * trackRunCompletion, abandon) and dispose the cloud agent instead.
- */
+/** Lifecycle operations for a prepared local turn, delegated to the session agent lease. */
 export interface CursorProviderTurnLifecycle {
 	trackRunCompletion(completion: Promise<unknown>): void;
 	commitSend(context: Context, bootstrapped: boolean): void;
@@ -74,7 +68,13 @@ export interface LiveCursorProviderTurnRuntime extends CursorProviderTurnRuntime
 
 export type CursorProviderTurnRuntime = DirectCursorProviderTurnRuntime | LiveCursorProviderTurnRuntime;
 
-interface CursorProviderTurnPrepareResultBase {
+/**
+ * Single owned model for a prepared local provider turn.
+ *
+ * Send, finalize, and cleanup phases receive this immutable object instead of
+ * keeping parallel liveRun/turnCoordinator/resource bags in sync by convention.
+ */
+export interface CursorProviderTurnPrepareResult {
 	agent: SDKAgent;
 	cwd: string;
 	payload: CursorProviderTurnSendPayload;
@@ -83,33 +83,12 @@ interface CursorProviderTurnPrepareResultBase {
 	textDeltas: string[];
 	restoreCursorSdkOutputFilter: () => void;
 	lifecycle: CursorProviderTurnLifecycle;
-}
-
-export interface LocalCursorProviderTurnPrepareResult extends CursorProviderTurnPrepareResultBase {
-	runtimeTarget: "local";
-	runtime: CursorProviderTurnRuntime;
 	sessionAgentScopeKey: string;
 	sessionAgentLease: SessionCursorAgentLease;
 	localForce: CursorResolvedSetting<boolean>;
+	runtime: CursorProviderTurnRuntime;
 }
 
-export interface CloudCursorProviderTurnPrepareResult extends CursorProviderTurnPrepareResultBase {
-	runtimeTarget: "cloud";
-	runtime: DirectCursorProviderTurnRuntime;
-	sessionAgentScopeKey?: undefined;
-	sessionAgentLease?: undefined;
-}
-
-/**
- * Single owned model for a prepared provider turn.
- *
- * Send, finalize, and cleanup phases receive this immutable object instead of
- * keeping parallel liveRun/turnCoordinator/resource bags in sync by convention.
- */
-export type CursorProviderTurnPrepareResult =
-	| LocalCursorProviderTurnPrepareResult
-	| CloudCursorProviderTurnPrepareResult;
-
 export interface CursorProviderTurnSend {
 	run: Awaited<ReturnType<SDKAgent["send"]>>;
 	cursorAgentMessageOffset: number | undefined;