@emmaneugene/pi-cursor-sdk 0.4.2 → 0.5.0

package/docs/cursor-tool-surfaces.md

@@ -8,7 +8,7 @@ pi-cursor-sdk runs Cursor models through the local `@cursor/sdk` agent runtime b
 | --- | --- | --- | --- |
 | **Cursor SDK host tools** | Cursor local agent | Yes | Native replay cards (`read`, `bash`, …) or neutral Cursor activity. Representative ToolType list: [SDK ToolType replay matrix](./cursor-native-tool-replay.md#sdk-tooltype-replay-matrix). |
 | **Configured Cursor MCP** | Cursor settings / `~/.cursor/mcp.json` | Yes (when loaded) | Neutral **Cursor MCP** activity cards on replay |
-| **Pi bridge (`pi__*`)** | pi-cursor-sdk loopback MCP | Yes, when exposed | Real pi tool names (`cursor_ask_question`, `cursor_activate_skill`, extension tools, …) |
+| **Pi bridge (`pi__*`)** | pi-cursor-sdk loopback MCP | Yes, when exposed | Real pi tool names (`cursor_activate_skill`, extension tools, …) |
 
 Pi CLI tool toggles apply at the pi tool-registry boundary. `--no-tools`, `--tools`, and `--exclude-tools` can remove pi bridge exposure, but they do **not** disable Cursor SDK host tools or configured Cursor MCP servers.
 
@@ -16,7 +16,7 @@ Pi CLI tool toggles apply at the pi tool-registry boundary. `--no-tools`, `--too
 
 ## Discoverability
 
-- **MCP `listTools`** (and pi's MCP catalog when present) lists **MCP servers only** — for example `pi_tools` with `pi__cursor_ask_question`. It does **not** enumerate Cursor SDK host tools such as `Read` or `Shell`.
+- **MCP `listTools`** (and pi's MCP catalog when present) lists **MCP servers only** — for example `pi_tools` with `pi__cursor_activate_skill`. It does **not** enumerate Cursor SDK host tools such as `Read` or `Shell`.
 - **Bootstrap prompts** include a short **Cursor SDK tool boundary** block plus a compact **callable tool surfaces** manifest by default (disable manifest with `PI_CURSOR_TOOL_MANIFEST=0`). The manifest reminds the model that Cursor host/configured MCP tools are controlled by Cursor, while pi tool toggles only affect pi tools/bridge exposure; when bridge tools are exposed, it lists the current `pi__*` names. MCP `listTools` entries for bridged pi tools point back to the bootstrap prompt instead of repeating the full contract.
 - **Incremental prompts** omit the full boundary block but keep a short tail guard (including an explicit shell `cd` hint); the session agent retains prior bootstrap context. They also omit invariant Pi system instructions; a changed system prompt forces bootstrap with the new section.
 - **In-session debug:** `/cursor-tools` prints bridge enablement, manifest enablement, effective `PI_CURSOR_SETTING_SOURCES`, and the current callable-surface snapshot.
@@ -31,12 +31,9 @@ Default behavior:
 - Hide individual pi tools from the bridge with `bridge.excludeTools` in `~/.pi/agent/cursor-sdk.json` or trusted `.pi/cursor-sdk.json`. Denylisted active pi tools are hidden from Cursor; unset means no restriction, and an explicitly empty list parses to unset so it falls through to lower-precedence config. Trusted project config wins over user config.
 - Overlapping pi builtins (`read`, `bash`, `write`, `edit`, `grep`, `find`, `ls`) are **hidden** from the bridge unless `PI_CURSOR_EXPOSE_BUILTIN_TOOLS=1`; a `bridge.excludeTools` entry keeps a tool hidden even with that opt-in.
 
-`pi-cursor-sdk` registers `cursor_ask_question` for Cursor models when the bridge is on and `PI_CURSOR_ASK_QUESTION` is enabled (the default); Cursor sees `pi__cursor_ask_question`. The tool is sequential and emits `pi-cursor-sdk:ask-question:blocked` `{ active }` while awaiting UI input. Set `PI_CURSOR_ASK_QUESTION=0` to remove only this tool while preserving the rest of the bridge. Pending bridged calls use a local deadline capped by the effective MCP tool timeout; `PI_CURSOR_PI_BRIDGE_CALL_TIMEOUT_MS` can lower it. When pi has visible Agent Skills loaded, the extension also rewrites pi's skill catalog for Cursor and activates `cursor_activate_skill`; Cursor sees `pi__cursor_activate_skill` and should call it with a listed skill name before applying that skill. The activation result returns the full `SKILL.md`, the skill directory for relative paths, and a bounded list of bundled `scripts/`, `references/`, and `assets/` files without eagerly reading those resources.
+Pending bridged calls use a local deadline capped by the effective MCP tool timeout; `PI_CURSOR_PI_BRIDGE_CALL_TIMEOUT_MS` can lower it. When pi has visible Agent Skills loaded, the extension also rewrites pi's skill catalog for Cursor and activates `cursor_activate_skill`; Cursor sees `pi__cursor_activate_skill` and should call it with a listed skill name before applying that skill. The activation result returns the full `SKILL.md`, the skill directory for relative paths, and a bounded list of bundled `scripts/`, `references/`, and `assets/` files without eagerly reading those resources.
 
 ```bash
-# Disable only Cursor's interactive question tool
-PI_CURSOR_ASK_QUESTION=0 pi --model cursor/grok-4.6
-
 # Disable pi bridge entirely
 PI_CURSOR_PI_TOOL_BRIDGE=0 pi --model cursor/grok-4.6
 

package/docs/platform-smoke-implementation.md

@@ -48,7 +48,7 @@ Excluded from release visual matrix with required rationale:
 - `webSearch`: network/search dependent.
 - `webFetch`: network dependent.
 
-Adding a registry entry requires adding it to the required or excluded list with rationale. `ls` is currently excluded from the required one-prompt matrix because composer-2-5 does not route the deterministic source-enumeration step through the native `ls` surface reliably; the suite instead gates that behavior through a successful native `find` result for `src/cursor-provider.ts`.
+Adding a registry entry requires adding it to the required or excluded list with rationale. `ls` is currently excluded from the required one-prompt matrix because composer-2.5 does not route the deterministic source-enumeration step through the native `ls` surface reliably; the suite instead gates that behavior through a successful native `find` result for `src/cursor-provider.ts`.
 
 ## Platform command rendering
 

package/docs/platform-smoke.md

@@ -18,7 +18,7 @@ This fork does not use the Crabbox platform matrix as a current release gate. Th
 npm test
 npm run typecheck
 npm pack --dry-run
-# one live print-mode Cursor run with cursor/grok-4.6:slow
+# one live print-mode Cursor run with cursor/grok-4.6
 npm run smoke:visual -- --label release-check --prompt 'Read ./package.json and reply with its package name.'
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emmaneugene/pi-cursor-sdk",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "pi provider extension backed by @cursor/sdk local agents",
   "publishConfig": {
     "access": "public"

package/scripts/isolated-cursor-smoke.sh

@@ -369,7 +369,7 @@ LIST_OUT="$ISOLATED/list-models.txt"
 run_in_dir_capture_combined "list-models" 30 "$PROJECT_DIR" "$LIST_OUT" "${PI_CURSOR_ENV[@]}" \
 	"$PI_BIN" --approve --cursor-no-fast --list-models cursor
 "$RG_BIN" -q "grok-4\\.6" "$LIST_OUT" || fail "grok-4.6 not listed (see $LIST_OUT)"
-"$RG_BIN" -q "composer-2\\.5|composer-2-5" "$LIST_OUT" || fail "composer-2-5 not listed (see $LIST_OUT)"
+"$RG_BIN" -q "composer-2\\.5" "$LIST_OUT" || fail "composer-2.5 not listed (see $LIST_OUT)"
 
 log "check: basic provider prompt"
 BASIC_DIR="$SESSION_ROOT/basic"

package/scripts/lib/local-resume-smoke-harness.mjs

@@ -136,7 +136,7 @@ export function startRpc({
 	baseEnv = process.env,
 }) {
 	const model =
-		process.env.CURSOR_LOCAL_RESUME_SMOKE_MODEL || "cursor/grok-4.6:slow";
+		process.env.CURSOR_LOCAL_RESUME_SMOKE_MODEL || "cursor/grok-4.6";
 	const workspaceDir = join(artifactDir, "workspace");
 	mkdirSync(workspaceDir, { recursive: true });
 	const pi = findPiCommand();
@@ -160,6 +160,7 @@ export function startRpc({
 			...extraExtensions.flatMap((path) => ["-e", path]),
 			"--model",
 			model,
+			"--cursor-no-fast",
 			"--cursor-runtime",
 			"local",
 			"--approve",

package/scripts/local-resume-smoke.mjs

@@ -46,7 +46,7 @@ ${npmUsage}
 ${nodeUsage}
 
 Environment:
-  CURSOR_LOCAL_RESUME_SMOKE_MODEL          Cursor model id (default: cursor/grok-4.6:slow).
+  CURSOR_LOCAL_RESUME_SMOKE_MODEL          Canonical Cursor model id (default: cursor/grok-4.6; smoke forces fast off).
   CURSOR_LOCAL_RESUME_SMOKE_TIMEOUT_MS     Timeout in ms per model turn (default: 300000).
   CURSOR_LOCAL_RESUME_SMOKE_KEEP_ARTIFACTS Keep temp artifacts when set to 1.
   CURSOR_LOCAL_RESUME_SMOKE_EXTENSION_PATH Packed extension path override (platform runner only).

package/scripts/platform-smoke/card-detect.mjs

@@ -31,7 +31,7 @@ const CARD_PATTERNS = [
 	{ id: "bridge-read-failure", pattern: /^\s*(?:read \.\/definitely-missing-platform-smoke-file\.txt|ENOENT: no such file)\s*/i },
 	{ id: "bridge-shell-success", pattern: /^\s*bridge visual smoke\s*$/i },
 	{ id: "http1-status", pattern: /\bcursor\b.*\bhttp1\b/i },
-	{ id: "footer-status", pattern: /\bgrok-4\.6\b|\bcomposer-2-5\b|\bcomposer-2\.5\b/i },
+	{ id: "footer-status", pattern: /\bgrok-4\.6\b|\bcomposer-2\.5\b/i },
 ];
 
 function cleanLine(line) {

package/scripts/refresh-cursor-model-snapshots.mjs

@@ -42,8 +42,8 @@ Notes:
   - Cursor.models.list() is the source of truth for fallback catalog metadata.
   - Checkpoint-derived context windows are optional input because collecting them
     requires successful local SDK runs; this script does not start agents.
-  - Context-window keys are limited to current selectable model IDs. Redundant
-    :fast/:slow aliases that send the default parameters collapse to one key.`);
+  - Context-window evidence is normalized to canonical model IDs only when it
+    matches the model's default context; aliases and other variants are omitted.`);
 }
 
 const fail = createScriptFail("refresh-cursor-snapshots");
@@ -171,7 +171,7 @@ function formatContextWindows(models, checkpointWindows, fallbackContextWindow)
 	const date = new Date().toISOString().slice(0, 10);
 	const sorted = [...merged.entries()].sort(([a], [b]) => (a === "default" ? -1 : b === "default" ? 1 : a.localeCompare(b)));
 	const lines = sorted.map(([modelId, contextWindow]) => `\t${JSON.stringify(modelId)}: ${contextWindow},`);
-	return `// Generated from Cursor SDK checkpoint tokenDetails.maxTokens on ${date}.\n// Refresh with: npm run refresh:cursor-snapshots -- --write --context-windows ~/.pi/agent/cursor-sdk-context-windows.json\n// Keys are current selectable model IDs. Equivalent default :fast/:slow selections\n// collapse to one key; stale and ambiguous aliases are omitted. Values are observed\n// or conservative default/non-Max-mode limits and may override a catalog context\n// label when the completed SDK checkpoint reports a different effective limit.\nexport const BUNDLED_CONTEXT_WINDOWS = {\n${lines.join("\n")}\n} as const satisfies Record<string, number>;\n`;
+	return `// Generated from Cursor SDK checkpoint tokenDetails.maxTokens on ${date}.\n// Refresh with: npm run refresh:cursor-snapshots -- --write --context-windows ~/.pi/agent/cursor-sdk-context-windows.json\n// Keys are canonical Cursor catalog model IDs. Evidence for a model's default\n// context is normalized to that ID; aliases, forced-speed variants, non-default\n// contexts, and stale IDs are omitted. Values are observed or conservative\n// defaults and can override a catalog context label.\nexport const BUNDLED_CONTEXT_WINDOWS = {\n${lines.join("\n")}\n} as const satisfies Record<string, number>;\n`;
 }
 
 const args = parseRefreshArgs(process.argv.slice(2));

package/shared/cursor-model-selection-identities.d.mts

@@ -2,12 +2,9 @@ import type { ModelListItem } from "@cursor/sdk";
 
 export interface CursorModelSelectionIdentity {
 	model: ModelListItem;
-	selectionModelId: string;
-	context?: string;
-	fastOverride?: boolean;
 	piModelId: string;
+	defaultContext?: string;
 	contextWindowKey: string;
-	baseContextWindowKey: string;
 }
 
 export declare function getCursorModelSelectionIdentities(

package/shared/cursor-model-selection-identities.mjs

@@ -1,89 +1,36 @@
-function getParameter(model, id) {
-	return (model.parameters ?? []).find((parameter) => parameter.id === id);
-}
-
 function getDefaultParam(model, id) {
 	const variant = (model.variants ?? []).find((candidate) => candidate.isDefault) ?? model.variants?.[0];
-	return variant?.params?.find((param) => param.id === id)?.value.toLowerCase();
-}
-
-function getAmbiguousAliases(models) {
-	const ownersByAlias = new Map();
-	for (const model of models) {
-		for (const rawAlias of model.aliases ?? []) {
-			const alias = rawAlias.trim();
-			if (!alias || alias === model.id) continue;
-			const owners = ownersByAlias.get(alias) ?? new Set();
-			owners.add(model.id);
-			ownersByAlias.set(alias, owners);
-		}
-	}
-	return new Set([...ownersByAlias].filter(([, owners]) => owners.size > 1).map(([alias]) => alias));
-}
-
-function getSelectableIds(model, reservedIds, ambiguousAliases) {
-	const ids = [model.id];
-	for (const rawAlias of model.aliases ?? []) {
-		const alias = rawAlias.trim();
-		if (!alias || alias === model.id || ids.includes(alias) || reservedIds.has(alias) || ambiguousAliases.has(alias)) continue;
-		ids.push(alias);
-	}
-	return ids;
+	return variant?.params?.find((param) => param.id === id)?.value;
 }
 
-function encodePiModelId(modelId, context, fastOverride) {
-	const contextQualified = context ? `${modelId}@${context}` : modelId;
-	if (fastOverride === true) return `${contextQualified}:fast`;
-	if (fastOverride === false) return `${contextQualified}:slow`;
-	return contextQualified;
+function getContextWindowKey(modelId, defaultContext) {
+	return defaultContext ? `${modelId}@${defaultContext}` : modelId;
 }
 
 export function getCursorModelSelectionIdentities(models) {
-	const sortedModels = [...models].sort((a, b) => a.id.localeCompare(b.id));
-	const reservedIds = new Set(models.map((model) => model.id));
-	const ambiguousAliases = getAmbiguousAliases(models);
-	const usedPiModelIds = new Set();
-	const identities = [];
-
-	for (const model of sortedModels) {
-		const contextValues = getParameter(model, "context")?.values?.map(({ value }) => value) ?? [];
-		const contexts = contextValues.length > 0 ? contextValues : [undefined];
-		const hasFast = getParameter(model, "fast") !== undefined;
-		const fastOverrides = hasFast ? [undefined, true, false] : [undefined];
-		const defaultFast = getDefaultParam(model, "fast");
-
-		for (const selectionModelId of getSelectableIds(model, reservedIds, ambiguousAliases)) {
-			for (const context of contexts) {
-				for (const fastOverride of fastOverrides) {
-					const piModelId = encodePiModelId(selectionModelId, context, fastOverride);
-					if (usedPiModelIds.has(piModelId)) continue;
-					usedPiModelIds.add(piModelId);
-					const defaultEquivalent =
-						(fastOverride === true && defaultFast === "true") || (fastOverride === false && defaultFast === "false");
-					identities.push({
-						model,
-						selectionModelId,
-						...(context ? { context } : {}),
-						...(fastOverride !== undefined ? { fastOverride } : {}),
-						piModelId,
-						contextWindowKey: defaultEquivalent ? encodePiModelId(selectionModelId, context) : piModelId,
-						baseContextWindowKey: encodePiModelId(model.id, context, defaultEquivalent ? undefined : fastOverride),
-					});
-				}
-			}
-		}
-	}
-
-	return identities;
+	return [...models]
+		.sort((a, b) => a.id.localeCompare(b.id))
+		.map((model) => {
+			const defaultContext = getDefaultParam(model, "context");
+			return {
+				model,
+				piModelId: model.id,
+				...(defaultContext ? { defaultContext } : {}),
+				contextWindowKey: getContextWindowKey(model.id, defaultContext),
+			};
+		});
 }
 
 export function normalizeCursorContextWindowEntries(models, entries, source = "context windows") {
-	const canonicalBySelectableId = new Map(
-		getCursorModelSelectionIdentities(models).map(({ piModelId, contextWindowKey }) => [piModelId, contextWindowKey]),
-	);
+	const canonicalByInputId = new Map();
+	for (const { piModelId, contextWindowKey } of getCursorModelSelectionIdentities(models)) {
+		canonicalByInputId.set(piModelId, piModelId);
+		canonicalByInputId.set(contextWindowKey, piModelId);
+	}
+
 	const normalized = new Map();
 	for (const [modelId, contextWindow] of entries) {
-		const canonicalId = modelId === "default" ? modelId : canonicalBySelectableId.get(modelId);
+		const canonicalId = modelId === "default" ? modelId : canonicalByInputId.get(modelId);
 		if (!canonicalId) continue;
 		const existing = normalized.get(canonicalId);
 		if (existing !== undefined && existing !== contextWindow) {

package/src/bundled-context-windows.ts

@@ -1,18 +1,16 @@
 // Generated from Cursor SDK checkpoint tokenDetails.maxTokens on 2026-08-18.
 // Refresh with: npm run refresh:cursor-snapshots -- --write --context-windows ~/.pi/agent/cursor-sdk-context-windows.json
-// Keys are current selectable model IDs. Equivalent default :fast/:slow selections
-// collapse to one key; stale and ambiguous aliases are omitted. Values are observed
-// or conservative default/non-Max-mode limits and may override a catalog context
-// label when the completed SDK checkpoint reports a different effective limit.
+// Keys are canonical Cursor catalog model IDs. Evidence for a model's default
+// context is normalized to that ID; aliases, forced-speed variants, non-default
+// contexts, and stale IDs are omitted.
 export const BUNDLED_CONTEXT_WINDOWS = {
-	"default": 200000,
 	"auto-smart": 200000,
-	"claude-fable-5@300k": 300000,
 	"claude-haiku-4-5": 200000,
 	"claude-opus-4-5": 200000,
-	"claude-opus-4-8@1m": 300000,
+	"claude-opus-4-8": 300000,
 	"composer-2": 200000,
 	"composer-2.5": 200000,
+	"default": 200000,
 	"gemini-2.5-flash": 200000,
 	"gemini-3-flash": 200000,
 	"gemini-3.1-pro": 200000,
@@ -20,20 +18,15 @@ export const BUNDLED_CONTEXT_WINDOWS = {
 	"gemini-3.6-flash": 200000,
 	"gemini-3.7-flash": 200000,
 	"glm-5.2": 200000,
-	"gpt-5-5@272k": 272000,
 	"gpt-5-mini": 272000,
 	"gpt-5.1": 272000,
 	"gpt-5.2": 272000,
 	"gpt-5.3-codex": 272000,
 	"gpt-5.4-mini": 272000,
 	"gpt-5.4-nano": 272000,
-	"gpt-5.5@272k": 272000,
-	"gpt-5.6@1m": 272000,
+	"gpt-5.6-sol": 272000,
 	"grok-4.5": 256000,
-	"grok-4.5:slow": 256000,
 	"grok-4.6": 256000,
 	"kimi-k2.7-code": 200000,
 	"kimi-k3": 200000,
-	"opus-4.8@1m": 300000,
-	"opus-4.8@300k": 300000,
 } as const satisfies Record<string, number>;

package/src/context.ts

@@ -18,7 +18,6 @@ export interface CursorPromptOptions {
 	/** Compact callable-surface summary; included on bootstrap prompts when set. */
 	toolManifest?: string;
 	includePiBridgeGuidance?: boolean;
-	includePiAskQuestionGuidance?: boolean;
 }
 
 export const CURSOR_APPROX_CHARS_PER_TOKEN = 4;
@@ -54,10 +53,9 @@ export function getCursorToolTailGuardText(
 }
 
 function getCursorToolBoundaryText(
-	options: Pick<CursorPromptOptions, "agentMode" | "includePiAskQuestionGuidance"> & { hasToolManifest?: boolean; includePiBridgeGuidance?: boolean } = {},
+	options: Pick<CursorPromptOptions, "agentMode"> & { hasToolManifest?: boolean; includePiBridgeGuidance?: boolean } = {},
 ): string {
 	const includePiBridgeGuidance = options.includePiBridgeGuidance !== false;
-	const includePiAskQuestionGuidance = includePiBridgeGuidance && options.includePiAskQuestionGuidance !== false;
 	const lines = [
 		"Cursor SDK tool boundary:",
 		"Call only Cursor SDK/MCP tools exposed in this run; pi history names, replay labels, and transcript names are not callable.",
@@ -65,7 +63,6 @@ function getCursorToolBoundaryText(
 			? "For exposed pi bridge tools, call pi__* MCP names, not pi card/history names."
 			: undefined,
 		"Do not claim pi-side or WebSearch/WebFetch tools unless Cursor ran an equivalent tool.",
-		includePiAskQuestionGuidance ? "Use pi__cursor_ask_question for material choices if exposed." : undefined,
 		getCursorPlanModeToolGuidanceText(options.agentMode, { includePiBridgeGuidance }),
 		"Images: only latest user images are sent; ask to reattach prior images.",
 	].filter((line): line is string => line !== undefined);
@@ -406,7 +403,6 @@ export function buildCursorPrompt(context: Context, options: CursorPromptOptions
 		agentMode: options.agentMode,
 		hasToolManifest: Boolean(options.toolManifest),
 		includePiBridgeGuidance: options.includePiBridgeGuidance,
-		includePiAskQuestionGuidance: options.includePiAskQuestionGuidance,
 	})];
 	if (options.toolManifest) {
 		sectionsBeforeMessages.push(options.toolManifest);

package/src/cursor-config.ts

@@ -24,8 +24,8 @@ export const CURSOR_LOCAL_FORCE_ENV = "PI_CURSOR_LOCAL_FORCE";
 export const CURSOR_LOCAL_RESUME_ENV = "PI_CURSOR_LOCAL_RESUME";
 export const CURSOR_HTTP1_ENV = "PI_CURSOR_HTTP_1_1";
 
-export type CursorConfigSource = "cli" | "environment" | "project" | "user" | "session" | "model-alias" | "builtin";
-export type CursorConfigTrustLevel = "one-shot" | "environment" | "trusted-project" | "user" | "session" | "model-catalog" | "builtin";
+export type CursorConfigSource = "cli" | "environment" | "project" | "user" | "session" | "builtin";
+export type CursorConfigTrustLevel = "one-shot" | "environment" | "trusted-project" | "user" | "session" | "builtin";
 
 export interface CursorSdkConfig {
 	fastDefaults?: Record<string, boolean>;
@@ -97,7 +97,6 @@ const TRUST_LEVELS: Record<CursorConfigSource, CursorConfigTrustLevel> = {
 	project: "trusted-project",
 	user: "user",
 	session: "session",
-	"model-alias": "model-catalog",
 	builtin: "builtin",
 };
 
@@ -357,19 +356,18 @@ function resolveOrdinary<T>(layers: Array<CursorResolvedSetting<T> | undefined>)
 // precedence), plus its per-layer values. Sources omitted from a field's order (e.g. local fields skip
 // "session", force skips project/user/session) are the field-specific omissions the review asked to keep
 // explicit; test/cursor-config.test.ts asserts each one.
-type CursorFieldSource = Exclude<CursorConfigSource, "model-alias">;
-type CursorFieldValues<T> = Partial<Record<CursorFieldSource, T>>;
+type CursorFieldValues<T> = Partial<Record<CursorConfigSource, T>>;
 
-const LOCAL_ORDER: CursorFieldSource[] = ["cli", "environment", "project", "user", "builtin"];
-const LOCAL_FORCE_ORDER: CursorFieldSource[] = ["cli", "environment", "builtin"];
-const HTTP1_ORDER: CursorFieldSource[] = ["session", "environment", "user", "builtin"];
-const BRIDGE_ORDER: CursorFieldSource[] = ["project", "user", "builtin"];
+const LOCAL_ORDER: CursorConfigSource[] = ["cli", "environment", "project", "user", "builtin"];
+const LOCAL_FORCE_ORDER: CursorConfigSource[] = ["cli", "environment", "builtin"];
+const HTTP1_ORDER: CursorConfigSource[] = ["session", "environment", "user", "builtin"];
+const BRIDGE_ORDER: CursorConfigSource[] = ["project", "user", "builtin"];
 
-function buildFieldLayers<T>(order: CursorFieldSource[], values: CursorFieldValues<T>): Array<CursorResolvedSetting<T> | undefined> {
+function buildFieldLayers<T>(order: CursorConfigSource[], values: CursorFieldValues<T>): Array<CursorResolvedSetting<T> | undefined> {
 	return order.map((source) => (source === "builtin" ? resolved("builtin", values.builtin as T) : valueFrom(source, values[source])));
 }
 
-function resolveOrdinaryField<T>(order: CursorFieldSource[], values: CursorFieldValues<T>): CursorResolvedSetting<T> {
+function resolveOrdinaryField<T>(order: CursorConfigSource[], values: CursorFieldValues<T>): CursorResolvedSetting<T> {
 	return resolveOrdinary(buildFieldLayers(order, values));
 }
 
@@ -452,14 +450,12 @@ export function buildCursorBridgeExcludeToolNames(resolvedConfig: CursorResolved
 export function resolveCursorFastDefault(options: {
 	cliForceFast?: boolean;
 	cliForceNoFast?: boolean;
-	aliasOverride?: boolean;
 	sessionValue?: boolean;
 	userValue?: boolean;
 	modelDefault: boolean;
 }): CursorResolvedSetting<boolean> {
 	if (options.cliForceNoFast) return resolved("cli", false);
 	if (options.cliForceFast) return resolved("cli", true);
-	if (options.aliasOverride !== undefined) return resolved("model-alias", options.aliasOverride);
 	if (options.sessionValue !== undefined) return resolved("session", options.sessionValue);
 	if (options.userValue !== undefined) return resolved("user", options.userValue);
 	return resolved("builtin", options.modelDefault);

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

@@ -111,6 +111,11 @@ function isPendingBridgeToolRequest(run: CursorLiveRun, request: CursorPiBridgeT
 	return bridgeRun?.hasPendingPiToolCallId(request.piToolCallId) === true;
 }
 
+function hasPendingBridgeCalls(run: CursorLiveRun): boolean {
+	if (run.bridgeRun?.hasPendingCalls()) return true;
+	return run.sessionBridgeRun !== run.bridgeRun && run.sessionBridgeRun?.hasPendingCalls() === true;
+}
+
 export interface CursorLiveRunRecord {
 	id: string;
 	disposed: boolean;
@@ -494,6 +499,12 @@ export function createCursorLiveRunCoordinator(deps: CursorLiveRunCoordinatorDep
 			if (state.leased || state.leaseQueue.length > 0) return;
 			state.idleDisposeRequested = false;
 			state.idleDisposeTimer = setTimeout(() => {
+				if (hasPendingBridgeCalls(run)) {
+					// Bridge calls have their own deadline. Reuse the idle interval to avoid a hot
+					// polling loop if the SDK does not emit a terminal event after that deadline.
+					coordinator.requestIdleDispose(run);
+					return;
+				}
 				void coordinator.release(run).catch(() => {
 					// Idle dispose must not leave release failures as unhandled rejections.
 				});

package/src/cursor-pi-tool-bridge-run.ts

@@ -183,6 +183,10 @@ export class CursorPiToolBridgeRunImpl implements CursorPiToolBridgeRun {
 		await this.resolveToolResults(context.messages.map(asToolResultMessage).filter((message): message is ToolResultMessage => message !== undefined));
 	}
 
+	hasPendingCalls(): boolean {
+		return this.pendingCount() > 0;
+	}
+
 	hasPendingPiToolCallId(piToolCallId: string): boolean {
 		return this.pendingByPiToolCallId.has(piToolCallId);
 	}

package/src/cursor-pi-tool-bridge-types.ts

@@ -65,6 +65,7 @@ export interface CursorPiToolBridgeRun {
 	takeQueuedToolRequests(): CursorPiBridgeToolRequest[];
 	resolveToolResults(toolResults: readonly ToolResultMessage[]): Promise<void>;
 	resolveToolResultsFromContext(context: Context): Promise<void>;
+	hasPendingCalls(): boolean;
 	hasPendingPiToolCallId(piToolCallId: string): boolean;
 	isBridgeMcpToolCall(toolCall: unknown): boolean;
 	setOnToolRequest(handler?: (request: CursorPiBridgeToolRequest) => void): void;

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

@@ -153,7 +153,6 @@ async function prepareCursorLocalProviderTurn(
 				...getCursorPromptOptions(model),
 				agentMode,
 				includePiBridgeGuidance,
-				includePiAskQuestionGuidance: bridgeToolNames.has("pi__cursor_ask_question"),
 			};
 			if (plan.mode !== "bootstrap" || !resolveCursorToolManifestEnabled()) {
 				return promptOptions;

package/src/cursor-state.ts

@@ -191,20 +191,11 @@ function restoreSessionCursorHttp1(branch: readonly SessionEntry[]): void {
 	}
 }
 
-function getFastPreferenceModelId(metadata: NonNullable<ReturnType<typeof getCursorModelMetadata>>): string {
-	return metadata.selectionModelId || metadata.baseModelId;
-}
-
-function getVirtualFastBaseModelId(modelId: string): string {
-	return modelId.replace(/:(?:fast|slow)$/, "");
-}
-
 function getMapFastPreference(
 	map: Map<string, boolean>,
 	metadata: NonNullable<ReturnType<typeof getCursorModelMetadata>>,
 ): boolean | undefined {
-	const preferenceModelId = getFastPreferenceModelId(metadata);
-	return map.get(preferenceModelId) ?? (preferenceModelId !== metadata.baseModelId ? map.get(metadata.baseModelId) : undefined);
+	return map.get(metadata.piModelId);
 }
 
 function getEffectiveFast(modelId: string): boolean | undefined {
@@ -213,8 +204,7 @@ function getEffectiveFast(modelId: string): boolean | undefined {
 	return resolveCursorFastDefault({
 		cliForceNoFast,
 		cliForceFast,
-		aliasOverride: metadata.fastOverride,
-		sessionValue: authoritativeGlobalFastPreferenceIds.has(getFastPreferenceModelId(metadata))
+		sessionValue: authoritativeGlobalFastPreferenceIds.has(metadata.piModelId)
 			? undefined
 			: getMapFastPreference(sessionFastPreferences, metadata),
 		userValue: getMapFastPreference(globalFastPreferences, metadata),
@@ -465,16 +455,7 @@ export function registerCursorRuntimeControls(pi: CursorRuntimeControlsExtension
 				ctx.ui.notify("Cursor fast is forced by --cursor-fast", "info");
 				return;
 			}
-			if (metadata.fastOverride !== undefined) {
-				const state = metadata.fastOverride ? "enabled" : "disabled";
-				ctx.ui.notify(
-					`Cursor fast is fixed ${state} by selected model ${metadata.piModelId}; choose ${getVirtualFastBaseModelId(metadata.piModelId)} to use /cursor-fast preferences`,
-					"info",
-				);
-				return;
-			}
-
-			const preferenceModelId = getFastPreferenceModelId(metadata);
+			const preferenceModelId = metadata.piModelId;
 			const current = getEffectiveFast(metadata.piModelId) ?? false;
 			const next = !current;
 			let appendError: unknown;

package/src/index.ts

@@ -4,7 +4,6 @@ import { discoverModels, type CursorModelFallbackIssue } from "./model-discovery
 import { registerCursorRuntimeControls } from "./cursor-state.js";
 import { registerCursorNativeToolDisplay } from "./cursor-native-tool-display-registration.js";
 import { registerCursorPiToolBridge, registerNestedCursorPiToolBridge } from "./cursor-pi-tool-bridge.js";
-import { registerCursorQuestionTool } from "./cursor-question-tool.js";
 import { registerCursorSkillTool } from "./cursor-skill-tool.js";
 import { registerCursorSessionScope } from "./cursor-session-scope.js";
 import { registerCursorSessionAgentLifecycle } from "./cursor-session-agent-lifecycle.js";
@@ -34,7 +33,6 @@ type CursorExtensionApi =
 	& Parameters<typeof registerCursorSessionAgentResume>[0]
 	& Parameters<typeof registerCursorRuntimeControls>[0]
 	& Parameters<typeof registerCursorNativeToolDisplay>[0]
-	& Parameters<typeof registerCursorQuestionTool>[0]
 	& Parameters<typeof registerCursorSkillTool>[0]
 	& Parameters<typeof registerCursorPiToolBridge>[0]
 	& Parameters<typeof registerCursorFallbackIssueWarning>[0]
@@ -129,7 +127,6 @@ export default async function (pi: CursorExtensionApi) {
 		});
 		registerCursorRuntimeControls(pi);
 		registerCursorNativeToolDisplay(pi);
-		registerCursorQuestionTool(pi);
 		registerCursorSkillTool(pi);
 		registerCursorPiToolBridge(pi);
 		registerCursorAgentsContextDedup(pi);