pi-cursor-sdk 0.4.0 → 0.5.0

package/src/index.ts

@@ -1,21 +1,23 @@
-import type { ExtensionAPI, ProviderConfig, ProviderModelConfig } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { discoverModels, type CursorModelFallbackIssue } from "./model-discovery.js";
 import { registerCursorRuntimeControls } from "./cursor-state.js";
 import { registerCursorNativeToolDisplay } from "./cursor-native-tool-display-registration.js";
 import { registerCursorPiToolBridge } 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 { registerCursorProviderBinding } from "./cursor-provider-binding.js";
+import { getCursorSessionScopeSnapshot, registerCursorSessionScope } from "./cursor-session-scope.js";
 import { registerCursorSessionAgentLifecycle } from "./cursor-session-agent-lifecycle.js";
 import { registerCursorSessionAgentLineage } from "./cursor-session-agent-lineage.js";
 import { registerCursorSessionAgentResume } from "./cursor-session-agent-resume.js";
-import { streamCursorLazy } from "./cursor-provider-lazy.js";
-import { CURSOR_API_KEY_CONFIG_VALUE, resolveCursorApiKey } from "./cursor-api-key.js";
+import { resolveCursorApiKey } from "./cursor-api-key.js";
 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 { prepareCursorSessionForCompaction } from "./cursor-session-compaction-prep.js";
+import { registerCursorUsageLedger } from "./cursor-usage-ledger.js";
+import { registerCursorUsageCommand } from "./cursor-usage-command.js";
 
 type CursorExtensionApi =
 	& Pick<ExtensionAPI, "registerProvider" | "registerCommand" | "on">
@@ -31,31 +33,20 @@ type CursorExtensionApi =
 	& Parameters<typeof registerCursorFallbackIssueWarning>[0]
 	& Parameters<typeof registerCursorAgentsContextDedup>[0]
 	& Parameters<typeof registerCursorOverflowNormalization>[0]
-	& Parameters<typeof registerCursorSdkSessionProcessErrorGuard>[0];
-
-function createCursorProviderConfig(models: ProviderModelConfig[]): ProviderConfig {
-	return {
-		name: "Cursor",
-		baseUrl: "https://cursor.com",
-		apiKey: CURSOR_API_KEY_CONFIG_VALUE,
-		api: "cursor-sdk",
-		models,
-		streamSimple: streamCursorLazy,
-	};
-}
-
-function registerCursorProvider(pi: Pick<ExtensionAPI, "registerProvider">, models: ProviderModelConfig[]): void {
-	pi.registerProvider("cursor", createCursorProviderConfig(models));
-}
+	& Parameters<typeof registerCursorSdkSessionProcessErrorGuard>[0]
+	& Parameters<typeof registerCursorUsageLedger>[0];
 
 export default async function (pi: CursorExtensionApi) {
 	// Session cwd must register before other session_start listeners that depend on it.
 	registerCursorSessionScope(pi);
+	registerCursorUsageLedger(pi);
+	registerCursorUsageCommand(pi);
+	const registerCursorProvider = registerCursorProviderBinding(pi);
 	registerCursorSessionAgentLineage(pi);
 	registerCursorSessionAgentLifecycle(pi);
 	registerCursorSessionAgentResume(pi);
 	pi.on("session_before_compact", async () => {
-		await prepareCursorSessionForCompaction();
+		await prepareCursorSessionForCompaction(getCursorSessionScopeSnapshot(pi).scopeKey);
 	});
 	registerCursorRuntimeControls(pi);
 	registerCursorNativeToolDisplay(pi);
@@ -87,7 +78,7 @@ export default async function (pi: CursorExtensionApi) {
 					refreshFallbackIssue = issue;
 				},
 			});
-			registerCursorProvider(pi, refreshedModels);
+			registerCursorProvider(refreshedModels);
 			if (!ctx.hasUI) return;
 			if (refreshFallbackIssue) {
 				ctx.ui.notify(`Cursor model catalog refresh did not use a live catalog: ${refreshFallbackIssue.message}`, "warning");
@@ -97,7 +88,7 @@ export default async function (pi: CursorExtensionApi) {
 		},
 	});
 
-	registerCursorProvider(pi, models);
+	registerCursorProvider(models);
 	// Register last so session_shutdown cleanup remains protected until other Cursor handlers finish.
 	registerCursorSdkSessionProcessErrorGuard(pi);
 }

package/src/model-discovery.ts

@@ -4,13 +4,13 @@ import type {
 	ModelParameterValue,
 	ModelSelection,
 } from "@cursor/sdk";
-import type { ProviderModelConfig } from "@earendil-works/pi-coding-agent";
+import type { ProviderModelConfig as PiProviderModelConfig } from "@earendil-works/pi-coding-agent";
 import type { ModelThinkingLevel, ThinkingLevelMap } from "@earendil-works/pi-ai";
 import { getCursorModelSelectionIdentities } from "../shared/cursor-model-selection-identities.mjs";
 import { loadContextWindowCache } from "./context-window-cache.js";
 import { loadCursorSdk } from "./cursor-sdk-runtime.js";
 import { resolveCursorApiKey, resolveCursorRuntimeApiKey } from "./cursor-api-key.js";
-import { scrubSensitiveText } from "./cursor-sensitive-text.js";
+import { sanitizeCursorProviderError } from "./cursor-provider-errors.js";
 import {
 	fingerprintApiKey,
 	loadAnyCachedModelCatalog,
@@ -18,6 +18,8 @@ import {
 	saveModelListCache,
 } from "./model-list-cache.js";
 
+type ProviderModelConfig = Extract<PiProviderModelConfig, { reasoning: boolean }>;
+
 const FALLBACK_CONTEXT_WINDOW = 128000;
 const FALLBACK_MAX_TOKENS = 16384;
 const ZERO_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
@@ -65,6 +67,7 @@ export interface CursorModelMetadata {
 		reasoning: boolean;
 		effort: boolean;
 		thinking: boolean;
+		reasoning_effort: boolean;
 		fast: boolean;
 	};
 }
@@ -114,7 +117,7 @@ function getThinkingLevelMap(item: ModelListItem): ThinkingLevelMap | undefined
 	const reasoningParameter = getParameter(item, "reasoning");
 	const effortParameter = getParameter(item, "effort");
 	const thinkingParameter = getParameter(item, "thinking");
-	const valueParameter = effortParameter ?? reasoningParameter ?? thinkingParameter;
+	const valueParameter = effortParameter ?? reasoningParameter ?? thinkingParameter ?? getParameter(item, "reasoning_effort");
 	if (!valueParameter) return undefined;
 
 	if (valueParameter.id === "thinking" && hasBooleanValues(valueParameter)) {
@@ -235,6 +238,7 @@ function toMetadata(
 			reasoning: getParameter(item, "reasoning") !== undefined,
 			effort: getParameter(item, "effort") !== undefined,
 			thinking: getParameter(item, "thinking") !== undefined,
+			reasoning_effort: getParameter(item, "reasoning_effort") !== undefined,
 			fast: getParameter(item, "fast") !== undefined,
 		},
 	};
@@ -280,15 +284,6 @@ export function getCursorModelMetadata(modelId: string): CursorModelMetadata | u
 	return metadataByPiModelId.get(modelId);
 }
 
-export function getCursorModelMetadataEntries(): CursorModelMetadata[] {
-	return [...metadataByPiModelId.values()].map((metadata) => ({
-		...metadata,
-		defaultParams: cloneParams(metadata.defaultParams),
-		...(metadata.thinkingLevelMap ? { thinkingLevelMap: { ...metadata.thinkingLevelMap } } : {}),
-		parameterIds: { ...metadata.parameterIds },
-	}));
-}
-
 function setParam(params: ModelParameterValue[], id: string, value: string): void {
 	const existing = params.find((param) => param.id === id);
 	if (existing) {
@@ -336,6 +331,8 @@ function applyThinkingLevel(
 
 	if (metadata.parameterIds.thinking) {
 		setParam(params, "thinking", mapped);
+	} else if (metadata.parameterIds.reasoning_effort) {
+		setParam(params, "reasoning_effort", mapped);
 	}
 }
 
@@ -357,11 +354,6 @@ export function buildCursorModelSelection(
 	return params.length > 0 ? { id: metadata.selectionModelId, params } : { id: metadata.selectionModelId };
 }
 
-function sanitizeDiscoveryError(error: unknown, apiKey: string): string | undefined {
-	const message = error instanceof Error ? error.message : typeof error === "string" ? error : "";
-	return scrubSensitiveText(message, apiKey).trim() || undefined;
-}
-
 async function useFallbackModels(options: DiscoverModelsOptions, issue: CursorModelFallbackIssue): Promise<ProviderModelConfig[]> {
 	options.onFallback?.(issue);
 	const { FALLBACK_MODEL_ITEMS } = await import("./cursor-fallback-models.generated.js");
@@ -398,7 +390,7 @@ export async function discoverModels(options: DiscoverModelsOptions = {}): Promi
 			message: `Cursor model discovery returned no models. Using fallback Cursor models; verify ${AUTH_SETUP_HINT}. ${CATALOG_REFRESH_HINT}`,
 		});
 	} catch (error) {
-		const errorMessage = sanitizeDiscoveryError(error, apiKey);
+		const errorMessage = sanitizeCursorProviderError(error, apiKey);
 		// Prefer a previously cached catalog over the generic bundled fallback when
 		// a live refresh fails (e.g. transient network/auth errors), but keep the
 		// provenance visible so refresh commands do not claim a live refresh worked.
@@ -406,15 +398,15 @@ export async function discoverModels(options: DiscoverModelsOptions = {}): Promi
 		if (cachedCatalog && cachedCatalog.models.length > 0) {
 			options.onFallback?.({
 				reason: "cached-after-error",
-				message: `Cursor model discovery failed; using cached Cursor model catalog from ${new Date(cachedCatalog.fetchedAt).toISOString()}.${errorMessage ? ` ${errorMessage}` : ""}`,
-				...(errorMessage ? { errorMessage } : {}),
+				message: `Cursor model discovery failed; using cached Cursor model catalog from ${new Date(cachedCatalog.fetchedAt).toISOString()}. ${errorMessage}`,
+				errorMessage,
 			});
 			return registerModelItems(cachedCatalog.models);
 		}
 		return useFallbackModels(options, {
 			reason: "discovery-failed",
-			message: `Cursor model discovery failed${errorMessage ? `: ${errorMessage}` : ""}. Using fallback Cursor models; verify ${AUTH_SETUP_HINT}. ${CATALOG_REFRESH_HINT}`,
-			...(errorMessage ? { errorMessage } : {}),
+			message: `Cursor model discovery failed: ${errorMessage} Using fallback Cursor models; run /cursor-refresh-models to retry discovery.`,
+			errorMessage,
 		});
 	}
 }