pi-cursor-sdk 0.5.3 → 0.5.5

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

@@ -1,5 +1,6 @@
+import { assertCursorNativeToolsRuntime, resolveCursorNativeToolsEnabled } from "./cursor-native-tools.js";
 import { CursorLiveRunAbortError } from "./cursor-live-run-coordinator.js";
-import { drainExistingCursorLiveRunBeforeSend } from "./cursor-provider-live-run-drain.js";
+import { cursorLiveRuns, drainExistingCursorLiveRunBeforeSend } from "./cursor-provider-live-run-drain.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";
@@ -68,6 +69,13 @@ export class CursorProviderTurnRunner {
 			this.throwIfAborted();
 			const { scope } = this.params;
 			const cwd = scope.cwd;
+
+			// 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, scope.projectTrusted, scope.scopeKey);
+			this.runtimeTarget = resolvedConfig.runtime.value;
+			const nativeToolsEnabled = resolveCursorNativeToolsEnabled();
+			assertCursorNativeToolsRuntime(this.runtimeTarget, nativeToolsEnabled);
 			this.sdkEventDebug = CursorSdkEventDebugSink.maybeCreate({
 				cwd,
 				modelId: model.id,
@@ -76,13 +84,9 @@ 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, scope.projectTrusted, scope.scopeKey);
-			this.runtimeTarget = resolvedConfig.runtime.value;
 			if (resolvedConfig.runtime.value === "local" && this.params.request.purpose === "normal") {
 				if (
-					(await drainExistingCursorLiveRunBeforeSend(stream, partial, model, context, options?.signal, this.sdkEventDebug, scope.scopeKey, this.params.request.occupancyFloor)) ===
+					(await drainExistingCursorLiveRunBeforeSend(stream, partial, model, context, options?.signal, this.sdkEventDebug, scope.scopeKey, this.params.request.occupancyFloor, nativeToolsEnabled)) ===
 					"stream_ended"
 				) {
 					return;
@@ -98,6 +102,7 @@ export class CursorProviderTurnRunner {
 				sdkEventDebug: this.sdkEventDebug,
 				throwIfAborted: () => this.throwIfAborted(),
 				resolvedConfig,
+				nativeToolsEnabled,
 			});
 
 			const usage = await this.params.usageRecorder.start({
@@ -173,6 +178,12 @@ export class CursorProviderTurnRunner {
 				displayOnlyTraceBlock: finalized.displayOnlyTraceBlock,
 			});
 		} catch (error) {
+			// This body owns the session turn lease; a queued request aborted before
+			// entry must not release another request's run in handleOuterCatch().
+			if (!prepared && (error instanceof CursorLiveRunAbortError || options?.signal?.aborted)) {
+				const pending = cursorLiveRuns.getActiveForScope(this.params.scope.scopeKey);
+				if (pending && !pending.disposed) await cursorLiveRuns.release(pending);
+			}
 			await runFinalizer.applyTerminalEvent({ kind: "error", prepared: started ?? prepared, error });
 		} finally {
 			await runFinalizer.cleanup(prepared, sendResult, liveCompletion);

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

@@ -4,6 +4,7 @@ import { createCursorCloudLifecyclePersistenceError } from "./cursor-cloud-lifec
 import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import { consumeCursorLocalForceOverride } from "./cursor-runtime-state.js";
 import { recordCursorSessionAgentLineage } from "./cursor-session-agent-lineage.js";
+import { watchCursorLocalRunTerminalError } from "./cursor-local-run-terminal-error.js";
 import type { installCursorSdkProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
 import type {
 	CursorProviderTurnRunnerParams,
@@ -123,6 +124,7 @@ export async function sendCursorProviderTurn(sendParams: SendCursorProviderTurnP
 			recordCursorSessionAgentLineage(agent.agentId, params.scope.scopeKey);
 		}
 		const run = await runPromise;
+		if (prepared.runtimeTarget === "local") watchCursorLocalRunTerminalError(prepared.store, run);
 		sdkRun = run;
 		runtime.sdkRun = run;
 		try {

package/src/cursor-provider.ts

@@ -9,8 +9,6 @@ import {
 } from "@earendil-works/pi-ai";
 import {
 	cursorLiveRuns,
-	DEFAULT_CURSOR_NATIVE_REPLAY_IDLE_DISPOSE_MS,
-	getPendingCursorLiveRun,
 	hasTrailingUserMessagesAfterToolResults,
 	releaseAllPendingCursorLiveRunsForTests,
 	resetCursorNativeReplayIdleDisposeMs,
@@ -114,10 +112,7 @@ export function streamCursor(
 }
 
 export const __testUtils = {
-	DEFAULT_CURSOR_NATIVE_REPLAY_IDLE_DISPOSE_MS,
 	pendingCursorNativeRunCount: cursorLiveRuns.count,
-	getPendingCursorLiveRun,
-	getActiveCursorLiveRunForScope: cursorLiveRuns.getActiveForScope,
 	hasTrailingUserMessagesAfterToolResults,
 	setCursorNativeReplayIdleDisposeMs,
 	resetCursorNativeReplayIdleDisposeMs,

package/src/cursor-runtime-state.ts

@@ -39,9 +39,9 @@ import { getResolvedSessionCursorHttp1Enabled } from "./cursor-http1.js";
 import { getCursorSessionScopeSnapshot } from "./cursor-session-scope.js";
 import { cursorSettingsScopeForContext, getCursorSessionSettings } from "./cursor-session-settings.js";
 
-export const CURSOR_RUNTIME_ENTRY_TYPE = "cursor-runtime-state";
+const CURSOR_RUNTIME_ENTRY_TYPE = "cursor-runtime-state";
 
-export const CURSOR_CLOUD_ACK_DISCLOSURE = [
+const CURSOR_CLOUD_ACK_DISCLOSURE = [
 	"Cursor Cloud executes this work remotely.",
 	"Fresh context is used by default; prior Pi context is included only with explicit bootstrap opt-in.",
 	"Pi-local tools and the Pi bridge are unavailable, and Pi environment variables are not forwarded.",
@@ -145,7 +145,7 @@ export function resolveCursorStatusRuntime(ctx: CursorRuntimeContext): CursorRun
 	}
 }
 
-export function formatResolvedCursorRuntime(runtime: CursorResolvedSetting<CursorRuntime>): string {
+function formatResolvedCursorRuntime(runtime: CursorResolvedSetting<CursorRuntime>): string {
 	const cap = runtime.cappedBy;
 	return cap
 		? `${runtime.value} (source: ${runtime.source} safety cap over ${cap.cappedSource} ${cap.cappedValue})`

package/src/cursor-sdk-event-debug.ts

@@ -171,7 +171,7 @@ export type DiscardedIncompleteStartedToolCallReason =
 	| "sdk-failure"
 	| "run-drain";
 
-export function hashCursorSdkCallId(callId: string): string {
+function hashCursorSdkCallId(callId: string): string {
 	return createHash("sha256").update(callId).digest("hex").slice(0, 8);
 }
 
@@ -182,7 +182,7 @@ export interface DiscardedIncompleteStartedToolCallRecord {
 	reason: DiscardedIncompleteStartedToolCallReason;
 }
 
-export function serializeDiscardedIncompleteStartedToolCall(record: {
+function serializeDiscardedIncompleteStartedToolCall(record: {
 	toolName: string;
 	callId: string;
 	reason?: DiscardedIncompleteStartedToolCallReason;

package/src/cursor-sdk-output-filter.ts

@@ -1,5 +1,6 @@
 export {
-	CURSOR_SDK_STARTUP_NOISE_PATTERNS,
+	__testUtils,
+	installCursorSdkProcessOutputFilter,
 	withCursorSdkOutputNoticeHandler,
 	installCursorSdkOutputFilter,
 	isCursorSdkOutputSuppressed,

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

@@ -1,5 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { classifyCursorConnectError, isCursorSdkAbortConnectError, isCursorSdkConnectionStalledError } from "./cursor-provider-errors.js";
+import { classifyCursorConnectError, isCursorSdkConnectionStalledError } from "./cursor-provider-errors.js";
 
 interface CursorSdkProcessErrorGuardToken {
 	suppressAbortErrors: boolean;
@@ -147,8 +147,6 @@ export const __testUtils = {
 	},
 };
 
-export { isCursorSdkAbortConnectError };
-
 export function installCursorSdkProcessErrorGuard(): CursorSdkProcessErrorGuard {
 	const token: CursorSdkProcessErrorGuardToken = { suppressAbortErrors: false };
 	activeProviderTurns.add(token);

package/src/cursor-session-agent.ts

@@ -140,6 +140,8 @@ interface SessionCursorAgentCreateParams {
 	settingSources?: SettingSource[];
 	localSafety?: CursorLocalSafetyOptions;
 	agents?: AgentOptions["agents"];
+	/** Captured by the turn owner before asynchronous acquisition. */
+	nativeToolsEnabled?: boolean;
 	useHttp1ForAgent?: boolean;
 	onBridgeToolRequest?: (request: CursorPiBridgeToolRequest) => void;
 	debugRecorder?: CursorSdkEventDebugRecorder;
@@ -153,7 +155,7 @@ interface SessionCursorAgentCreateParams {
 const sessionAgentsByScope = new Map<string, SessionCursorAgentPoolEntry>();
 const invalidatedScopeKeys = new Set<string>();
 const deadTransportScopeKeys = new Set<string>();
-let deadTransportAgentDisposeTimeoutMs = 3000;
+const DEAD_TRANSPORT_AGENT_DISPOSE_TIMEOUT_MS = 3000;
 const terminalDisposedScopeGenerations = new Map<string, number>();
 const scopeCreationGenerations = new Map<string, number>();
 const EMPTY_POOL_STATE: SessionCursorAgentPoolState = { status: "empty" };
@@ -254,6 +256,8 @@ function buildSessionAgentPoolKey(scopeKey: string, params: SessionCursorAgentCr
 		buildApiKeyPoolKeyFingerprint(params.apiKey),
 		buildBridgePoolKeySuffix("bridge" in params ? params.bridge : getRegisteredCursorPiToolBridge()),
 		...buildCustomSubagentPoolKeySuffix(params.agents),
+		// Omit for the default so historical durable keys remain byte-for-byte stable.
+		...(params.nativeToolsEnabled === false ? ["tools:mcp-only"] : []),
 	].join("\0");
 }
 
@@ -273,7 +277,7 @@ async function disposePoolEntry(entry: SessionCursorAgentPoolEntry, options?: {
 		await (options?.deadTransport
 			? Promise.race([
 					disposal,
-					new Promise<void>((resolve) => setTimeout(resolve, deadTransportAgentDisposeTimeoutMs).unref?.()),
+					new Promise<void>((resolve) => setTimeout(resolve, DEAD_TRANSPORT_AGENT_DISPOSE_TIMEOUT_MS).unref?.()),
 				])
 			: disposal);
 	} catch {
@@ -520,6 +524,7 @@ async function createSessionAgentEntry(
 				localSafety: params.localSafety,
 				store: sessionStore!.store,
 			}),
+			...(params.nativeToolsEnabled === false ? { tools: ["mcp"] } : {}),
 			...(bridgeRun?.mcpServers ? { mcpServers: bridgeRun.mcpServers } : {}),
 			...(params.agents && Object.keys(params.agents).length ? { agents: params.agents } : {}),
 		});
@@ -584,7 +589,7 @@ export {
 } from "./cursor-session-send-policy.js";
 
 export function invalidateSessionAgent(
-	scopeKey: string = getCursorSessionScopeKey(),
+	scopeKey: string,
 	options?: { deadTransport?: boolean },
 ): void {
 	invalidatedScopeKeys.add(scopeKey);
@@ -725,11 +730,6 @@ export const __testUtils = {
 	resetSessionCursorAgent,
 	refreshSessionCursorAgentConfig,
 	disposeAllSessionCursorAgents,
-	setDeadTransportAgentDisposeTimeoutMs(ms: number): number {
-		const previous = deadTransportAgentDisposeTimeoutMs;
-		deadTransportAgentDisposeTimeoutMs = ms;
-		return previous;
-	},
 	SessionCursorAgentCreationSupersededError,
 	SessionCursorAgentScopeClosedError,
 };

package/src/cursor-session-scope.ts

@@ -12,7 +12,7 @@ interface CursorSessionScopeExtensionApi {
 
 const ANONYMOUS_SESSION_SCOPE_KEY = "__anonymous__";
 const EPHEMERAL_SESSION_SCOPE_PREFIX = "__ephemeral__:";
-export const MAX_CURSOR_SESSION_NAME_LENGTH = 100;
+const MAX_CURSOR_SESSION_NAME_LENGTH = 100;
 
 type CursorSessionScopeChangeHandler = (previousScopeKey: string) => Promise<void> | void;
 
@@ -103,18 +103,10 @@ export function getCursorSessionScopeGeneration(scopeKey: string = getCursorSess
 	return scopeGenerations.get(scopeKey) ?? 0;
 }
 
-export function getCursorSessionCwd(): string {
-	return state.sessionCwd;
-}
-
 export function getCursorSessionProjectTrusted(pi?: object): boolean {
 	return pi ? scopes.get(pi)?.projectTrusted === true : state.projectTrusted;
 }
 
-export function getCursorSessionName(): string | undefined {
-	return state.sessionName;
-}
-
 function normalizeCursorSessionName(name: string | undefined): string | undefined {
 	if (name === undefined) return undefined;
 	return truncateCursorDisplayLine(name, MAX_CURSOR_SESSION_NAME_LENGTH) || undefined;

package/src/cursor-session-store.ts

@@ -6,6 +6,7 @@ import { dirname, isAbsolute, join, relative, resolve, sep, toNamespacedPath } f
 import type { LocalAgentStore } from "@cursor/sdk";
 import { loadCursorSdk } from "./cursor-sdk-runtime.js";
 import { guardCursorCustomStorePath, normalizeCursorCustomStoreRoot, prepareCursorCustomStoreRoot } from "./cursor-custom-store-path.js";
+import { observeCursorLocalRunTerminalErrors } from "./cursor-local-run-terminal-error.js";
 
 export interface CursorSessionStoreIdentity {
 	readonly version: 1;
@@ -55,7 +56,7 @@ const activeWorkspaceRoots = new Map<string, { root: Promise<string>; users: num
 // ponytail: leases protect only extension-owned stores in this process. Other SDK
 // users/processes must stop before upgrade; a cross-process lock belongs in the SDK.
 
-export function hashCursorSessionStoreScope(scopeKey: string): string {
+function hashCursorSessionStoreScope(scopeKey: string): string {
 	return createHash("sha256")
 		.update("pi-cursor-sdk-session-store\0")
 		.update(scopeKey)
@@ -299,7 +300,7 @@ async function openOwnedCursorSessionStore(
 	const openedStore = store;
 	return {
 		identity: openedIdentity,
-		store: openedStore,
+		store: observeCursorLocalRunTerminalErrors(openedStore),
 		dispose: async () => {
 			try {
 				await openedStore.dispose();

package/src/cursor-state.ts

@@ -44,11 +44,7 @@ import {
 	updateCursorSdkConfig,
 } from "./cursor-config.js";
 import {
-	consumeCursorLocalForceOverride,
-	CURSOR_RUNTIME_ENTRY_TYPE,
 	formatCursorStatus,
-	getCursorCliConfig,
-	getCursorSessionConfig,
 	registerCursorCloudRuntimeControls,
 	resetCursorRuntimeStateForTests,
 	resolveCursorStatusRuntime,
@@ -57,19 +53,11 @@ import {
 	type CursorRuntimeStateExtensionApi,
 } from "./cursor-runtime-state.js";
 
-export {
-	consumeCursorLocalForceOverride,
-	getCursorCliConfig,
-	getCursorSessionConfig,
-} from "./cursor-runtime-state.js";
-
 export const CURSOR_FOOTER_ENV = "PI_CURSOR_FOOTER";
 
 const FAST_ENTRY_TYPE = "cursor-fast-state";
 const MODE_ENTRY_TYPE = "cursor-mode-state";
 
-export type CursorAgentMode = AgentModeOption;
-
 const DEFAULT_CURSOR_AGENT_MODE: AgentModeOption = "agent";
 
 interface CursorFastEntryData {
@@ -91,11 +79,11 @@ const authoritativeGlobalFastPreferenceIds = new Set<string>();
 let globalFastPreferences = new Map<string, boolean>();
 const invalidCursorModeNotifiedSessionScopeKeys = new Set<string>();
 
-export function isCursorAgentMode(value: unknown): value is AgentModeOption {
+function isCursorAgentMode(value: unknown): value is AgentModeOption {
 	return value === "agent" || value === "plan";
 }
 
-export function parseCursorAgentMode(raw: unknown): AgentModeOption | undefined {
+function parseCursorAgentMode(raw: unknown): AgentModeOption | undefined {
 	if (typeof raw !== "string") return undefined;
 	const mode = raw.trim();
 	return isCursorAgentMode(mode) ? mode : undefined;
@@ -115,17 +103,13 @@ function isCursorModeEntryData(value: unknown): value is CursorModeEntryData {
 	return isCursorAgentMode(asRecord(value)?.mode);
 }
 
-function getConfigPath(): string {
-	return getCursorSdkUserConfigPath();
-}
-
 function loadGlobalFastPreferences(): Map<string, boolean> {
 	return cursorFastDefaultsFromConfig(loadCursorSdkUserConfig());
 }
 
 function saveGlobalFastPreference(modelId: string, fast: boolean): void {
 	updateCursorSdkConfig(
-		getConfigPath(),
+		getCursorSdkUserConfigPath(),
 		(current) => {
 			const fastDefaults = { ...asRecord(current.fastDefaults), [modelId]: fast };
 			return {
@@ -141,7 +125,7 @@ function saveGlobalFastPreference(modelId: string, fast: boolean): void {
 
 function saveGlobalCursorHttp1Enabled(enabled: boolean): void {
 	updateCursorSdkConfig(
-		getConfigPath(),
+		getCursorSdkUserConfigPath(),
 		(current) => mergeCursorSdkConfigForUpdate(current, {
 			local: { useHttp1ForAgent: enabled },
 		}),
@@ -227,15 +211,15 @@ function formatInvalidCursorMode(raw: string): string {
 	return `Invalid --cursor-mode "${raw}". Use "agent" or "plan".`;
 }
 
-export type CursorAgentModeResolution =
+type CursorAgentModeResolution =
 	| { kind: "valid"; mode: AgentModeOption }
 	| { kind: "invalid"; raw: string; message: string };
 
-export function getStoredCursorAgentMode(scopeKey?: string): AgentModeOption {
+function getStoredCursorAgentMode(scopeKey?: string): AgentModeOption {
 	return getCursorSessionSettings(scopeKey).mode ?? DEFAULT_CURSOR_AGENT_MODE;
 }
 
-export function resolveCursorAgentMode(scopeKey?: string): CursorAgentModeResolution {
+function resolveCursorAgentMode(scopeKey?: string): CursorAgentModeResolution {
 	const cliCursorModeState = getCursorSessionSettings(scopeKey).cli.mode;
 	switch (cliCursorModeState.kind) {
 		case "valid":
@@ -383,10 +367,10 @@ function formatEffectiveCursorSettingSourcesLabel(raw: string | undefined = proc
 	return `${rawLabel} (effective: ${effectiveLabel})`;
 }
 
-export function formatCursorToolsDebugReport(
+function formatCursorToolsDebugReport(
 	pi: Pick<ExtensionAPI, "getActiveTools" | "getAllTools">,
-	env: Record<string, string | undefined> = process.env,
 ): string {
+	const env = process.env;
 	const bridgeEnabled = resolveCursorPiToolBridgeEnabled(env);
 	const manifestEnabled = resolveCursorToolManifestEnabled(env);
 	const lines = [
@@ -689,16 +673,5 @@ function resetCursorModeStateForTests(): void {
 }
 
 export const __testUtils = {
-	FAST_ENTRY_TYPE,
-	MODE_ENTRY_TYPE,
-	CURSOR_HTTP1_ENTRY_TYPE,
-	RUNTIME_ENTRY_TYPE: CURSOR_RUNTIME_ENTRY_TYPE,
-	DEFAULT_CURSOR_AGENT_MODE,
-	getConfigPath,
-	loadGlobalFastPreferences,
-	get sessionFastPreferences() { return getCursorSessionSettings().fast; },
-	getSessionCursorAgentMode: () => getCursorSessionSettings().mode,
-	getCliCursorAgentMode: () => { const mode = getCursorSessionSettings().cli.mode; return mode.kind === "valid" ? mode.mode : undefined; },
-	getCliCursorModeState: () => getCursorSessionSettings().cli.mode,
 	resetCursorModeStateForTests,
 };

package/src/cursor-tool-lifecycle.ts

@@ -86,10 +86,6 @@ function buildCursorToolLifecycleLabelFromVisibility(
 	}
 }
 
-export function buildCursorToolLifecycleLabel(toolCall: unknown, apiKey?: string): string | undefined {
-	return buildCursorToolLifecycleLabelFromVisibility(classifyCursorToolVisibility(toolCall), apiKey);
-}
-
 export function formatCursorToolLifecycleProgressText(toolCall: unknown, apiKey?: string): string | undefined {
 	const visibility = classifyCursorToolVisibility(toolCall);
 	const label = buildCursorToolLifecycleLabelFromVisibility(visibility, apiKey);

package/src/cursor-tool-manifest.ts

@@ -18,6 +18,7 @@ export function resolveCursorToolManifestEnabled(
 
 export function buildCursorToolManifestText(options: {
 	bridgeSnapshot?: CursorPiToolBridgeSnapshot;
+	nativeToolsEnabled?: boolean;
 	/** When false, bridge is off via PI_CURSOR_PI_TOOL_BRIDGE=0 (not merely empty). */
 	piBridgeEnabled?: boolean;
 	includePiBridgeGuidance?: boolean;
@@ -26,7 +27,9 @@ export function buildCursorToolManifestText(options: {
 	const includePiBridgeGuidance = options.includePiBridgeGuidance !== false;
 	const lines = [
 		"Callable tool surfaces this run:",
-		`- Cursor host/MCP: ${CURSOR_HOST_TOOL_MANIFEST_SUMMARY}; configured MCP depends on Cursor settings.`,
+		options.nativeToolsEnabled === false
+			? "- Cursor native tools (including task/subagents): disabled (PI_CURSOR_NATIVE_TOOLS=0). MCP remains available; configured MCP depends on Cursor settings."
+			: `- Cursor host/MCP: ${CURSOR_HOST_TOOL_MANIFEST_SUMMARY}; configured MCP depends on Cursor settings.`,
 		"- Pi tool toggles affect pi tools/bridge exposure only; they do not disable Cursor host/configured MCP tools.",
 	];
 	const bridgeTools = includePiBridgeGuidance ? options.bridgeSnapshot?.tools ?? [] : [];

package/src/cursor-tool-presentation-registry.ts

@@ -40,7 +40,7 @@ import {
 	buildWebSearchReplaySummaryArgs,
 	type CursorReplayActivityBuildContext,
 } from "./cursor-replay-activity-builders.js";
-import { CURSOR_REPLAY_SOURCE_TOOL_NAMES, type CursorReplaySourceToolName } from "./cursor-replay-source-names.js";
+import type { CursorReplaySourceToolName } from "./cursor-replay-source-names.js";
 import type {
 	CursorReplayActivityDetailFields,
 	CursorReplayGenerateImageDetailFields,
@@ -112,7 +112,7 @@ const WEB_SEARCH_NAME_PATTERN =
 const WEB_FETCH_NAME_PATTERN =
 	/^(?:web[-_ ]?fetch|fetch[-_ ]?web|webfetch|browser[-_ ]?fetch|fetch[-_ ]?url)$/i;
 
-export const CURSOR_TOOL_PRESENTATION_SPECS = [
+const CURSOR_TOOL_PRESENTATION_SPECS = [
 	{
 		normalizedName: "read",
 		nameAliases: ["read_file"],
@@ -345,9 +345,7 @@ const WEB_KIND_BY_PATTERN = CURSOR_TOOL_PRESENTATION_SPECS.flatMap((spec) => {
 	return webNamePatterns.map((pattern) => ({ pattern, webKind }));
 });
 
-export const CURSOR_KNOWN_NORMALIZED_TOOL_NAMES: readonly CursorNormalizedToolName[] = CURSOR_REPLAY_SOURCE_TOOL_NAMES;
-
-export function getCursorToolPresentationSpec(
+function getCursorToolPresentationSpec(
 	name: string,
 ): CursorToolPresentationSpec | undefined {
 	const trimmed = name.trim();

package/src/cursor-tool-visibility.ts

@@ -41,7 +41,3 @@ export function classifyCursorToolVisibility(toolCall: unknown): CursorToolVisib
 		fastLocalDiscovery: config?.fastLocalDiscovery ?? false,
 	};
 }
-
-export function isFastLocalDiscoveryTool(toolCall: unknown): boolean {
-	return classifyCursorToolVisibility(toolCall).fastLocalDiscovery;
-}

package/src/cursor-transcript-tool-specs.ts

@@ -1,5 +1,4 @@
 import {
-	CURSOR_KNOWN_NORMALIZED_TOOL_NAMES,
 	CURSOR_REPLAY_ACTIVITY_TOOL_NAME,
 	getCursorReplayCallSummary,
 	getCursorToolActivityTitle,
@@ -417,8 +416,6 @@ const TOOL_DISPLAY_IMPLEMENTATIONS: Record<CursorNormalizedToolName, ToolDisplay
 	},
 };
 
-export const CURSOR_TOOL_DISPLAY_SPEC_KEYS = CURSOR_KNOWN_NORMALIZED_TOOL_NAMES;
-
 function getToolDisplaySpec(name: string): ToolDisplaySpec | undefined {
 	if (Object.hasOwn(TOOL_DISPLAY_IMPLEMENTATIONS, name)) return TOOL_DISPLAY_IMPLEMENTATIONS[name as CursorNormalizedToolName];
 	return undefined;

package/src/index.ts

@@ -15,6 +15,8 @@ import { registerCursorFallbackIssueWarning } from "./cursor-fallback-warning.js
 import { registerCursorAgentsContextDedup } from "./cursor-agents-context-registration.js";
 import { registerCursorOverflowNormalization } from "./cursor-provider-overflow.js";
 import { registerCursorSdkSessionProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
+import { installCursorSdkProcessOutputFilter } from "./cursor-sdk-output-filter.js";
+import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import { prepareCursorSessionForCompaction } from "./cursor-session-compaction-prep.js";
 import { registerCursorUsageLedger } from "./cursor-usage-ledger.js";
 import { registerCursorUsageCommand } from "./cursor-usage-command.js";
@@ -37,10 +39,26 @@ type CursorExtensionApi =
 	& Parameters<typeof registerCursorUsageLedger>[0];
 
 export default async function (pi: CursorExtensionApi) {
+	installCursorSdkProcessOutputFilter();
 	// Session cwd must register before other session_start listeners that depend on it.
 	registerCursorSessionScope(pi);
 	registerCursorUsageLedger(pi);
 	registerCursorUsageCommand(pi);
+	pi.registerCommand("cursor-abort", {
+		description: "Abort this session's pending local Cursor run without undoing completed work",
+		handler: async (_args, ctx) => {
+			const run = cursorLiveRuns.getActiveForScope(getCursorSessionScopeSnapshot(pi).scopeKey);
+			if (run && !run.disposed) {
+				if (!ctx.isIdle() && ctx.model?.provider === "cursor") ctx.abort();
+				await cursorLiveRuns.release(run);
+			}
+			const message = run
+				? "Pending local Cursor run released. Retry under the current policy; already-executed work was not undone."
+				: "No pending local Cursor run in this session.";
+			if (ctx.hasUI) ctx.ui.notify(message, "info");
+			else process.stderr.write(`${message}\n`);
+		},
+	});
 	let fallbackIssue: CursorModelFallbackIssue | undefined;
 	const registerCursorProvider = registerCursorProviderBinding(pi);
 	const setFallbackWarning = registerCursorFallbackIssueWarning(pi);

package/src/model-discovery.ts

@@ -451,6 +451,5 @@ export async function discoverModels(options: DiscoverModelsOptions = {}): Promi
 }
 
 export const __testUtils = {
-	parseContextWindow,
 	registerModelItems,
 };

package/src/model-list-cache.ts

@@ -29,11 +29,11 @@ function getCachePath(): string {
 	return join(getAgentDir(), MODEL_LIST_CACHE_FILE);
 }
 
-export function isModelCacheDisabled(): boolean {
+function isModelCacheDisabled(): boolean {
 	return parseEnvBoolean(process.env[DISABLE_ENV_VAR], false);
 }
 
-export function getModelCacheTtlMs(): number {
+function getModelCacheTtlMs(): number {
 	const raw = process.env[TTL_ENV_VAR];
 	if (raw === undefined) return DEFAULT_TTL_MS;
 	const parsed = Number.parseInt(raw, 10);
@@ -133,7 +133,8 @@ function readCacheFile(): ModelListCacheFile | undefined {
 
 // Return cached models only when caching is enabled, the key matches, and the
 // entry is within the TTL. Used on the hot startup path to skip the network.
-export function loadFreshCachedModels(keyFingerprint: string, now: number = Date.now()): ModelListItem[] | undefined {
+export function loadFreshCachedModels(keyFingerprint: string): ModelListItem[] | undefined {
+	const now = Date.now();
 	if (isModelCacheDisabled()) return undefined;
 	const ttlMs = getModelCacheTtlMs();
 	if (ttlMs <= 0) return undefined;
@@ -180,10 +181,3 @@ export function clearModelListCache(): void {
 		// Cache cleanup is best-effort; it must not break native logout.
 	}
 }
-
-export const __testUtils = {
-	getCachePath,
-	DEFAULT_TTL_MS,
-	DISABLE_ENV_VAR,
-	TTL_ENV_VAR,
-};