pi-cursor-sdk 0.1.6 → 0.1.7

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 0.1.7 - 2026-05-10
+
+### Fixed
+
+- Preserve Cursor post-tool thinking and text that arrive before a native replay tool-use turn closes.
+- Count prompt input only once when one Cursor SDK run is split across multiple native replay turns.
+- Tighten native replay registration tests and documentation around registration opt-out behavior.
+
 ## 0.1.6 - 2026-05-10
 
 ### Fixed

package/docs/cursor-model-ux-spec.md

@@ -17,8 +17,8 @@ Current implementation notes:
 - Cursor auth uses pi-native API-key resolution for provider `cursor`: CLI `--api-key`, stored `~/.pi/agent/auth.json` API key from `/login`, then `CURSOR_API_KEY`. The extension config file stores only non-secret Cursor-only state such as fast defaults.
 - Local agents do not pass `settingSources` by default because the current Cursor SDK writes setting/rule loading INFO logs directly to terminal output, which corrupts pi's TUI.
 - Cursor SDK models are treated as thinking-capable even when pi reports `thinking=no`; that pi column only means the SDK did not expose a pi-controllable thinking parameter for that model.
-- Cursor-side thinking remains visible. Cursor internal tool activity is recorded from SDK events and scrubbed. In interactive TTY sessions, supported completed `read`, `bash`, and `ls` activity is replayed through pi's native tool-call rendering path with recorded Cursor results, so the TUI can show native green cards without forcing Cursor to call pi tools or rerunning Cursor's reads/shell commands. Native replay wrappers are registered only for tool names not already owned by another extension; conflicting tools use the bounded scrubbed transcript fallback. When these native cards are emitted, the provider mirrors Codex's turn shape as Cursor SDK completions arrive: assistant `toolUse`, pi `toolResult`s, live post-tool Cursor thinking/text, any later Cursor tool batches as further `toolUse` turns, then Cursor's final assistant answer. Non-interactive runs keep bounded scrubbed transcript output instead, preserving `pi -p` assistant text output. Cursor text deltas stream live when native tool replay is not active.
-- Cursor SDK usage events report cumulative internal agent/tool/cache work, not the replayable pi prompt context. The extension reports approximate prompt/output usage for pi context display and compaction decisions instead of copying raw Cursor SDK usage.
+- Cursor-side thinking remains visible. Cursor internal tool activity is recorded from SDK events and scrubbed. In interactive TTY sessions, supported completed `read`, `bash`, and `ls` activity is replayed through pi's native tool-call rendering path with recorded Cursor results, so the TUI can show native green cards without forcing Cursor to call pi tools or rerunning Cursor's reads/shell commands. Native replay wrappers are registered only for tool names not already owned by another extension; conflicting tools use the bounded scrubbed transcript fallback. `PI_CURSOR_NATIVE_TOOL_DISPLAY=0` disables native replay, and `PI_CURSOR_REGISTER_NATIVE_TOOLS=0` is a registration-only opt-out that keeps the transcript fallback without shadowing pi tool names. When these native cards are emitted, the provider mirrors Codex's turn shape as Cursor SDK completions arrive: assistant `toolUse`, pi `toolResult`s, live post-tool Cursor thinking/text, any later Cursor tool batches as further `toolUse` turns, then Cursor's final assistant answer. Non-interactive runs keep bounded scrubbed transcript output instead, preserving `pi -p` assistant text output. Cursor text deltas stream live when native tool replay is not active.
+- Cursor SDK usage events report cumulative internal agent/tool/cache work, not the replayable pi prompt context. The extension reports approximate prompt/output usage for pi context display and compaction decisions instead of copying raw Cursor SDK usage. When native replay splits one Cursor SDK run into multiple pi turns, prompt input is counted once for the run; later synthetic replay turns report `input: 0` and only their own output estimate.
 - For models without a catalog `context` parameter, context windows are not hardcoded. The extension ships a bundled SDK-derived default/non-Max cache generated from `createAgentPlatform().checkpointStore.loadLatest(agentId).tokenDetails.maxTokens`. Successful runs can update a local override cache, but model discovery does not probe models at startup.
 - Max Mode context windows are distinct from default/non-Max context windows. `@cursor/sdk` 1.0.12 exposes internal protobuf fields named `maxMode`/`max_mode`, but the public `ModelSelection` type and the local executor path do not pass a Max Mode selector for local agent runs. Do not advertise Max Mode context windows unless the SDK catalog exposes an exact parameter/variant or the SDK public API adds a Max Mode selector that the extension actually sends.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cursor-sdk",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"description": "pi provider extension backed by @cursor/sdk local agents",
 	"author": "Mitch Fultz (https://github.com/fitchmultz)",
 	"license": "MIT",

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

@@ -12,6 +12,7 @@ import type { CursorPiToolDisplay } from "./cursor-tool-transcript.js";
 const NATIVE_CURSOR_TOOL_NAMES = ["read", "bash", "ls"] as const;
 type NativeCursorToolName = (typeof NATIVE_CURSOR_TOOL_NAMES)[number];
 const NATIVE_CURSOR_TOOL_DISPLAY_ENV = "PI_CURSOR_NATIVE_TOOL_DISPLAY";
+// Registration-only kill switch for users who want transcript fallback without shadowing read/bash/ls.
 const NATIVE_CURSOR_TOOL_REGISTRATION_ENV = "PI_CURSOR_REGISTER_NATIVE_TOOLS";
 
 export interface CursorNativeToolDisplayItem extends CursorPiToolDisplay {
@@ -19,8 +20,7 @@ export interface CursorNativeToolDisplayItem extends CursorPiToolDisplay {
 	terminate?: boolean;
 }
 
-let nativeToolDisplayEnabled = false;
-const registeredNativeToolNames = new Set<string>();
+const registeredNativeToolNames = new Set<NativeCursorToolName>();
 const nativeToolResults = new Map<string, CursorNativeToolDisplayItem>();
 
 function readBooleanEnv(name: string): boolean | undefined {
@@ -36,13 +36,16 @@ function isCursorNativeToolDisplayRequested(): boolean {
 	return process.stdout.isTTY === true;
 }
 
+function isNativeCursorToolName(toolName: string): toolName is NativeCursorToolName {
+	return NATIVE_CURSOR_TOOL_NAMES.some((nativeToolName) => nativeToolName === toolName);
+}
+
 function isCursorNativeToolRegistrationRequested(): boolean {
-	if (readBooleanEnv(NATIVE_CURSOR_TOOL_REGISTRATION_ENV) === false) return false;
-	return isCursorNativeToolDisplayRequested();
+	return readBooleanEnv(NATIVE_CURSOR_TOOL_REGISTRATION_ENV) !== false && isCursorNativeToolDisplayRequested();
 }
 
 export function isCursorNativeToolDisplayEnabled(): boolean {
-	return nativeToolDisplayEnabled;
+	return registeredNativeToolNames.size > 0;
 }
 
 export function isCursorNativeToolDisplayRuntimeEnabled(): boolean {
@@ -50,7 +53,7 @@ export function isCursorNativeToolDisplayRuntimeEnabled(): boolean {
 }
 
 export function canRenderCursorToolNatively(toolName: string): boolean {
-	return registeredNativeToolNames.has(toolName);
+	return isNativeCursorToolName(toolName) && registeredNativeToolNames.has(toolName);
 }
 
 export function recordCursorNativeToolDisplay(item: CursorNativeToolDisplayItem): void {
@@ -66,7 +69,6 @@ function consumeCursorNativeToolDisplay(id: string): CursorNativeToolDisplayItem
 
 export const __testUtils = {
 	reset(): void {
-		nativeToolDisplayEnabled = false;
 		registeredNativeToolNames.clear();
 		nativeToolResults.clear();
 	},
@@ -103,15 +105,13 @@ function registerNativeCursorTool(pi: ExtensionAPI, toolName: NativeCursorToolNa
 	pi.registerTool(wrapNativeCursorTool(createLsToolDefinition(cwd)));
 }
 
-function getExistingToolOwner(pi: ExtensionAPI, toolName: NativeCursorToolName): string | undefined {
+function hasNonBuiltinTool(pi: ExtensionAPI, toolName: NativeCursorToolName): boolean {
 	const existingTool = pi.getAllTools().find((tool) => tool.name === toolName);
-	if (!existingTool || existingTool.sourceInfo.source === "builtin") return undefined;
-	return existingTool.sourceInfo.path ?? existingTool.sourceInfo.source;
+	return existingTool !== undefined && existingTool.sourceInfo.source !== "builtin";
 }
 
 function registerAvailableNativeCursorTools(pi: ExtensionAPI, ctx: ExtensionContext): void {
 	if (!isCursorNativeToolRegistrationRequested()) {
-		nativeToolDisplayEnabled = false;
 		registeredNativeToolNames.clear();
 		return;
 	}
@@ -120,8 +120,7 @@ function registerAvailableNativeCursorTools(pi: ExtensionAPI, ctx: ExtensionCont
 	const skippedToolNames: string[] = [];
 	for (const toolName of NATIVE_CURSOR_TOOL_NAMES) {
 		if (registeredNativeToolNames.has(toolName)) continue;
-		const existingOwner = getExistingToolOwner(pi, toolName);
-		if (existingOwner) {
+		if (hasNonBuiltinTool(pi, toolName)) {
 			skippedToolNames.push(toolName);
 			continue;
 		}
@@ -129,7 +128,6 @@ function registerAvailableNativeCursorTools(pi: ExtensionAPI, ctx: ExtensionCont
 		registeredNativeToolNames.add(toolName);
 	}
 
-	nativeToolDisplayEnabled = registeredNativeToolNames.size > 0;
 	if (skippedToolNames.length > 0 && readBooleanEnv(NATIVE_CURSOR_TOOL_DISPLAY_ENV) === true && ctx.hasUI) {
 		ctx.ui.notify(
 			`Cursor native tool replay skipped for ${skippedToolNames.join(", ")} because another extension already provides ${skippedToolNames.length === 1 ? "that tool" : "those tools"}. Cursor will use scrubbed activity transcripts for skipped tools.`,
@@ -139,7 +137,7 @@ function registerAvailableNativeCursorTools(pi: ExtensionAPI, ctx: ExtensionCont
 }
 
 export function registerCursorNativeToolDisplay(pi: ExtensionAPI): void {
-	pi.on("session_start", async (_event, ctx) => {
+	pi.on("session_start", (_event, ctx) => {
 		registerAvailableNativeCursorTools(pi, ctx);
 	});
 }

package/src/cursor-provider.ts

@@ -70,6 +70,7 @@ interface CursorNativeLiveRun {
 	id: string;
 	agent: SDKAgent;
 	promptInputTokens: number;
+	promptInputTokensReported: boolean;
 	pendingEvents: CursorNativeQueuedEvent[];
 	textDeltas: string[];
 	finalText?: string;
@@ -374,6 +375,13 @@ function collectCursorNativeToolBatch(run: CursorNativeLiveRun): CursorNativeToo
 	return tools;
 }
 
+function takeCursorNativePromptInputTokens(run: CursorNativeLiveRun): number {
+	// Native replay can split one Cursor run into multiple pi turns; count prompt input once.
+	if (run.promptInputTokensReported) return 0;
+	run.promptInputTokensReported = true;
+	return run.promptInputTokens;
+}
+
 function emitCursorNativeToolUseTurn(
 	stream: AssistantMessageEventStream,
 	partial: AssistantMessage,
@@ -396,7 +404,7 @@ function emitCursorNativeToolUseTurn(
 		if (block.type === "toolCall") stream.push({ type: "toolcall_end", contentIndex, toolCall: block, partial });
 		recordCursorNativeToolDisplay({ ...tool, terminate: shouldTerminate });
 	}
-	setApproximateUsage(partial, run.promptInputTokens, outputText);
+	setApproximateUsage(partial, takeCursorNativePromptInputTokens(run), outputText);
 	partial.stopReason = "toolUse";
 	stream.push({ type: "done", reason: "toolUse", message: partial });
 }
@@ -455,7 +463,7 @@ async function emitCursorNativeRunNextTurn(
 			if (!outputText) {
 				outputText += await emitTextDeltas(stream, partial, splitTextIntoReplayDeltas(run.finalText ?? run.textDeltas.join("")));
 			}
-			setApproximateUsage(partial, run.promptInputTokens, outputText);
+			setApproximateUsage(partial, takeCursorNativePromptInputTokens(run), outputText);
 			partial.stopReason = "stop";
 			stream.push({ type: "done", reason: "stop", message: partial });
 			await disposeCursorNativeRun(run);
@@ -534,12 +542,13 @@ export function streamCursor(
 			const useNativeToolReplay = isCursorNativeToolDisplayRuntimeEnabled();
 			const nativeReplayId = createCursorNativeReplayId();
 			const textDeltas: string[] = [];
-			let liveStreamClosed = false;
+			let nativeToolReplayStarted = false;
 			const liveRun: CursorNativeLiveRun | undefined = useNativeToolReplay
 				? {
 						id: nativeReplayId,
 						agent,
 						promptInputTokens,
+						promptInputTokensReported: false,
 						pendingEvents: [],
 						textDeltas,
 						done: false,
@@ -651,6 +660,7 @@ export function streamCursor(
 				completedToolFingerprints.add(fingerprint);
 
 				if (useNativeToolReplay && canRenderCursorToolNatively(display.toolName) && liveRun) {
+					nativeToolReplayStarted = true;
 					const id = `${nativeReplayId}-tool-${++nativeToolDisplayCounter}`;
 					queueCursorNativeEvent(liveRun, {
 						type: "tool",
@@ -672,19 +682,19 @@ export function streamCursor(
 
 				if (update.type === "text-delta") {
 					textDeltas.push(update.text);
-					if (liveRun && liveStreamClosed) {
+					if (liveRun && nativeToolReplayStarted) {
 						queueCursorNativeEvent(liveRun, { type: "text-delta", text: update.text });
 					} else if (!useNativeToolReplay) {
 						appendLiveTextDelta(update.text);
 					}
 				} else if (update.type === "thinking-delta") {
-					if (liveRun && liveStreamClosed) {
+					if (liveRun && nativeToolReplayStarted) {
 						queueCursorNativeEvent(liveRun, { type: "thinking-delta", text: update.text });
 					} else {
 						appendTraceDelta(update.text);
 					}
 				} else if (update.type === "thinking-completed") {
-					if (liveRun && liveStreamClosed) {
+					if (liveRun && nativeToolReplayStarted) {
 						queueCursorNativeEvent(liveRun, { type: "thinking-completed" });
 					} else {
 						closeTraceBlock();
@@ -697,7 +707,7 @@ export function streamCursor(
 					handleCompletedToolCall(mergedToolCall);
 				} else if (update.type === "summary") {
 					const summary = `Cursor summary: ${truncateSingleLine(update.summary)}\n`;
-					if (liveRun && liveStreamClosed) {
+					if (liveRun && nativeToolReplayStarted) {
 						queueCursorNativeEvent(liveRun, { type: "thinking-delta", text: summary });
 					} else {
 						appendTraceDelta(summary);
@@ -754,7 +764,6 @@ export function streamCursor(
 				await waitForCursorNativeRunProgress(liveRun, options?.signal);
 				await settleCursorNativeToolBatch(liveRun);
 				closeTraceBlock();
-				liveStreamClosed = true;
 				await emitCursorNativeRunNextTurn(stream, partial, liveRun, options?.signal);
 				agent = null;
 				return;