pi-cursor-sdk 0.5.2 → 0.5.4

package/src/cursor-session-scope.ts

@@ -12,13 +12,15 @@ 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;
 
 export interface CursorTurnScope {
 	readonly cwd: string;
 	readonly scopeKey: string;
+	/** Durable identity only; never use it to own live runtime resources. */
+	readonly persistentScopeKey?: string;
 	readonly sessionFile: string | undefined;
 	readonly sessionId: string | undefined;
 	readonly sessionName: string | undefined;
@@ -33,6 +35,7 @@ const state = {
 	sessionName: undefined as string | undefined,
 	projectTrusted: false,
 	sessionGeneration: 0,
+	runtimeOwner: undefined as number | undefined,
 };
 type ScopeRecord = typeof state;
 const scopes = new Map<object, ScopeRecord>();
@@ -40,20 +43,34 @@ const scopeChangeHandlers = new Map<object, CursorSessionScopeChangeHandler>();
 const scopeGenerations = new Map<string, number>([[ANONYMOUS_SESSION_SCOPE_KEY, 0]]);
 const projectTrustResolutionCwds = new Set<string>();
 let nextSessionGeneration = 1;
+let nextRuntimeOwner = 1;
+let runtimeOwners = new WeakMap<object, number>();
+
+function persistentScopeKeyFor(record: Pick<ScopeRecord, "sessionFile" | "sessionId">): string {
+	return record.sessionFile ?? (record.sessionId ? `${EPHEMERAL_SESSION_SCOPE_PREFIX}${record.sessionId}` : ANONYMOUS_SESSION_SCOPE_KEY);
+}
 
 function scopeKeyFor(record: ScopeRecord): string {
-	if (record.sessionFile) return record.sessionFile;
-	if (record.sessionId) return `${EPHEMERAL_SESSION_SCOPE_PREFIX}${record.sessionId}`;
-	return ANONYMOUS_SESSION_SCOPE_KEY;
+	const persistent = persistentScopeKeyFor(record);
+	return record.runtimeOwner === undefined ? persistent : `${persistent}\0runtime:${record.runtimeOwner}`;
 }
 
 export function cursorSessionScopeKeyForManager(manager: {
 	getSessionFile?(): string | undefined | null;
 	getSessionId?(): string | undefined;
 }): string {
-	return manager.getSessionFile?.() ?? (manager.getSessionId?.()
-		? `${EPHEMERAL_SESSION_SCOPE_PREFIX}${manager.getSessionId()}`
-		: ANONYMOUS_SESSION_SCOPE_KEY);
+	return persistentScopeKeyFor({
+		sessionFile: manager.getSessionFile?.() ?? undefined, sessionId: manager.getSessionId?.(),
+	});
+}
+
+export function cursorRuntimeSessionScopeKeyForManager(manager: {
+	getSessionFile?(): string | undefined | null;
+	getSessionId?(): string | undefined;
+}): string {
+	const persistent = cursorSessionScopeKeyForManager(manager);
+	const owner = runtimeOwners.get(manager);
+	return owner === undefined ? persistent : `${persistent}\0runtime:${owner}`;
 }
 
 export function getCursorSessionScopeSnapshot(pi?: object): CursorTurnScope {
@@ -64,6 +81,7 @@ export function getCursorSessionScopeSnapshot(pi?: object): CursorTurnScope {
 	return Object.freeze({
 		cwd: record.sessionCwd,
 		scopeKey,
+		persistentScopeKey: persistentScopeKeyFor(record),
 		sessionFile: record.sessionFile,
 		sessionId: record.sessionId,
 		sessionName: record.sessionName,
@@ -76,11 +94,7 @@ export function hasLiveCursorSessions(): boolean {
 	return scopes.size > 0;
 }
 
-export function getCursorSessionFile(): string | undefined {
-	return state.sessionFile;
-}
-
-/** Stable pool key, with process-local anonymous fallback before session_start. */
+/** Runtime ownership key; persisted identities are captured separately. */
 export function getCursorSessionScopeKey(): string {
 	return scopeKeyFor(state);
 }
@@ -89,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;
@@ -112,6 +118,7 @@ function setCursorSessionScope(
 	sessionId?: string,
 	projectTrusted = false,
 	sessionName?: string,
+	runtimeOwner?: number,
 ): void {
 	state.sessionCwd = cwd;
 	state.sessionFile = sessionFile;
@@ -119,6 +126,7 @@ function setCursorSessionScope(
 	state.sessionName = normalizeCursorSessionName(sessionName);
 	state.projectTrusted = projectTrusted;
 	state.sessionGeneration = nextSessionGeneration++;
+	state.runtimeOwner = runtimeOwner;
 	scopeGenerations.set(scopeKeyFor(state), state.sessionGeneration);
 }
 
@@ -134,6 +142,7 @@ function resetCursorSessionScope(): void {
 	Object.assign(state, {
 		sessionCwd: process.cwd(), sessionFile: undefined, sessionId: undefined,
 		sessionName: undefined, projectTrusted: false, sessionGeneration: 0,
+		runtimeOwner: undefined,
 	});
 	nextSessionGeneration = 1;
 	scopeGenerations.clear();
@@ -141,6 +150,8 @@ function resetCursorSessionScope(): void {
 	projectTrustResolutionCwds.clear();
 	scopes.clear();
 	scopeChangeHandlers.clear();
+	runtimeOwners = new WeakMap();
+	nextRuntimeOwner = 1;
 }
 
 export function onCursorSessionScopeKeyChange(pi: object, handler: CursorSessionScopeChangeHandler): void {
@@ -152,6 +163,7 @@ export function registerCursorSessionScope(pi: CursorSessionScopeExtensionApi):
 	const record: ScopeRecord = {
 		sessionCwd: process.cwd(), sessionFile: undefined, sessionId: undefined,
 		sessionName: undefined, projectTrusted: false, sessionGeneration: 0,
+		runtimeOwner: undefined,
 	};
 	scopes.set(pi, record);
 	const trustedCwds = new Set<string>();
@@ -162,6 +174,7 @@ export function registerCursorSessionScope(pi: CursorSessionScopeExtensionApi):
 	pi.on("session_start", async (_event, ctx) => {
 		const previousScopeKey = scopeKeyFor(record);
 		const wasBound = record.sessionGeneration > 0;
+		if (!runtimeOwners.has(ctx.sessionManager)) runtimeOwners.set(ctx.sessionManager, nextRuntimeOwner++);
 		setCursorSessionScope(
 			ctx.cwd,
 			ctx.sessionManager?.getSessionFile?.() ?? undefined,
@@ -169,6 +182,7 @@ export function registerCursorSessionScope(pi: CursorSessionScopeExtensionApi):
 			ctx.isProjectTrusted?.() === true
 				&& (trustedCwds.has(resolve(ctx.cwd)) || projectTrustResolutionCwds.has(resolve(ctx.cwd)) || isCliProjectTrustApproved()),
 			ctx.sessionManager?.getSessionName?.() ?? undefined,
+			runtimeOwners.get(ctx.sessionManager),
 		);
 		Object.assign(record, state);
 		scopes.set(pi, record);

package/src/cursor-session-settings.ts

@@ -1,7 +1,7 @@
 import type { AgentModeOption } from "@cursor/sdk";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { CursorExplicitSdkConfig, CursorRuntime } from "./cursor-config.js";
-import { cursorSessionScopeKeyForManager, getCursorSessionProjectTrusted } from "./cursor-session-scope.js";
+import { cursorRuntimeSessionScopeKeyForManager, getCursorSessionProjectTrusted } from "./cursor-session-scope.js";
 
 export type CursorCliModeState =
 	| { kind: "unset" }
@@ -45,7 +45,7 @@ export function getCursorSessionSettings(scopeKey?: string) {
 
 export function cursorSettingsScopeForContext(ctx: Partial<Pick<ExtensionContext, "sessionManager">>): string | undefined {
 	const manager = ctx.sessionManager;
-	return manager ? cursorSessionScopeKeyForManager(manager) : undefined;
+	return manager ? cursorRuntimeSessionScopeKeyForManager(manager) : undefined;
 }
 
 export function registerCursorSessionSettings(pi: Pick<ExtensionAPI, "on">): void {
@@ -53,7 +53,7 @@ export function registerCursorSessionSettings(pi: Pick<ExtensionAPI, "on">): voi
 	let cli = createCliSettings();
 	pi.on("session_start", (_event, ctx) => {
 		if (scopeKey) settings.delete(scopeKey);
-		scopeKey = cursorSessionScopeKeyForManager(ctx.sessionManager);
+		scopeKey = cursorRuntimeSessionScopeKeyForManager(ctx.sessionManager);
 		legacySettings = getCursorSessionSettings(scopeKey);
 		// Reload creates a new ExtensionAPI but retains the same public manager.
 		// Keep the run's one-shot CLI consumption without retaining dead managers.

package/src/cursor-session-store.ts

@@ -55,7 +55,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)
@@ -194,7 +194,7 @@ function workspaceHashes(cwd: string): { current: string; legacy: string | undef
 }
 
 function assertSafeWorkspaceLayout(cwd: string): void {
-	// ponytail: SDK 1.0.36 has no public read-only root resolver; use one when exposed.
+	// ponytail: SDK 1.0.37 has no public read-only root resolver; use one when exposed.
 	// This pure layout is contract-verified against its factory and public getter;
 	// guard it before that getter can rename MD5 history through an owned link.
 	const slug = cwd.replace(/[^a-zA-Z0-9]/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "");

package/src/cursor-state.ts

@@ -1,7 +1,7 @@
 import type { AgentModeOption } from "@cursor/sdk";
 import type { ExtensionAPI, ExtensionContext, SessionEntry } from "@earendil-works/pi-coding-agent";
 import {
-	buildCursorToolManifestText,
+	CURSOR_HOST_TOOL_MANIFEST_SUMMARY,
 	CURSOR_TOOL_MANIFEST_ENV,
 	resolveCursorToolManifestEnabled,
 } from "./cursor-tool-manifest.js";
@@ -17,8 +17,10 @@ import {
 import {
 	buildCursorPiToolBridgeSnapshot,
 	CURSOR_PI_TOOL_BRIDGE_ENV,
+	resolveCursorPiToolBridgeBuiltinsEnabled,
 	resolveCursorPiToolBridgeEnabled,
 } from "./cursor-pi-tool-bridge-snapshot.js";
+import { CURSOR_PI_TOOL_BRIDGE_DEBUG_ENV } from "./cursor-pi-tool-bridge-diagnostics.js";
 import {
 	CURSOR_SETTING_SOURCES_ENV,
 	DEFAULT_CURSOR_SETTING_SOURCES,
@@ -42,11 +44,7 @@ import {
 	updateCursorSdkConfig,
 } from "./cursor-config.js";
 import {
-	consumeCursorLocalForceOverride,
-	CURSOR_RUNTIME_ENTRY_TYPE,
 	formatCursorStatus,
-	getCursorCliConfig,
-	getCursorSessionConfig,
 	registerCursorCloudRuntimeControls,
 	resetCursorRuntimeStateForTests,
 	resolveCursorStatusRuntime,
@@ -55,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 {
@@ -89,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;
@@ -113,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 {
@@ -139,7 +125,7 @@ function saveGlobalFastPreference(modelId: string, fast: boolean): void {
 
 function saveGlobalCursorHttp1Enabled(enabled: boolean): void {
 	updateCursorSdkConfig(
-		getConfigPath(),
+		getCursorSdkUserConfigPath(),
 		(current) => mergeCursorSdkConfigForUpdate(current, {
 			local: { useHttp1ForAgent: enabled },
 		}),
@@ -225,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":
@@ -381,14 +367,14 @@ 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 = [
-		"Cursor tool surfaces (current session):",
+		"Cursor tool surfaces (current registry snapshot; not a live run):",
 		`${CURSOR_PI_TOOL_BRIDGE_ENV}: ${bridgeEnabled ? "enabled" : "disabled"}`,
 		`${CURSOR_TOOL_MANIFEST_ENV}: ${manifestEnabled ? "enabled" : "disabled"}`,
 		`${CURSOR_SETTING_SOURCES_ENV}: ${formatEffectiveCursorSettingSourcesLabel(env[CURSOR_SETTING_SOURCES_ENV])}`,
@@ -397,13 +383,31 @@ export function formatCursorToolsDebugReport(
 	let bridgeSnapshot;
 	if (bridgeEnabled) {
 		try {
-			bridgeSnapshot = buildCursorPiToolBridgeSnapshot(pi);
+			bridgeSnapshot = buildCursorPiToolBridgeSnapshot(pi, {
+				exposeOverlappingBuiltins: resolveCursorPiToolBridgeBuiltinsEnabled(env),
+			});
 		} catch {
 			lines.push("Pi bridge snapshot: unavailable (extension tool APIs required).");
 		}
 	}
 
-	lines.push(buildCursorToolManifestText({ bridgeSnapshot, piBridgeEnabled: bridgeEnabled }));
+	lines.push(
+		`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.",
+	);
+	if (!bridgeEnabled) {
+		lines.push("Pi bridge: disabled (PI_CURSOR_PI_TOOL_BRIDGE=0).");
+	} else if (bridgeSnapshot) {
+		const names = bridgeSnapshot.tools.map((tool) => tool.mcpToolName).sort();
+		lines.push(`Pi bridge exposure eligibility: ${names.length ? names.join(", ") : "no eligible pi__* tools"}.`);
+	}
+	lines.push(
+		"This snapshot does not prove a run's endpoint attachment, MCP initialization, catalog fetch, or tool calls.",
+		`For per-run observations, enable ${CURSOR_PI_TOOL_BRIDGE_DEBUG_ENV}=1 before the turn.`,
+		"run_created/tools_exposed record exposure only; mcp_initialized records a validated notifications/initialized receipt; mcp_tools_list records catalog-handler output (toolCount), not client/model consumption or ongoing connection health.",
+		"request_queued/resolved/rejected record actual bridge call handling; absent receipts do not diagnose why a client/model made no request.",
+		"Not callable: cursor-replay-* IDs, pi history names, transcript labels.",
+	);
 	return lines.join("\n");
 }
 
@@ -496,7 +500,7 @@ export function registerCursorRuntimeControls(pi: CursorRuntimeControlsExtension
 	});
 
 	pi.registerCommand("cursor-tools", {
-		description: "Show live Cursor tool surfaces for this session (maintainer debug)",
+		description: "Show current-registry Cursor tool exposure eligibility (maintainer debug)",
 		handler: async (_args, ctx) => {
 			emitCursorToolsDebugReport(pi, ctx);
 		},
@@ -669,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

@@ -115,9 +115,9 @@ function mapComparableLevel(
 
 function getThinkingLevelMap(item: ModelListItem): ThinkingLevelMap | undefined {
 	const reasoningParameter = getParameter(item, "reasoning");
-	const effortParameter = getParameter(item, "effort");
+	const effortParameter = getParameter(item, "effort") ?? getParameter(item, "reasoning_effort");
 	const thinkingParameter = getParameter(item, "thinking");
-	const valueParameter = effortParameter ?? reasoningParameter ?? thinkingParameter ?? getParameter(item, "reasoning_effort");
+	const valueParameter = effortParameter ?? reasoningParameter ?? thinkingParameter;
 	if (!valueParameter) return undefined;
 
 	if (valueParameter.id === "thinking" && hasBooleanValues(valueParameter)) {
@@ -306,11 +306,12 @@ function applyThinkingLevel(
 ): void {
 	const mapped = metadata.thinkingLevelMap?.[level];
 	if (mapped === undefined || mapped === null) return;
+	const effortId = metadata.parameterIds.effort ? "effort" : metadata.parameterIds.reasoning_effort ? "reasoning_effort" : undefined;
 
 	if (level === "off") {
 		if (metadata.parameterIds.thinking && mapped === "false") {
 			setParam(params, "thinking", mapped);
-			deleteParam(params, "effort");
+			if (effortId) deleteParam(params, effortId);
 			return;
 		}
 		if (metadata.parameterIds.reasoning) {
@@ -319,9 +320,9 @@ function applyThinkingLevel(
 		return;
 	}
 
-	if (metadata.parameterIds.effort) {
+	if (effortId) {
 		if (metadata.parameterIds.thinking) setParam(params, "thinking", "true");
-		setParam(params, "effort", mapped);
+		setParam(params, effortId, mapped);
 		return;
 	}
 
@@ -332,8 +333,6 @@ function applyThinkingLevel(
 
 	if (metadata.parameterIds.thinking) {
 		setParam(params, "thinking", mapped);
-	} else if (metadata.parameterIds.reasoning_effort) {
-		setParam(params, "reasoning_effort", mapped);
 	}
 }
 
@@ -418,7 +417,7 @@ export async function discoverModels(options: DiscoverModelsOptions = {}): Promi
 	try {
 		const { Cursor } = await loadCursorSdk();
 		options.signal?.throwIfAborted();
-		// SDK 1.0.36 CursorRequestOptions has no caller signal. A late response
+		// SDK 1.0.37 CursorRequestOptions has no caller signal. A late response
 		// still cannot publish outside the native generation that requested it.
 		const models = await Cursor.models.list({ apiKey });
 		options.signal?.throwIfAborted();
@@ -452,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,
-};