pi-cursor-sdk 0.1.62 → 0.2.0

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

@@ -1,4 +1,4 @@
-import type { Context, Message, ToolResultMessage } from "@earendil-works/pi-ai/compat";
+import type { Context, Message, ToolResultMessage } from "@earendil-works/pi-ai";
 import { CURSOR_APPROX_CHARS_PER_TOKEN, estimateCursorPromptMessageTokens } from "./context.js";
 import type { CursorSdkTurnUsage } from "./cursor-usage-accounting.js";
 

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

@@ -1,4 +1,4 @@
-import type { Context, ToolResultMessage } from "@earendil-works/pi-ai/compat";
+import type { Context, ToolResultMessage } from "@earendil-works/pi-ai";
 import type { SDKAgent } from "@cursor/sdk";
 import {
 	consumeCursorLiveToolResults,

package/src/cursor-native-replay-routing.ts

@@ -1,6 +1,6 @@
 import { canRenderCursorToolNatively } from "./cursor-native-tool-display-state.js";
 import { getActiveContextToolNames } from "./cursor-context-tools.js";
-import type { Context } from "@earendil-works/pi-ai/compat";
+import type { Context } from "@earendil-works/pi-ai";
 
 export type NativeReplayDisposition = "queue_replay" | "inactive_trace" | "transcript_trace";
 

package/src/cursor-partial-content-emitter.ts

@@ -1,4 +1,4 @@
-import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai/compat";
+import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai";
 
 const DEFAULT_THINKING_TRACE_MAX_CHARS = 50000;
 

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

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import type { Context, ToolResultMessage } from "@earendil-works/pi-ai/compat";
+import type { Context, ToolResultMessage } from "@earendil-works/pi-ai";
 import type { CallToolResult, Tool } from "@modelcontextprotocol/sdk/types.js";
 import { buildCursorPiBridgeMcpToolDescription, CURSOR_PI_BRIDGE_MCP_TOOL_PREFIX } from "./cursor-bridge-contract.js";
 import type { CursorPiBridgeToolDefinition, CursorPiMcpInputSchema } from "./cursor-pi-tool-bridge-types.js";

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

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import type { IncomingMessage, ServerResponse } from "node:http";
 import type { McpServerConfig } from "@cursor/sdk";
-import type { Context, ToolResultMessage } from "@earendil-works/pi-ai/compat";
+import type { Context, ToolResultMessage } from "@earendil-works/pi-ai";
 import { Server as McpProtocolServer } from "@modelcontextprotocol/sdk/server/index.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import {

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

@@ -1,5 +1,5 @@
 import type { McpServerConfig } from "@cursor/sdk";
-import type { Context, ToolResultMessage } from "@earendil-works/pi-ai/compat";
+import type { Context, ToolResultMessage } from "@earendil-works/pi-ai";
 import type { CursorSdkEventDebugRecorder } from "./cursor-sdk-event-debug.js";
 import type {
 	ExtensionAPI,

package/src/cursor-provider-lazy.ts

@@ -6,7 +6,7 @@ import {
 	type Context,
 	type Model,
 	type SimpleStreamOptions,
-} from "@earendil-works/pi-ai/compat";
+} from "@earendil-works/pi-ai";
 
 function makeProviderLoadErrorMessage(model: Model<Api>, error: unknown): AssistantMessage {
 	return {

package/src/cursor-provider-live-run-drain.ts

@@ -4,7 +4,7 @@ import {
 	type AssistantMessageEventStream,
 	type Context,
 	type Model,
-} from "@earendil-works/pi-ai/compat";
+} from "@earendil-works/pi-ai";
 import { scheduler } from "node:timers/promises";
 import {
 	CursorLiveRunAbortError,

package/src/cursor-provider-overflow.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { AssistantMessage } from "@earendil-works/pi-ai/compat";
+import type { AssistantMessage } from "@earendil-works/pi-ai";
 import { CURSOR_PROVIDER } from "./cursor-model.js";
 
 /**

package/src/cursor-provider-run-finalizer.ts

@@ -1,4 +1,4 @@
-import type { AssistantMessage } from "@earendil-works/pi-ai/compat";
+import type { AssistantMessage } from "@earendil-works/pi-ai";
 import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import {
 	classifyCursorRunEmission,

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

@@ -1,4 +1,4 @@
-import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai/compat";
+import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai";
 import type { InteractionUpdate } from "@cursor/sdk";
 import type { CursorLiveRun } from "./cursor-live-run-coordinator.js";
 import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";

package/src/cursor-provider-turn-lifecycle-emitter.ts

@@ -1,4 +1,4 @@
-import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai/compat";
+import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai";
 import type { CursorLiveRun } from "./cursor-live-run-coordinator.js";
 import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import { CursorPartialContentEmitter } from "./cursor-partial-content-emitter.js";

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

@@ -1,4 +1,4 @@
-import type { Context, SimpleStreamOptions } from "@earendil-works/pi-ai/compat";
+import type { Context, SimpleStreamOptions } from "@earendil-works/pi-ai";
 import type { AgentModeOption, ModelSelection, SDKAgent } from "@cursor/sdk";
 import { configureCursorSdkHttp1 } from "./cursor-http1.js";
 import { installCursorMcpToolTimeoutOverride } from "./cursor-mcp-timeout-override.js";

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

@@ -5,7 +5,7 @@ import type {
 	Context,
 	Model,
 	SimpleStreamOptions,
-} from "@earendil-works/pi-ai/compat";
+} from "@earendil-works/pi-ai";
 import type { AgentModeOption, ModelSelection, SDKAgent, SDKImage } from "@cursor/sdk";
 import type { CursorLiveRun } from "./cursor-live-run-coordinator.js";
 import type { SessionCursorAgentLease } from "./cursor-session-agent.js";

package/src/cursor-provider.ts

@@ -6,7 +6,7 @@ import {
 	createAssistantMessageEventStream,
 	type Model,
 	type SimpleStreamOptions,
-} from "@earendil-works/pi-ai/compat";
+} from "@earendil-works/pi-ai";
 import {
 	cursorLiveRuns,
 	DEFAULT_CURSOR_NATIVE_REPLAY_IDLE_DISPOSE_MS,

package/src/cursor-run-final-text.ts

@@ -1,4 +1,4 @@
-import type { AssistantMessage } from "@earendil-works/pi-ai/compat";
+import type { AssistantMessage } from "@earendil-works/pi-ai";
 import { asRecord, hasUsableText } from "./cursor-record-utils.js";
 
 function isCursorTextBoundary(text: string, index: number): boolean {

package/src/cursor-sdk-event-debug.ts

@@ -1,7 +1,7 @@
 import { createHash } from "node:crypto";
 import { copyFileSync, existsSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import type { AssistantMessageEventStream } from "@earendil-works/pi-ai/compat";
+import type { AssistantMessageEventStream } from "@earendil-works/pi-ai";
 import type { AgentModeOption, InteractionUpdate } from "@cursor/sdk";
 import type { CursorPiToolBridgeDiagnosticEvent } from "./cursor-pi-tool-bridge-diagnostics.js";
 import { serializeCursorPiToolBridgeDiagnostic } from "./cursor-pi-tool-bridge-diagnostics.js";

package/src/cursor-session-agent.ts

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import type { AgentModeOption, LocalAgentOptions, LocalAgentStore, ModelSelection, SDKAgent, SettingSource } from "@cursor/sdk";
-import type { Context } from "@earendil-works/pi-ai/compat";
+import type { Context } from "@earendil-works/pi-ai";
 import {
 	getRegisteredCursorPiToolBridge,
 	type CursorPiBridgeToolRequest,

package/src/cursor-session-send-policy.ts

@@ -1,4 +1,4 @@
-import type { Context } from "@earendil-works/pi-ai/compat";
+import type { Context } from "@earendil-works/pi-ai";
 import {
 	buildCursorIncrementalPrompt,
 	buildCursorPrompt,

package/src/cursor-usage-accounting.ts

@@ -1,4 +1,4 @@
-import type { Api, AssistantMessage, Context, Model } from "@earendil-works/pi-ai/compat";
+import type { Api, AssistantMessage, Context, Model } from "@earendil-works/pi-ai";
 import {
 	CURSOR_APPROX_CHARS_PER_TOKEN,
 	CURSOR_IMAGE_TOKEN_ESTIMATE,

package/src/model-discovery.ts

@@ -5,7 +5,8 @@ import type {
 	ModelSelection,
 } from "@cursor/sdk";
 import type { ProviderModelConfig } from "@earendil-works/pi-coding-agent";
-import type { ModelThinkingLevel, ThinkingLevelMap } from "@earendil-works/pi-ai/compat";
+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";
@@ -176,13 +177,6 @@ function getParamValue(params: ModelParameterValue[], id: string): string | unde
 	return params.find((param) => param.id === id)?.value;
 }
 
-function encodePiModelId(modelId: string, context?: string, fastOverride?: boolean): string {
-	const contextQualified = context ? `${modelId}@${context}` : modelId;
-	if (fastOverride === true) return `${contextQualified}:fast`;
-	if (fastOverride === false) return `${contextQualified}:slow`;
-	return contextQualified;
-}
-
 function getModelName(item: ModelListItem, context?: string, alias?: string, fastOverride?: boolean): string {
 	const displayName = item.displayName || item.id;
 	const qualifiers: string[] = [];
@@ -193,18 +187,17 @@ function getModelName(item: ModelListItem, context?: string, alias?: string, fas
 	return context ? `${baseName} @ ${context}` : baseName;
 }
 
-function getFastOverrideBasePiModelId(piModelId: string): string {
-	return piModelId.replace(/:(?:fast|slow)$/, "");
-}
-
-function getContextWindow(contextWindowCache: Map<string, number>, piModelId: string, context?: string, baseModelId?: string): number {
-	const fastOverrideBasePiModelId = getFastOverrideBasePiModelId(piModelId);
-	const contextWindowOverride =
-		contextWindowCache.get(piModelId) ??
-		(fastOverrideBasePiModelId !== piModelId ? contextWindowCache.get(fastOverrideBasePiModelId) : undefined);
-
+function getContextWindow(
+	contextWindowCache: Map<string, number>,
+	selectionKeys: readonly string[],
+	context?: string,
+	baseModelId?: string,
+): number {
+	for (const key of new Set(selectionKeys)) {
+		const contextWindow = contextWindowCache.get(key);
+		if (contextWindow !== undefined) return contextWindow;
+	}
 	return (
-		contextWindowOverride ??
 		(context ? parseContextWindow(context) : undefined) ??
 		(baseModelId ? contextWindowCache.get(baseModelId) : undefined) ??
 		contextWindowCache.get("default") ??
@@ -219,6 +212,7 @@ function toMetadata(
 	defaultParams: ModelParameterValue[],
 	context: string | undefined,
 	contextWindowCache: Map<string, number>,
+	contextWindowKeys: readonly string[],
 	fastOverride?: boolean,
 ): CursorModelMetadata {
 	const thinkingLevelMap = getThinkingLevelMap(item);
@@ -230,7 +224,7 @@ function toMetadata(
 		displayName: item.displayName || item.id,
 		defaultParams: cloneParams(defaultParams),
 		...(context ? { context } : {}),
-		contextWindow: getContextWindow(contextWindowCache, piModelId, context, item.id),
+		contextWindow: getContextWindow(contextWindowCache, contextWindowKeys, context, item.id),
 		supportsFast: getParameter(item, "fast") !== undefined,
 		defaultFast: fastValue === "true",
 		...(fastOverride !== undefined ? { fastOverride } : {}),
@@ -259,78 +253,27 @@ function toModelConfig(metadata: CursorModelMetadata, name: string): ProviderMod
 	};
 }
 
-function getContextValues(item: ModelListItem): string[] {
-	return getParameter(item, "context")?.values.map((value) => value.value) ?? [];
-}
-
-function getAmbiguousAliases(items: ModelListItem[]): Set<string> {
-	const aliasOwners = new Map<string, Set<string>>();
-	for (const item of items) {
-		for (const rawAlias of item.aliases ?? []) {
-			const alias = rawAlias.trim();
-			if (!alias || alias === item.id) continue;
-			const owners = aliasOwners.get(alias) ?? new Set<string>();
-			owners.add(item.id);
-			aliasOwners.set(alias, owners);
-		}
-	}
-	return new Set([...aliasOwners.entries()].filter(([, owners]) => owners.size > 1).map(([alias]) => alias));
-}
-
-function getModelIds(item: ModelListItem, reservedBaseModelIds: Set<string>, ambiguousAliases: Set<string>): string[] {
-	const ids = [item.id];
-	for (const rawAlias of item.aliases ?? []) {
-		const alias = rawAlias.trim();
-		if (!alias || alias === item.id || ids.includes(alias) || reservedBaseModelIds.has(alias) || ambiguousAliases.has(alias)) continue;
-		ids.push(alias);
-	}
-	return ids;
-}
-
-function toModelConfigs(
-	item: ModelListItem,
-	usedPiModelIds: Set<string>,
-	reservedBaseModelIds: Set<string>,
-	ambiguousAliases: Set<string>,
-	contextWindowCache: Map<string, number>,
-): ProviderModelConfig[] {
-	const defaultParams = getDefaultParams(item);
-	const contextValues = getContextValues(item);
-	const contexts = contextValues.length > 0 ? contextValues : [undefined];
-	const configs: ProviderModelConfig[] = [];
-
-	const fastOverrides = getParameter(item, "fast") === undefined ? [undefined] : [undefined, true, false];
-
-	for (const selectionModelId of getModelIds(item, reservedBaseModelIds, ambiguousAliases)) {
-		const alias = selectionModelId === item.id ? undefined : selectionModelId;
-		for (const context of contexts) {
-			const contextParams = context ? replaceParam(defaultParams, "context", context) : defaultParams;
-			for (const fastOverride of fastOverrides) {
-				const params = fastOverride === undefined ? contextParams : replaceParam(contextParams, "fast", fastOverride ? "true" : "false");
-				const piModelId = encodePiModelId(selectionModelId, context, fastOverride);
-				if (usedPiModelIds.has(piModelId)) continue;
-				usedPiModelIds.add(piModelId);
-				const metadata = toMetadata(item, piModelId, selectionModelId, params, context, contextWindowCache, fastOverride);
-				metadataByPiModelId.set(piModelId, metadata);
-				configs.push(toModelConfig(metadata, getModelName(item, context, alias, fastOverride)));
-			}
-		}
-	}
-
-	return configs;
-}
-
-function sortModelsByBaseId(items: ModelListItem[]): ModelListItem[] {
-	return [...items].sort((a, b) => a.id.localeCompare(b.id));
-}
-
 function registerModelItems(items: ModelListItem[]): ProviderModelConfig[] {
 	metadataByPiModelId.clear();
-	const usedPiModelIds = new Set<string>();
-	const reservedBaseModelIds = new Set(items.map((item) => item.id));
-	const ambiguousAliases = getAmbiguousAliases(items);
 	const contextWindowCache = loadContextWindowCache();
-	return sortModelsByBaseId(items).flatMap((item) => toModelConfigs(item, usedPiModelIds, reservedBaseModelIds, ambiguousAliases, contextWindowCache));
+	return getCursorModelSelectionIdentities(items).map(({ model: item, selectionModelId, context, fastOverride, piModelId, contextWindowKey, baseContextWindowKey }) => {
+		const defaultParams = getDefaultParams(item);
+		const contextParams = context ? replaceParam(defaultParams, "context", context) : defaultParams;
+		const params = fastOverride === undefined ? contextParams : replaceParam(contextParams, "fast", fastOverride ? "true" : "false");
+		const metadata = toMetadata(
+			item,
+			piModelId,
+			selectionModelId,
+			params,
+			context,
+			contextWindowCache,
+			[piModelId, contextWindowKey, baseContextWindowKey],
+			fastOverride,
+		);
+		metadataByPiModelId.set(piModelId, metadata);
+		const alias = selectionModelId === item.id ? undefined : selectionModelId;
+		return toModelConfig(metadata, getModelName(item, context, alias, fastOverride));
+	});
 }
 
 export function getCursorModelMetadata(modelId: string): CursorModelMetadata | undefined {

package/node_modules/cross-spawn/node_modules/which/CHANGELOG.md

@@ -1,166 +0,0 @@
-# Changes
-
-
-## 2.0.2
-
-* Rename bin to `node-which`
-
-## 2.0.1
-
-* generate changelog and publish on version bump
-* enforce 100% test coverage
-* Promise interface
-
-## 2.0.0
-
-* Parallel tests, modern JavaScript, and drop support for node < 8
-
-## 1.3.1
-
-* update deps
-* update travis
-
-## v1.3.0
-
-* Add nothrow option to which.sync
-* update tap
-
-## v1.2.14
-
-* appveyor: drop node 5 and 0.x
-* travis-ci: add node 6, drop 0.x
-
-## v1.2.13
-
-* test: Pass missing option to pass on windows
-* update tap
-* update isexe to 2.0.0
-* neveragain.tech pledge request
-
-## v1.2.12
-
-* Removed unused require
-
-## v1.2.11
-
-* Prevent changelog script from being included in package
-
-## v1.2.10
-
-* Use env.PATH only, not env.Path
-
-## v1.2.9
-
-* fix for paths starting with ../
-* Remove unused `is-absolute` module
-
-## v1.2.8
-
-* bullet items in changelog that contain (but don't start with) #
-
-## v1.2.7
-
-* strip 'update changelog' changelog entries out of changelog
-
-## v1.2.6
-
-* make the changelog bulleted
-
-## v1.2.5
-
-* make a changelog, and keep it up to date
-* don't include tests in package
-* Properly handle relative-path executables
-* appveyor
-* Attach error code to Not Found error
-* Make tests pass on Windows
-
-## v1.2.4
-
-* Fix typo
-
-## v1.2.3
-
-* update isexe, fix regression in pathExt handling
-
-## v1.2.2
-
-* update deps, use isexe module, test windows
-
-## v1.2.1
-
-* Sometimes windows PATH entries are quoted
-* Fixed a bug in the check for group and user mode bits. This bug was introduced during refactoring for supporting strict mode.
-* doc cli
-
-## v1.2.0
-
-* Add support for opt.all and -as cli flags
-* test the bin
-* update travis
-* Allow checking for multiple programs in bin/which
-* tap 2
-
-## v1.1.2
-
-* travis
-* Refactored and fixed undefined error on Windows
-* Support strict mode
-
-## v1.1.1
-
-* test +g exes against secondary groups, if available
-* Use windows exe semantics on cygwin & msys
-* cwd should be first in path on win32, not last
-* Handle lower-case 'env.Path' on Windows
-* Update docs
-* use single-quotes
-
-## v1.1.0
-
-* Add tests, depend on is-absolute
-
-## v1.0.9
-
-* which.js: root is allowed to execute files owned by anyone
-
-## v1.0.8
-
-* don't use graceful-fs
-
-## v1.0.7
-
-* add license to package.json
-
-## v1.0.6
-
-* isc license
-
-## 1.0.5
-
-* Awful typo
-
-## 1.0.4
-
-* Test for path absoluteness properly
-* win: Allow '' as a pathext if cmd has a . in it
-
-## 1.0.3
-
-* Remove references to execPath
-* Make `which.sync()` work on Windows by honoring the PATHEXT variable.
-* Make `isExe()` always return true on Windows.
-* MIT
-
-## 1.0.2
-
-* Only files can be exes
-
-## 1.0.1
-
-* Respect the PATHEXT env for win32 support
-* should 0755 the bin
-* binary
-* guts
-* package
-* 1st