pi-cursor-sdk 0.1.31 → 0.1.33

package/src/context-window-cache.ts

@@ -18,15 +18,31 @@ function isPositiveInteger(value: unknown): value is number {
 	return typeof value === "number" && Number.isInteger(value) && value > 0;
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+function parseContextWindowCacheFile(value: unknown): ContextWindowCacheFile | undefined {
+	if (!isRecord(value)) return undefined;
+	const { contextWindows } = value;
+	if (contextWindows === undefined) return {};
+	if (!isRecord(contextWindows)) return undefined;
+	return {
+		contextWindows: Object.fromEntries(
+			Object.entries(contextWindows).filter((entry): entry is [string, number] => isPositiveInteger(entry[1])),
+		),
+	};
+}
+
 function loadUserContextWindowOverrides(): Map<string, number> {
 	userContextWindowOverrideLoadCount += 1;
 	const path = getCachePath();
 	const overrides = new Map<string, number>();
 	if (!existsSync(path)) return overrides;
 	try {
-		const parsed = JSON.parse(readFileSync(path, "utf-8")) as ContextWindowCacheFile;
-		for (const [modelId, contextWindow] of Object.entries(parsed.contextWindows ?? {})) {
-			if (isPositiveInteger(contextWindow)) overrides.set(modelId, contextWindow);
+		const parsed = parseContextWindowCacheFile(JSON.parse(readFileSync(path, "utf-8")));
+		for (const [modelId, contextWindow] of Object.entries(parsed?.contextWindows ?? {})) {
+			overrides.set(modelId, contextWindow);
 		}
 	} catch {
 		return overrides;
@@ -52,10 +68,10 @@ export function getCachedContextWindow(modelId: string): number | undefined {
 }
 
 export function getCheckpointContextWindow(checkpoint: unknown): number | undefined {
-	if (checkpoint === null || typeof checkpoint !== "object") return undefined;
-	const tokenDetails = (checkpoint as Record<PropertyKey, unknown>).tokenDetails;
-	if (tokenDetails === null || typeof tokenDetails !== "object") return undefined;
-	const maxTokens = (tokenDetails as Record<PropertyKey, unknown>).maxTokens;
+	if (!isRecord(checkpoint)) return undefined;
+	const { tokenDetails } = checkpoint;
+	if (!isRecord(tokenDetails)) return undefined;
+	const { maxTokens } = tokenDetails;
 	if (!isPositiveInteger(maxTokens)) return undefined;
 	return maxTokens;
 }

package/src/cursor-live-run-coordinator.ts

@@ -11,6 +11,7 @@ import type { CursorNativeToolDisplayItem } from "./cursor-native-tool-display.j
 import type { CursorPiBridgeToolRequest, CursorPiToolBridgeRun } from "./cursor-pi-tool-bridge.js";
 import { getCursorSessionScopeKey } from "./cursor-session-scope.js";
 import type { CursorSdkEventDebugRecorder } from "./cursor-sdk-event-debug.js";
+import { installCursorSdkProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
 
 export class CursorLiveRunAbortError extends Error {
 	constructor() {
@@ -118,6 +119,17 @@ interface LeaseWaiter {
 	onAbort?: () => void;
 }
 
+async function cancelCursorLiveSdkRun(run: CursorLiveRun): Promise<void> {
+	if (!run.sdkRun) return;
+	const guard = installCursorSdkProcessErrorGuard();
+	guard.suppressAbortErrors();
+	try {
+		await run.sdkRun.cancel();
+	} finally {
+		guard.dispose();
+	}
+}
+
 interface CursorLiveRunPrivateState {
 	waiters: Set<ProgressWaiter>;
 	idleDisposeTimer?: ReturnType<typeof setTimeout>;
@@ -474,7 +486,7 @@ export function createCursorLiveRunCoordinator(deps: CursorLiveRunCoordinatorDep
 				if (abandoned) {
 					if (!run.done) {
 						try {
-							await run.sdkRun?.cancel();
+							await cancelCursorLiveSdkRun(run);
 						} catch {
 							// cancellation failure should not block session-agent abandonment
 						}

package/src/cursor-provider-errors.ts

@@ -60,13 +60,15 @@ function getCursorConnectSource(error: unknown, record: Record<string, unknown>
 		const type = getErrorStringField(asRecord(detail), "type");
 		return typeof type === "string" && type.startsWith("aiserver.");
 	});
-	return hasCursorBackendDetails ? "cursor-backend-details" : "generic-connect";
+	if (hasCursorBackendDetails) return "cursor-backend-details";
+	return stack.includes("@connectrpc/connect-node") ? "connect-node-stack" : "generic-connect";
 }
 
 export type CursorConnectErrorSource =
 	| "cursor-sdk-stack"
 	| "cursor-extension-connect-stack"
 	| "cursor-backend-details"
+	| "connect-node-stack"
 	| "generic-connect";
 
 export type CursorConnectErrorClassification =

package/src/cursor-sdk-process-error-guard.ts

@@ -13,7 +13,7 @@ type GenericProcessEmit = (event: string | symbol, ...args: unknown[]) => boolea
 
 // The local Cursor SDK can surface some ConnectRPC failures as process-level
 // uncaught exceptions/unhandled rejections even when run.wait()/run.cancel() is awaited.
-// Keep suppression scoped to active Cursor provider turns and tightly matched SDK shapes.
+// Keep suppression scoped to active Cursor provider turns and tightly matched ConnectRPC shapes.
 const activeProviderTurns = new Set<CursorSdkProcessErrorGuardToken>();
 let originalProcessEmit: GenericProcessEmit | undefined;
 let captureCallbackInstalled = false;
@@ -35,7 +35,9 @@ function shouldSuppressProcessError(event: string | symbol, args: readonly unkno
 	const classification = classifyCursorConnectError(error);
 	if (!classification) return false;
 	if (classification.kind === "abort") return hasActiveAbortSuppression();
-	return activeProviderTurns.size > 0 && isCursorProvenance(classification.source);
+	if (activeProviderTurns.size === 0) return false;
+	if (classification.kind === "network") return isCursorProvenance(classification.source) || classification.source === "connect-node-stack";
+	return isCursorProvenance(classification.source);
 }
 
 function installProcessEmitPatch(): void {

package/src/cursor-state.ts

@@ -69,10 +69,13 @@ export function parseCursorAgentMode(raw: unknown): AgentModeOption | undefined
 	return isCursorAgentMode(mode) ? mode : undefined;
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
 function isCursorFastEntryData(value: unknown): value is CursorFastEntryData {
-	if (!value || typeof value !== "object") return false;
-	const data = value as Record<string, unknown>;
-	return (typeof data.modelId === "string" || typeof data.baseModelId === "string") && typeof data.fast === "boolean";
+	if (!isRecord(value)) return false;
+	return (typeof value.modelId === "string" || typeof value.baseModelId === "string") && typeof value.fast === "boolean";
 }
 
 function getCursorFastEntryModelId(data: CursorFastEntryData): string {
@@ -80,9 +83,19 @@ function getCursorFastEntryModelId(data: CursorFastEntryData): string {
 }
 
 function isCursorModeEntryData(value: unknown): value is CursorModeEntryData {
-	if (!value || typeof value !== "object") return false;
-	const data = value as Record<string, unknown>;
-	return isCursorAgentMode(data.mode);
+	return isRecord(value) && isCursorAgentMode(value.mode);
+}
+
+function parseCursorGlobalConfig(value: unknown): CursorGlobalConfig | undefined {
+	if (!isRecord(value)) return undefined;
+	const { fastDefaults } = value;
+	if (fastDefaults === undefined) return {};
+	if (!isRecord(fastDefaults)) return undefined;
+	return {
+		fastDefaults: Object.fromEntries(
+			Object.entries(fastDefaults).filter((entry): entry is [string, boolean] => typeof entry[1] === "boolean"),
+		),
+	};
 }
 
 function getConfigPath(): string {
@@ -93,12 +106,8 @@ function loadGlobalFastPreferences(): Map<string, boolean> {
 	const path = getConfigPath();
 	if (!existsSync(path)) return new Map();
 	try {
-		const parsed = JSON.parse(readFileSync(path, "utf-8")) as CursorGlobalConfig;
-		return new Map(
-			Object.entries(parsed.fastDefaults ?? {}).filter(
-				(entry): entry is [string, boolean] => typeof entry[1] === "boolean",
-			),
-		);
+		const parsed = parseCursorGlobalConfig(JSON.parse(readFileSync(path, "utf-8")));
+		return new Map(Object.entries(parsed?.fastDefaults ?? {}));
 	} catch {
 		return new Map();
 	}

package/src/model-list-cache.ts

@@ -8,6 +8,7 @@ import { parseEnvBoolean } from "./cursor-env-boolean.js";
 const MODEL_LIST_CACHE_FILE = "cursor-sdk-model-list.json";
 const MODEL_LIST_CACHE_VERSION = 1;
 const DEFAULT_TTL_MS = 24 * 60 * 60 * 1000;
+const MAX_CACHE_CLOCK_SKEW_MS = 5 * 60 * 1000;
 const DISABLE_ENV_VAR = "PI_CURSOR_SDK_DISABLE_MODEL_CACHE";
 const TTL_ENV_VAR = "PI_CURSOR_SDK_MODEL_CACHE_TTL_MS";
 
@@ -45,20 +46,83 @@ export function fingerprintApiKey(apiKey: string): string {
 	return createHash("sha256").update(apiKey).digest("hex").slice(0, 16);
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+function isStringArray(value: unknown): value is string[] {
+	return Array.isArray(value) && value.every((entry) => typeof entry === "string");
+}
+
+function isModelParameterValue(value: unknown): value is NonNullable<ModelListItem["variants"]>[number]["params"][number] {
+	return isRecord(value) && typeof value.id === "string" && typeof value.value === "string";
+}
+
+function isModelParameterDefinitionValue(value: unknown): value is NonNullable<ModelListItem["parameters"]>[number]["values"][number] {
+	return isRecord(value) && typeof value.value === "string" && (value.displayName === undefined || typeof value.displayName === "string");
+}
+
+function isModelParameterDefinition(value: unknown): value is NonNullable<ModelListItem["parameters"]>[number] {
+	if (!isRecord(value)) return false;
+	return (
+		typeof value.id === "string" &&
+		(value.displayName === undefined || typeof value.displayName === "string") &&
+		Array.isArray(value.values) &&
+		value.values.every(isModelParameterDefinitionValue)
+	);
+}
+
+function isModelVariant(value: unknown): value is NonNullable<ModelListItem["variants"]>[number] {
+	if (!isRecord(value)) return false;
+	return (
+		Array.isArray(value.params) &&
+		value.params.every(isModelParameterValue) &&
+		typeof value.displayName === "string" &&
+		(value.description === undefined || typeof value.description === "string") &&
+		(value.isDefault === undefined || typeof value.isDefault === "boolean")
+	);
+}
+
+function isModelListItem(value: unknown): value is ModelListItem {
+	if (!isRecord(value)) return false;
+	return (
+		typeof value.id === "string" &&
+		typeof value.displayName === "string" &&
+		(value.description === undefined || typeof value.description === "string") &&
+		(value.aliases === undefined || isStringArray(value.aliases)) &&
+		(value.parameters === undefined || (Array.isArray(value.parameters) && value.parameters.every(isModelParameterDefinition))) &&
+		(value.variants === undefined || (Array.isArray(value.variants) && value.variants.every(isModelVariant)))
+	);
+}
+
+function isValidFetchedAt(value: unknown): value is number {
+	return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 && value <= Date.now() + MAX_CACHE_CLOCK_SKEW_MS;
+}
+
+function parseModelListCacheFile(value: unknown): ModelListCacheFile | undefined {
+	if (!isRecord(value)) return undefined;
+	if (
+		value.version !== MODEL_LIST_CACHE_VERSION ||
+		!isValidFetchedAt(value.fetchedAt) ||
+		typeof value.keyFingerprint !== "string" ||
+		!Array.isArray(value.models) ||
+		!value.models.every(isModelListItem)
+	) {
+		return undefined;
+	}
+	return {
+		version: value.version,
+		fetchedAt: value.fetchedAt,
+		keyFingerprint: value.keyFingerprint,
+		models: value.models,
+	};
+}
+
 function readCacheFile(): ModelListCacheFile | undefined {
 	const path = getCachePath();
 	if (!existsSync(path)) return undefined;
 	try {
-		const parsed = JSON.parse(readFileSync(path, "utf-8")) as ModelListCacheFile;
-		if (
-			parsed.version !== MODEL_LIST_CACHE_VERSION ||
-			typeof parsed.fetchedAt !== "number" ||
-			typeof parsed.keyFingerprint !== "string" ||
-			!Array.isArray(parsed.models)
-		) {
-			return undefined;
-		}
-		return parsed;
+		return parseModelListCacheFile(JSON.parse(readFileSync(path, "utf-8")));
 	} catch {
 		return undefined;
 	}