pi-cursor-sdk 0.1.36 → 0.1.38

package/src/cursor-web-tool-args.ts

@@ -1,17 +1,9 @@
-import { asRecord } from "./cursor-record-utils.js";
+import { asRecord, firstNonEmptyString } from "./cursor-record-utils.js";
 
 function getNestedMcpArgs(args: Record<string, unknown>): Record<string, unknown> {
 	return asRecord(args.args) ?? {};
 }
 
-function firstNonEmptyString(...values: Array<string | undefined>): string | undefined {
-	for (const value of values) {
-		const trimmed = value?.trim();
-		if (trimmed) return trimmed;
-	}
-	return undefined;
-}
-
 export function extractWebSearchQuery(args: Record<string, unknown>): string | undefined {
 	const nested = getNestedMcpArgs(args);
 	return firstNonEmptyString(

package/src/index.ts

@@ -1,26 +1,27 @@
-import type { ExtensionAPI, ExtensionContext, ProviderConfig, ProviderModelConfig } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ProviderConfig, ProviderModelConfig } 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.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 { registerCursorSessionCwd } from "./cursor-session-cwd.js";
-import { registerCursorAgentsContextDedup } from "./cursor-agents-context.js";
-import { registerCursorSessionAgent } from "./cursor-session-agent.js";
-import { prepareCursorSessionForCompaction } from "./cursor-session-compaction-prep.js";
-import { streamCursor } from "./cursor-provider.js";
+import { registerCursorSessionScope } from "./cursor-session-scope.js";
+import { registerCursorSessionAgentLifecycle } from "./cursor-session-agent-lifecycle.js";
+import { streamCursorLazy } from "./cursor-provider-lazy.js";
 import { CURSOR_API_KEY_CONFIG_VALUE } from "./cursor-api-key.js";
+import { registerCursorFallbackIssueWarning } from "./cursor-fallback-warning.js";
+import { registerCursorAgentsContextDedup } from "./cursor-agents-context-registration.js";
 
 type CursorExtensionApi =
 	& Pick<ExtensionAPI, "registerProvider" | "registerCommand" | "on">
-	& Parameters<typeof registerCursorSessionCwd>[0]
-	& Parameters<typeof registerCursorSessionAgent>[0]
+	& Parameters<typeof registerCursorSessionScope>[0]
+	& Parameters<typeof registerCursorSessionAgentLifecycle>[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]
 	& Parameters<typeof registerCursorAgentsContextDedup>[0];
 
 function createCursorProviderConfig(models: ProviderModelConfig[]): ProviderConfig {
@@ -30,7 +31,7 @@ function createCursorProviderConfig(models: ProviderModelConfig[]): ProviderConf
 		apiKey: CURSOR_API_KEY_CONFIG_VALUE,
 		api: "cursor-sdk",
 		models,
-		streamSimple: streamCursor,
+		streamSimple: streamCursorLazy,
 	};
 }
 
@@ -40,9 +41,10 @@ function registerCursorProvider(pi: Pick<ExtensionAPI, "registerProvider">, mode
 
 export default async function (pi: CursorExtensionApi) {
 	// Session cwd must register before other session_start listeners that depend on it.
-	registerCursorSessionCwd(pi);
-	registerCursorSessionAgent(pi);
+	registerCursorSessionScope(pi);
+	registerCursorSessionAgentLifecycle(pi);
 	pi.on("session_before_compact", async () => {
+		const { prepareCursorSessionForCompaction } = await import("./cursor-session-compaction-prep.js");
 		await prepareCursorSessionForCompaction();
 	});
 	registerCursorRuntimeControls(pi);
@@ -59,10 +61,7 @@ export default async function (pi: CursorExtensionApi) {
 	});
 
 	if (fallbackIssue) {
-		const issue = fallbackIssue;
-		pi.on("session_start", async (_event, ctx) => {
-			if (ctx.hasUI) ctx.ui.notify(issue.message, "warning");
-		});
+		registerCursorFallbackIssueWarning(pi, fallbackIssue);
 	}
 
 	pi.registerCommand("cursor-refresh-models", {

package/src/model-discovery.ts

@@ -4,12 +4,11 @@ import type {
 	ModelParameterValue,
 	ModelSelection,
 } from "@cursor/sdk";
-import { AuthStorage, type ProviderModelConfig } from "@earendil-works/pi-coding-agent";
+import type { ProviderModelConfig } from "@earendil-works/pi-coding-agent";
 import type { ModelThinkingLevel, ThinkingLevelMap } from "@earendil-works/pi-ai";
 import { loadContextWindowCache } from "./context-window-cache.js";
 import { loadCursorSdk } from "./cursor-sdk-runtime.js";
-import { CURSOR_API_KEY_ENV_VAR, resolveCursorApiKey } from "./cursor-api-key.js";
-import { FALLBACK_MODEL_ITEMS } from "./cursor-fallback-models.generated.js";
+import { resolveCursorApiKey } from "./cursor-api-key.js";
 import {
 	fingerprintApiKey,
 	loadAnyCachedModelCatalog,
@@ -62,6 +61,7 @@ function getCliApiKeyFromArgv(argv: string[] = process.argv): string | undefined
 
 async function getStoredCursorApiKey(): Promise<string | undefined> {
 	try {
+		const { AuthStorage } = await import("@earendil-works/pi-coding-agent");
 		return resolveCursorApiKey(await AuthStorage.create().getApiKey(CURSOR_PROVIDER_ID, { includeFallback: false }));
 	} catch {
 		return undefined;
@@ -462,8 +462,9 @@ function sanitizeDiscoveryError(error: unknown, apiKey: string): string | undefi
 	return scrubbed || undefined;
 }
 
-function useFallbackModels(options: DiscoverModelsOptions, issue: CursorModelFallbackIssue): ProviderModelConfig[] {
+async function useFallbackModels(options: DiscoverModelsOptions, issue: CursorModelFallbackIssue): Promise<ProviderModelConfig[]> {
 	options.onFallback?.(issue);
+	const { FALLBACK_MODEL_ITEMS } = await import("./cursor-fallback-models.generated.js");
 	return registerModelItems(FALLBACK_MODEL_ITEMS);
 }
 

package/src/model-list-cache.ts

@@ -4,6 +4,7 @@ import { dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import type { ModelListItem } from "@cursor/sdk";
 import { parseEnvBoolean } from "./cursor-env-boolean.js";
+import { asRecord } from "./cursor-record-utils.js";
 
 const MODEL_LIST_CACHE_FILE = "cursor-sdk-model-list.json";
 const MODEL_LIST_CACHE_VERSION = 1;
@@ -46,52 +47,53 @@ export function fingerprintApiKey(apiKey: string): string {
 	return createHash("sha256").update(apiKey).digest("hex").slice(0, 16);
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
 function isStringArray(value: unknown): value is string[] {
 	return Array.isArray(value) && value.every((entry) => typeof entry === "string");
 }
 
 function isModelParameterValue(value: unknown): value is NonNullable<ModelListItem["variants"]>[number]["params"][number] {
-	return isRecord(value) && typeof value.id === "string" && typeof value.value === "string";
+	const record = asRecord(value);
+	return record !== undefined && typeof record.id === "string" && typeof record.value === "string";
 }
 
 function isModelParameterDefinitionValue(value: unknown): value is NonNullable<ModelListItem["parameters"]>[number]["values"][number] {
-	return isRecord(value) && typeof value.value === "string" && (value.displayName === undefined || typeof value.displayName === "string");
+	const record = asRecord(value);
+	return record !== undefined && typeof record.value === "string" && (record.displayName === undefined || typeof record.displayName === "string");
 }
 
 function isModelParameterDefinition(value: unknown): value is NonNullable<ModelListItem["parameters"]>[number] {
-	if (!isRecord(value)) return false;
+	const record = asRecord(value);
+	if (!record) return false;
 	return (
-		typeof value.id === "string" &&
-		(value.displayName === undefined || typeof value.displayName === "string") &&
-		Array.isArray(value.values) &&
-		value.values.every(isModelParameterDefinitionValue)
+		typeof record.id === "string" &&
+		(record.displayName === undefined || typeof record.displayName === "string") &&
+		Array.isArray(record.values) &&
+		record.values.every(isModelParameterDefinitionValue)
 	);
 }
 
 function isModelVariant(value: unknown): value is NonNullable<ModelListItem["variants"]>[number] {
-	if (!isRecord(value)) return false;
+	const record = asRecord(value);
+	if (!record) return false;
 	return (
-		Array.isArray(value.params) &&
-		value.params.every(isModelParameterValue) &&
-		typeof value.displayName === "string" &&
-		(value.description === undefined || typeof value.description === "string") &&
-		(value.isDefault === undefined || typeof value.isDefault === "boolean")
+		Array.isArray(record.params) &&
+		record.params.every(isModelParameterValue) &&
+		typeof record.displayName === "string" &&
+		(record.description === undefined || typeof record.description === "string") &&
+		(record.isDefault === undefined || typeof record.isDefault === "boolean")
 	);
 }
 
 function isModelListItem(value: unknown): value is ModelListItem {
-	if (!isRecord(value)) return false;
+	const record = asRecord(value);
+	if (!record) return false;
 	return (
-		typeof value.id === "string" &&
-		typeof value.displayName === "string" &&
-		(value.description === undefined || typeof value.description === "string") &&
-		(value.aliases === undefined || isStringArray(value.aliases)) &&
-		(value.parameters === undefined || (Array.isArray(value.parameters) && value.parameters.every(isModelParameterDefinition))) &&
-		(value.variants === undefined || (Array.isArray(value.variants) && value.variants.every(isModelVariant)))
+		typeof record.id === "string" &&
+		typeof record.displayName === "string" &&
+		(record.description === undefined || typeof record.description === "string") &&
+		(record.aliases === undefined || isStringArray(record.aliases)) &&
+		(record.parameters === undefined || (Array.isArray(record.parameters) && record.parameters.every(isModelParameterDefinition))) &&
+		(record.variants === undefined || (Array.isArray(record.variants) && record.variants.every(isModelVariant)))
 	);
 }
 
@@ -100,21 +102,22 @@ function isValidFetchedAt(value: unknown): value is number {
 }
 
 function parseModelListCacheFile(value: unknown): ModelListCacheFile | undefined {
-	if (!isRecord(value)) return undefined;
+	const record = asRecord(value);
+	if (!record) return undefined;
 	if (
-		value.version !== MODEL_LIST_CACHE_VERSION ||
-		!isValidFetchedAt(value.fetchedAt) ||
-		typeof value.keyFingerprint !== "string" ||
-		!Array.isArray(value.models) ||
-		!value.models.every(isModelListItem)
+		record.version !== MODEL_LIST_CACHE_VERSION ||
+		!isValidFetchedAt(record.fetchedAt) ||
+		typeof record.keyFingerprint !== "string" ||
+		!Array.isArray(record.models) ||
+		!record.models.every(isModelListItem)
 	) {
 		return undefined;
 	}
 	return {
-		version: value.version,
-		fetchedAt: value.fetchedAt,
-		keyFingerprint: value.keyFingerprint,
-		models: value.models,
+		version: record.version,
+		fetchedAt: record.fetchedAt,
+		keyFingerprint: record.keyFingerprint,
+		models: record.models,
 	};
 }
 
@@ -149,10 +152,6 @@ export function loadAnyCachedModelCatalog(keyFingerprint: string): CachedModelLi
 	return { fetchedAt: cache.fetchedAt, models: cache.models };
 }
 
-export function loadAnyCachedModels(keyFingerprint: string): ModelListItem[] | undefined {
-	return loadAnyCachedModelCatalog(keyFingerprint)?.models;
-}
-
 export function saveModelListCache(keyFingerprint: string, models: ModelListItem[]): boolean {
 	if (isModelCacheDisabled()) return false;
 	try {

package/src/cursor-native-tool-display.ts

@@ -1,10 +0,0 @@
-export type { CursorNativeToolDisplayItem } from "./cursor-native-tool-display-state.js";
-export {
-	canRenderCursorToolNatively,
-	deleteCursorNativeToolDisplay,
-	isCursorNativeToolDisplayEnabled,
-	isCursorNativeToolDisplayRuntimeEnabled,
-	recordCursorNativeToolDisplay,
-	__testUtils,
-} from "./cursor-native-tool-display-state.js";
-export { registerCursorNativeToolDisplay } from "./cursor-native-tool-display-registration.js";

package/src/cursor-provider-turn-api-key.ts

@@ -1 +0,0 @@
-export { resolveCursorApiKey } from "./cursor-api-key.js";

package/src/cursor-provider-turn-message-offset.ts

@@ -1,15 +0,0 @@
-import { countCursorAgentMessages } from "./cursor-agent-message-web-tools.js";
-import type { CursorSdkEventDebugSink } from "./cursor-sdk-event-debug.js";
-
-export async function getCursorAgentMessageOffset(
-	agentId: string,
-	cwd: string,
-	sdkEventDebug: CursorSdkEventDebugSink | undefined,
-): Promise<number | undefined> {
-	try {
-		return await countCursorAgentMessages(agentId, cwd);
-	} catch (error) {
-		sdkEventDebug?.recordError("cursor_agent_message_count", error);
-		return undefined;
-	}
-}

package/src/cursor-session-cwd.ts

@@ -1,28 +0,0 @@
-import {
-	getCursorSessionCwdFromScope,
-	registerCursorSessionScope,
-	__testUtils as cursorSessionScopeTestUtils,
-} from "./cursor-session-scope.js";
-import type { ExtensionHandler, SessionStartEvent } from "@earendil-works/pi-coding-agent";
-
-interface CursorSessionCwdExtensionApi {
-	on(event: "session_start", handler: ExtensionHandler<SessionStartEvent>): void;
-}
-
-/**
- * Pi session cwd when known; falls back to process.cwd() before session_start.
- * Updated on session_start only until pi threads cwd into streamSimple—mid-session cwd
- * changes without a new session_start event are not reflected here.
- */
-export function getCursorSessionCwd(): string {
-	return getCursorSessionCwdFromScope();
-}
-
-export function registerCursorSessionCwd(pi: CursorSessionCwdExtensionApi): void {
-	registerCursorSessionScope(pi);
-}
-
-export const __testUtils = {
-	set: cursorSessionScopeTestUtils.set,
-	reset: cursorSessionScopeTestUtils.reset,
-};

package/src/cursor-tool-names.ts

@@ -1,18 +0,0 @@
-export {
-	CURSOR_REPLAY_ACTIVITY_LABEL_KEYS_BY_TOOL_NAME,
-	CURSOR_REPLAY_ACTIVITY_TOOL_NAME,
-	CURSOR_REPLAY_LEGACY_TOOL_NAMES,
-	getCursorReplayActivityLabelKey,
-	getCursorReplayActivityTitle,
-	getCursorReplayDisplayLabel,
-	getCursorReplayPromptLabel,
-	getCursorReplaySideEffectDescription,
-	getCursorReplayOperationLabel,
-	getCursorReplayWrapperLabel,
-	isCursorReplayLegacyToolName,
-	isCursorReplayToolName,
-	isExcludedFromCursorBridgeExposure,
-	type CursorReplayActivityToolName,
-	type CursorReplayLegacyToolName,
-	type CursorReplayToolName,
-} from "./cursor-tool-presentation-registry.js";