pi-cursor-sdk 0.1.62 → 0.3.6

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

@@ -4,6 +4,7 @@ import { Cursor } from "@cursor/sdk";
 import { defaultApiKeyFromEnv, parseArgv } from "./lib/cursor-cli-args.mjs";
 import { scrubSensitiveText } from "../shared/cursor-sensitive-text.mjs";
 import { createScriptFail } from "./lib/cursor-script-fail.mjs";
+import { normalizeCursorContextWindowEntries } from "../shared/cursor-model-selection-identities.mjs";
 
 const FALLBACK_MODELS_PATH = "src/cursor-fallback-models.generated.ts";
 const CONTEXT_WINDOWS_PATH = "src/bundled-context-windows.ts";
@@ -40,7 +41,9 @@ Notes:
   - This script prints model IDs/counts only; it never prints API keys.
   - 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.`);
+    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.`);
 }
 
 const fail = createScriptFail("refresh-cursor-snapshots");
@@ -156,9 +159,10 @@ function hasContextParameter(model) {
 }
 
 function formatContextWindows(models, checkpointWindows, fallbackContextWindow) {
-	const existing = parseExistingContextWindows();
-	const merged = new Map(existing);
-	for (const [modelId, contextWindow] of checkpointWindows) merged.set(modelId, contextWindow);
+	const merged = normalizeCursorContextWindowEntries(models, parseExistingContextWindows(), "existing bundled context windows");
+	for (const [modelId, contextWindow] of normalizeCursorContextWindowEntries(models, checkpointWindows, "checkpoint context windows")) {
+		merged.set(modelId, contextWindow);
+	}
 	for (const model of models) {
 		if (!hasContextParameter(model) && !merged.has(model.id)) merged.set(model.id, fallbackContextWindow);
 	}
@@ -167,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// These are default/non-Max-mode SDK context windows for Cursor models that do not\n// expose a catalog \`context\` parameter. Do not replace them with Max Mode values\n// unless the Cursor SDK exposes an exact Max Mode model selection and the extension\n// uses that selection for matching pi model IDs.\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 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`;
 }
 
 const args = parseRefreshArgs(process.argv.slice(2));
@@ -184,11 +188,16 @@ if (!Array.isArray(rawModels) || rawModels.length === 0) fail("Cursor.models.lis
 const models = rawModels.map(sanitizeModelItem).sort((a, b) => a.id.localeCompare(b.id));
 const checkpointWindows = parseContextWindowsFile(args.contextWindowsPath);
 const fallbackSource = formatFallbackModels(models, sdkVersion);
-const contextWindowSource = args.contextWindowsPath ? formatContextWindows(models, checkpointWindows, args.fallbackContextWindow) : undefined;
+let contextWindowSource;
+try {
+	contextWindowSource = args.contextWindowsPath ? formatContextWindows(models, checkpointWindows, args.fallbackContextWindow) : undefined;
+} catch (error) {
+	fail(error instanceof Error ? error.message : String(error));
+}
 const existingContextWindowCount = parseExistingContextWindows().size;
 
 console.log(`Fetched ${models.length} Cursor models with @cursor/sdk@${sdkVersion}.`);
-console.log(`Context windows: ${checkpointWindows.size} checkpoint override(s), ${existingContextWindowCount} existing bundled entr${existingContextWindowCount === 1 ? "y" : "ies"}.`);
+console.log(`Context windows: ${checkpointWindows.size} checkpoint input(s), ${existingContextWindowCount} existing bundled entr${existingContextWindowCount === 1 ? "y" : "ies"}.`);
 console.log(`First models: ${models.slice(0, 8).map((model) => model.id).join(", ")}${models.length > 8 ? ", ..." : ""}`);
 
 if (args.check) {

package/scripts/steering-rpc-smoke.mjs

@@ -16,6 +16,7 @@ import {
 } from "./lib/cursor-child-process.mjs";
 import { apiKeySecretsFromProcess } from "./lib/cursor-cli-args.mjs";
 import { buildCursorSmokeEnv, CURSOR_SDK_EVENT_DEBUG_ENV_NAMES } from "./lib/cursor-smoke-env.mjs";
+import { ensureBuilt } from "./lib/ensure-built.mjs";
 import { scrubSensitiveText } from "../shared/cursor-sensitive-text.mjs";
 
 const root = fileURLToPath(new URL("..", import.meta.url));
@@ -170,7 +171,7 @@ function buildPiRpcEnv(baseEnv = process.env, nodePath = process.execPath) {
 }
 
 async function runPiRpcSmoke(sessionDir, piBin) {
-	const args = ["--approve", "-e", root, "--cursor-no-fast", "--model", "cursor/composer-2-5", "--mode", "rpc", "--session-dir", sessionDir];
+	const args = ["--approve", "-e", root, "--cursor-no-fast", "--model", "cursor/grok-4.6", "--mode", "rpc", "--session-dir", sessionDir];
 	const env = buildPiRpcEnv();
 
 	const child = spawn(piBin, args, {
@@ -263,7 +264,7 @@ async function runSelfTest() {
 		const envCapture = join(tempDir, "fake-pi.env");
 		writeFileSync(
 			fakePi,
-			`#!/usr/bin/env node\nconst { writeFileSync } = require("node:fs");\nwriteFileSync(${JSON.stringify(envCapture)}, Object.entries(process.env).map(([key, value]) => key + "=" + (value ?? "")).join("\\n") + "\\n", "utf8");\n`,
+			`#!/usr/bin/env node\nimport { writeFileSync } from "node:fs";\nwriteFileSync(${JSON.stringify(envCapture)}, Object.entries(process.env).map(([key, value]) => key + "=" + (value ?? "")).join("\\n") + "\\n", "utf8");\n`,
 			"utf8",
 		);
 		writeFileSync(fakeNode, `#!/bin/sh\necho fake-node-used > ${JSON.stringify(fakeNodeMarker)}\nexit 99\n`, "utf8");
@@ -332,6 +333,7 @@ async function main() {
 		printHelp();
 		return;
 	}
+	ensureBuilt();
 	if (process.argv.includes("--self-test")) {
 		await runSelfTest();
 		return;

package/scripts/tmux-live-smoke.sh

@@ -243,7 +243,7 @@ exec %s
 		"$TMUX_BIN" capture-pane -pt "$session" >"$capture" 2>/dev/null || true
 		missing=""
 		"$RG_BIN" -q "SUM=42" "$capture" || missing="${missing} SUM=42"
-		"$RG_BIN" -q "\\(cursor\\) composer-2[-.]5" "$capture" || missing="${missing} footer (cursor) composer-2-5"
+		"$RG_BIN" -q "\\(cursor\\) grok-4\\.6" "$capture" || missing="${missing} footer (cursor) grok-4.6"
 		if [[ -z "$missing" ]]; then
 			"$TMUX_BIN" kill-session -t "$session" 2>/dev/null || true
 			log "$name PASS"
@@ -311,14 +311,14 @@ printf '\''%%s\n'\'' "$code" > %q
 model_listed() {
 	local file="$1"
 	if [[ -n "${RG_BIN:-}" ]]; then
-		"$RG_BIN" -q "composer-2\.5" "$file"
+		"$RG_BIN" -q "grok-4\.6" "$file"
 	else
-		grep -q "composer-2\.5" "$file"
+		grep -q "grok-4\.6" "$file"
 	fi
 }
 
 # Capture full catalog then search. Never pipe list-models into rg -q under pipefail.
-capture_and_require_composer_model() {
+capture_and_require_default_model() {
 	local list_cmd=("$@")
 	local models_out="$SMOKE_DIR/prereq.models.txt"
 	local models_err="$SMOKE_DIR/prereq.stderr.txt"
@@ -326,7 +326,7 @@ capture_and_require_composer_model() {
 		fail "pi --list-models cursor failed"
 	fi
 	if ! model_listed "$models_out" && ! model_listed "$models_err"; then
-		fail "cursor/composer-2-5 not listed"
+		fail "cursor/grok-4.6 not listed"
 	fi
 }
 
@@ -343,7 +343,7 @@ run_self_test() {
 	env_capture="$temp_dir/fake-pi.env"
 	cat >"$fake_pi" <<EOF_SELFTEST_PI
 #!/usr/bin/env node
-const { writeFileSync } = require("node:fs");
+import { writeFileSync } from "node:fs";
 writeFileSync("$env_capture", Object.entries(process.env).map(([key, value]) => key + "=" + (value ?? "")).join("\\n") + "\\n", "utf8");
 EOF_SELFTEST_PI
 	cat >"$fake_node" <<EOF_SELFTEST_NODE
@@ -383,7 +383,7 @@ EOF_SELFTEST_NODE
 	if grep -q '^PI_CURSOR_SETTING_SOURCES=' "$env_capture"; then
 		fail "self-test failed: default-settings env did not unset PI_CURSOR_SETTING_SOURCES"
 	fi
-	# Large-catalog prereq: exercise the same capture_and_require_composer_model helper.
+	# Large-catalog prereq: exercise the same capture_and_require_default_model helper.
 	fake_list_pi="$bin_dir/pi-list-models"
 	cat >"$fake_list_pi" <<'EOF_FAKE_LIST'
 #!/usr/bin/env bash
@@ -392,11 +392,11 @@ while [[ $i -lt 20000 ]]; do
 	printf 'cursor/model-%s\n' "$i"
 	i=$((i + 1))
 done
-printf 'cursor/composer-2.5\n'
+printf 'cursor/grok-4.6\n'
 exit 0
 EOF_FAKE_LIST
 	chmod +x "$fake_list_pi"
-	SMOKE_DIR="$temp_dir" capture_and_require_composer_model "$fake_list_pi"
+	SMOKE_DIR="$temp_dir" capture_and_require_default_model "$fake_list_pi"
 	if [[ "$(wc -l <"$temp_dir/prereq.models.txt" | tr -d ' ')" -lt 20000 ]]; then
 		fail "self-test failed: large catalog was truncated before search"
 	fi
@@ -428,7 +428,7 @@ fi
 PI_BASE=(
 	"$PI_BIN" --approve -e "$ROOT"
 	--cursor-no-fast
-	--model cursor/composer-2-5
+	--model cursor/grok-4.6
 )
 
 if [[ -z "${CURSOR_API_KEY:-}" ]]; then
@@ -448,7 +448,7 @@ log "partial live smoke: prereq, basic, default-settings, noninteractive-math, t
 "${BASE_ENV[@]}" "$PI_BIN" --version | tee "$SMOKE_DIR/prereq.pi-version.txt"
 "${BASE_ENV[@]}" "$NPM_BIN" --prefix "$ROOT" ls @cursor/sdk @earendil-works/pi-coding-agent @earendil-works/pi-ai @earendil-works/pi-tui | tee "$SMOKE_DIR/prereq.npm-ls.txt"
 
-capture_and_require_composer_model "${NONE_ENV[@]}" "${PI_BASE[@]}" --list-models cursor
+capture_and_require_default_model "${NONE_ENV[@]}" "${PI_BASE[@]}" --list-models cursor
 log "prereq PASS"
 
 run_direct basic 600 retry-empty-output "PI_CURSOR_SMOKE_OK" "PI_CURSOR_SMOKE_OK" \

package/scripts/visual-tui-smoke-self-test.mjs

@@ -35,7 +35,7 @@ export function runVisualSmokeSelfTest(deps) {
 		const envCapture = join(tempDir, "fake-pi.env");
 		writeFileSync(
 			fakePi,
-			`#!/usr/bin/env node\nconst { writeFileSync } = require("node:fs");\nwriteFileSync(${JSON.stringify(envCapture)}, Object.entries(process.env).map(([key, value]) => key + "=" + (value ?? "")).join("\\n") + "\\n", "utf8");\n`,
+			`#!/usr/bin/env node\nimport { writeFileSync } from "node:fs";\nwriteFileSync(${JSON.stringify(envCapture)}, Object.entries(process.env).map(([key, value]) => key + "=" + (value ?? "")).join("\\n") + "\\n", "utf8");\n`,
 			"utf8",
 		);
 		writeFileSync(fakeNode, `#!/bin/sh\necho fake-node-used > ${shellQuote(fakeNodeMarker)}\nexit 99\n`, "utf8");
@@ -89,6 +89,9 @@ export function runVisualSmokeSelfTest(deps) {
 		assertSelfTest(defaults.get("PI_CURSOR_SETTING_SOURCES") === "none", "setting sources must default to none");
 		assertSelfTest(defaults.get("PI_CURSOR_PI_TOOL_BRIDGE") === "0", "bridge must default off");
 		assertSelfTest(defaults.get("PI_CURSOR_EXPOSE_BUILTIN_TOOLS") === "0", "built-in exposure must default off");
+		assertSelfTest(defaults.get("PI_CODING_AGENT_DIR") === join(tempDir, "pi-agent"), "agent dir must be isolated under out-dir");
+		assertSelfTest(defaults.get("PI_OFFLINE") === "1", "startup network operations must be off");
+		assertSelfTest(defaults.get("PI_SKIP_VERSION_CHECK") === "1", "pi.dev version check must be off");
 		for (const name of DEBUG_ENV_NAMES) {
 			assertSelfTest(plan.clearEnvNames.includes(name), `${name} must be cleared by default`);
 		}

package/scripts/visual-tui-smoke.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
-import { accessSync, constants, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import { accessSync, chmodSync, constants, copyFileSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
 import { delimiter, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { commonBooleanFlag, commonRepeatStringFlag, parseArgv } from "./lib/cursor-cli-args.mjs";
@@ -15,7 +16,7 @@ const DEFAULT_HEIGHT = 45;
 const DEFAULT_WAIT_MS = 60_000;
 const DEFAULT_STARTUP_MS = 5_000;
 const DEFAULT_HISTORY_LINES = 3_000;
-const DEFAULT_MODEL = "cursor/composer-2-5";
+const DEFAULT_MODEL = "cursor/grok-4.6";
 const DEFAULT_MODE = "plan";
 const DEFAULT_SETTING_SOURCES = "none";
 const DEBUG_ENV_NAMES = CURSOR_SDK_EVENT_DEBUG_ENV_NAMES;
@@ -44,7 +45,7 @@ Common options:
   --model MODEL                 Cursor model. Default: ${DEFAULT_MODEL}.
   --mode agent|plan             Cursor SDK mode. Default: ${DEFAULT_MODE}.
   --session-dir PATH            pi session directory. Default: <out-dir>/<label>.session.
-  --session-id ID               pi session id. Default: visual-<label>-<timestamp>.
+  --session-id ID               pi session id; pass to resume a prior capture session. Default: pi-assigned, so fresh captures avoid the new-session warning line.
   --width N                     PTY columns. Default: ${DEFAULT_WIDTH}.
   --height N                    PTY rows. Default: ${DEFAULT_HEIGHT}.
   --history-lines N             tmux capture history lines. Default: ${DEFAULT_HISTORY_LINES}.
@@ -63,7 +64,11 @@ Native replay isolation defaults:
   PI_CURSOR_SETTING_SOURCES=none
   PI_CURSOR_PI_TOOL_BRIDGE=0
   PI_CURSOR_EXPOSE_BUILTIN_TOOLS=0
+  PI_CODING_AGENT_DIR=<out-dir>/pi-agent  (seeded auth.json + quietStartup; host extensions stay out)
+  PI_OFFLINE=1
+  PI_SKIP_VERSION_CHECK=1
   TERM=xterm-256color
+  tmux starts in --cwd with a non-login shell so a stale tmux-server cwd cannot print getcwd errors
   Debug artifact env is cleared before each run; --event-debug sets a deterministic debug dir.
 
 Artifacts written:
@@ -194,10 +199,26 @@ function parseArgs(argv) {
 	options.safeLabel = sanitizeLabel(options.label);
 	options.outDir ??= resolve(`/tmp/pi-cursor-sdk-visual-smoke-${timestamp()}`);
 	options.sessionDir ??= resolve(options.outDir, `${options.safeLabel}.session`);
-	options.sessionId ??= `visual-${options.safeLabel}-${Date.now()}`;
+	options.agentDir ??= resolve(options.outDir, "pi-agent");
 	return options;
 }
 
+function seedVisualAgentDir(agentDir) {
+	mkdirSync(agentDir, { recursive: true });
+	const srcAuth = join(homedir(), ".pi", "agent", "auth.json");
+	const destAuth = join(agentDir, "auth.json");
+	try {
+		copyFileSync(srcAuth, destAuth);
+		chmodSync(destAuth, 0o600);
+	} catch {
+		// CURSOR_API_KEY remains the fallback when host auth.json is absent.
+	}
+	writeFileSync(
+		join(agentDir, "settings.json"),
+		`${JSON.stringify({ quietStartup: true, enableInstallTelemetry: false })}\n`,
+	);
+}
+
 function sanitizeLabel(label) {
 	const safe = label.trim().replace(/[^A-Za-z0-9_.-]+/g, "-").replace(/^-+|-+$/g, "");
 	return safe || "visual-smoke";
@@ -359,7 +380,13 @@ function buildLaunchPlan(options, commands, shell) {
 		eventDebugDir: options.eventDebug ? resolve(options.outDir, `${options.safeLabel ?? "visual-smoke"}.cursor-sdk-events`) : undefined,
 	});
 	const sealedPath = commands.sealedPath ?? smokeEnvPlan.sealedPath;
-	const envAssignments = smokeEnvPlan.envEntries;
+	const agentDir = options.agentDir ?? resolve(options.outDir, "pi-agent");
+	const envAssignments = [
+		...smokeEnvPlan.envEntries,
+		["PI_CODING_AGENT_DIR", agentDir],
+		["PI_OFFLINE", "1"],
+		["PI_SKIP_VERSION_CHECK", "1"],
+	];
 	const clearEnvNames = smokeEnvPlan.clearEnvNames;
 	const command = [
 		...envAssignments.map(([name, value]) => `${name}=${shellQuote(value)}`),
@@ -370,7 +397,7 @@ function buildLaunchPlan(options, commands, shell) {
 		"--cursor-no-fast",
 		"--cursor-mode", shellQuote(options.mode),
 		"--session-dir", shellQuote(options.sessionDir),
-		"--session-id", shellQuote(options.sessionId),
+		...(options.sessionId ? ["--session-id", shellQuote(options.sessionId)] : []),
 		"--model", shellQuote(options.model),
 	].join(" ");
 	const clearLines = clearEnvNames.map((name) => `unset ${name}`).join("\n");
@@ -397,6 +424,8 @@ function runVisualSmoke(options) {
 
 	mkdirSync(options.outDir, { recursive: true });
 	mkdirSync(options.sessionDir, { recursive: true });
+	options.agentDir ??= resolve(options.outDir, "pi-agent");
+	seedVisualAgentDir(options.agentDir);
 
 	const sessionName = `pi-visual-${options.safeLabel}-${process.pid}`;
 	const bufferName = `pi-visual-prompt-${process.pid}`;
@@ -418,7 +447,22 @@ function runVisualSmoke(options) {
 	const jsonlMtimesBeforeRun = snapshotJsonlMtimes(options.sessionDir);
 	const runStartedAtMs = Date.now();
 	try {
-		const start = run(commands.tmux, ["new-session", "-d", "-s", sessionName, "-x", String(options.width), "-y", String(options.height), "--", shell, "-lc", script]);
+		const start = run(commands.tmux, [
+			"new-session",
+			"-d",
+			"-s",
+			sessionName,
+			"-c",
+			options.cwd,
+			"-x",
+			String(options.width),
+			"-y",
+			String(options.height),
+			"--",
+			shell,
+			"-c",
+			script,
+		]);
 		if (start.status !== 0) throw new Error(`tmux new-session failed: ${start.stderr?.toString().trim() || start.status}`);
 		sessionStarted = true;
 

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

@@ -0,0 +1,21 @@
+import type { ModelListItem } from "@cursor/sdk";
+
+export interface CursorModelSelectionIdentity {
+	model: ModelListItem;
+	selectionModelId: string;
+	context?: string;
+	fastOverride?: boolean;
+	piModelId: string;
+	contextWindowKey: string;
+	baseContextWindowKey: string;
+}
+
+export declare function getCursorModelSelectionIdentities(
+	models: readonly ModelListItem[],
+): CursorModelSelectionIdentity[];
+
+export declare function normalizeCursorContextWindowEntries(
+	models: readonly ModelListItem[],
+	entries: ReadonlyMap<string, number>,
+	source?: string,
+): Map<string, number>;

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

@@ -0,0 +1,95 @@
+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;
+}
+
+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;
+}
+
+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;
+}
+
+export function normalizeCursorContextWindowEntries(models, entries, source = "context windows") {
+	const canonicalBySelectableId = new Map(
+		getCursorModelSelectionIdentities(models).map(({ piModelId, contextWindowKey }) => [piModelId, contextWindowKey]),
+	);
+	const normalized = new Map();
+	for (const [modelId, contextWindow] of entries) {
+		const canonicalId = modelId === "default" ? modelId : canonicalBySelectableId.get(modelId);
+		if (!canonicalId) continue;
+		const existing = normalized.get(canonicalId);
+		if (existing !== undefined && existing !== contextWindow) {
+			throw new Error(`${source} assigns conflicting windows to equivalent selection ${canonicalId}: ${existing} and ${contextWindow}`);
+		}
+		normalized.set(canonicalId, contextWindow);
+	}
+	return normalized;
+}

package/src/bundled-context-windows.ts

@@ -1,30 +1,39 @@
-// Generated from Cursor SDK checkpoint tokenDetails.maxTokens on 2026-05-18.
+// 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
-// These are default/non-Max-mode SDK context windows for Cursor models that do not
-// expose a catalog `context` parameter. Do not replace them with Max Mode values
-// unless the Cursor SDK exposes an exact Max Mode model selection and the extension
-// uses that selection for matching pi model IDs.
+// 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.
 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,
-	"composer-1.5": 200000,
+	"claude-opus-4-8@1m": 300000,
 	"composer-2": 200000,
 	"composer-2.5": 200000,
 	"gemini-2.5-flash": 200000,
 	"gemini-3-flash": 200000,
 	"gemini-3.1-pro": 200000,
+	"gemini-3.5-flash": 200000,
+	"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.1-codex-max": 272000,
-	"gpt-5.1-codex-mini": 272000,
 	"gpt-5.2": 272000,
-	"gpt-5.2-codex": 272000,
 	"gpt-5.3-codex": 272000,
-	"gpt-5.3-codex-spark": 128000,
 	"gpt-5.4-mini": 272000,
 	"gpt-5.4-nano": 272000,
 	"gpt-5.5@272k": 272000,
-	"grok-4-20": 200000,
-	"kimi-k2.5": 262000,
+	"gpt-5.6@1m": 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

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import type { Context, Message, ToolCall } from "@earendil-works/pi-ai/compat";
+import type { Context, Message, ToolCall } from "@earendil-works/pi-ai";
 import { convertToLlm } from "@earendil-works/pi-coding-agent";
 import type { AgentModeOption, SDKImage } from "@cursor/sdk";
 import { CURSOR_PI_BRIDGE_PREFERENCE_TEXT } from "./cursor-bridge-contract.js";

package/src/cursor-agents-context-registration.ts

@@ -1,14 +1,14 @@
 import { isCursorModel } from "./cursor-model.js";
 import { registerCursorModelLifecycle, type CursorModelLifecycleExtensionApi } from "./cursor-model-lifecycle.js";
 import { resolveEffectiveCursorConfigForContext } from "./cursor-runtime-state.js";
+import { resolveCursorFacingSystemPrompt } from "./cursor-agents-context.js";
 
 export type CursorAgentsContextExtensionApi = CursorModelLifecycleExtensionApi;
 
 export function registerCursorAgentsContextDedup(pi: CursorAgentsContextExtensionApi): void {
 	registerCursorModelLifecycle(pi, {
-		beforeAgentStart: async (event, ctx) => {
+		beforeAgentStart: (event, ctx) => {
 			if (!isCursorModel(ctx.model)) return undefined;
-			const { resolveCursorFacingSystemPrompt } = await import("./cursor-agents-context.js");
 			const runtime = resolveEffectiveCursorConfigForContext(ctx).runtime.value;
 			const resolved = resolveCursorFacingSystemPrompt(
 				event.systemPrompt,

package/src/cursor-agents-context.ts

@@ -12,8 +12,6 @@ import {
 } from "./cursor-setting-sources.js";
 import type { SettingSource } from "@cursor/sdk";
 import type { CursorRuntime } from "./cursor-config.js";
-export { registerCursorAgentsContextDedup, type CursorAgentsContextExtensionApi } from "./cursor-agents-context-registration.js";
-
 export const CURSOR_PRESERVE_PI_AGENTS_MD_ENV = "PI_CURSOR_PRESERVE_PI_AGENTS_MD";
 
 /** Opening tag prefix pi `buildSystemPrompt()` uses for each context file (path attribute only). */

package/src/cursor-api-key.ts

@@ -1,3 +1,5 @@
+import { readStoredCredential } from "@earendil-works/pi-coding-agent";
+
 export const CURSOR_API_KEY_ENV_VAR = "CURSOR_API_KEY";
 const CURSOR_PROVIDER_ID = "cursor";
 
@@ -21,9 +23,8 @@ export function resolveCursorApiKey(apiKey?: string): string | undefined {
 	return trimmed;
 }
 
-async function getStoredCursorApiKey(): Promise<string | undefined> {
+function getStoredCursorApiKey(): string | undefined {
 	try {
-		const { readStoredCredential } = await import("@earendil-works/pi-coding-agent");
 		const credential = readStoredCredential(CURSOR_PROVIDER_ID);
 		return resolveCursorApiKey(credential?.type === "api_key" ? credential.key : undefined);
 	} catch {
@@ -31,6 +32,6 @@ async function getStoredCursorApiKey(): Promise<string | undefined> {
 	}
 }
 
-export async function resolveCursorRuntimeApiKey(): Promise<string | undefined> {
-	return (await getStoredCursorApiKey()) ?? resolveCursorApiKey(process.env.CURSOR_API_KEY);
+export function resolveCursorRuntimeApiKey(): Promise<string | undefined> {
+	return Promise.resolve(getStoredCursorApiKey() ?? resolveCursorApiKey(process.env.CURSOR_API_KEY));
 }

package/src/cursor-cloud-reporting.ts

@@ -170,17 +170,38 @@ export async function fetchCursorCloudRawUsage(
 	}
 }
 
+function mapCursorSdkAgentUsageToCloudReport(value: unknown, runId?: string): CursorCloudUsageReport | undefined {
+	const record = asRecord(value);
+	const runs = (getArray(record, "runs") ?? []).map(asRecord);
+	const matchingRun = runId ? runs.find((run) => getString(run, "runId") === runId) : undefined;
+	return normalizeUsage({
+		totalUsage: getRecord(record, "usage"),
+		runUsage: getRecord(matchingRun, "usage"),
+	});
+}
+
 export async function collectCursorCloudRunReport(options: {
 	agent: SDKAgent;
 	run: Run;
 	waitResult: RunResult;
 	apiKey: string | undefined;
+	agentUsage?: unknown;
 }): Promise<CursorCloudRunReport> {
 	const listArtifacts = options.agent.listArtifacts;
-	const [artifactResult, usage] = await Promise.all([
+	const sdkUsage =
+		options.agentUsage !== undefined
+			? mapCursorSdkAgentUsageToCloudReport(options.agentUsage, options.run.id)
+			: typeof options.agent.getUsage === "function"
+				? mapCursorSdkAgentUsageToCloudReport(
+					await withTimeout(Promise.resolve(options.agent.getUsage({ runId: options.run.id }))),
+					options.run.id,
+				)
+				: undefined;
+	const [artifactResult, restUsage] = await Promise.all([
 		typeof listArtifacts === "function" ? withTimeout(listArtifacts.call(options.agent)) : undefined,
-		fetchCursorCloudRawUsage({ agentId: options.run.agentId, runId: options.run.id, apiKey: options.apiKey }),
+		sdkUsage ? undefined : fetchCursorCloudRawUsage({ agentId: options.run.agentId, runId: options.run.id, apiKey: options.apiKey }),
 	]);
+	const usage = sdkUsage ?? restUsage;
 	const waitBranches = getArray(getRecord(asRecord(options.waitResult), "git"), "branches");
 	const runBranches = getArray(getRecord(asRecord(options.run), "git"), "branches");
 	return {

package/src/cursor-context-tools.ts

@@ -1,4 +1,4 @@
-import type { Context } from "@earendil-works/pi-ai/compat";
+import type { Context } from "@earendil-works/pi-ai";
 
 /** Tool names from the provider context snapshot at stream start (not live pi.getActiveTools()). */
 export function getActiveContextToolNames(context: Context): ReadonlySet<string> | undefined {

package/src/cursor-display-only-trace.ts

@@ -1,4 +1,4 @@
-import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai/compat";
+import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai";
 
 function withDisplayOnlyThinking(partial: AssistantMessage, thinking: string): AssistantMessage {
 	return { ...partial, content: [...partial.content, { type: "thinking", thinking }] };