pi-cursor-sdk 0.3.6 → 0.3.8

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

@@ -21,13 +21,14 @@ import {
 import { type CursorPiBridgeToolRequest } from "./cursor-pi-tool-bridge.js";
 import { resetSessionCursorAgent } from "./cursor-session-agent.js";
 import { applyCursorUsage } from "./cursor-usage-accounting.js";
-import { CursorPartialContentEmitter } from "./cursor-partial-content-emitter.js";
+import { CURSOR_TEXT_MESSAGE_SEPARATOR, CursorPartialContentEmitter } from "./cursor-partial-content-emitter.js";
 import { emitDisplayOnlyTraceBlock } from "./cursor-display-only-trace.js";
 import { trimCurrentTurnAlreadyEmittedCursorText } from "./cursor-run-final-text.js";
 import { formatCursorSdkAbortMessage, resolveCursorSdkAbortCause } from "./cursor-provider-errors.js";
 import { formatInactiveCursorReplayTrace } from "./cursor-native-replay-trace.js";
 import { partitionNativeToolsByActiveContext } from "./cursor-native-replay-routing.js";
 import type { CursorSdkEventDebugRecorder } from "./cursor-sdk-event-debug.js";
+import { isJsonObject } from "./cursor-record-utils.js";
 
 export const DEFAULT_CURSOR_NATIVE_REPLAY_IDLE_DISPOSE_MS = 5 * 60 * 1000;
 const CURSOR_NATIVE_REPLAY_TOOL_ID_PATTERN = /^(cursor-replay-\d+-\d+)-tool-\d+$/;
@@ -88,11 +89,9 @@ function splitTextIntoReplayDeltas(text: string): string[] {
 }
 
 async function emitTextDeltas(
-	stream: AssistantMessageEventStream,
-	partial: AssistantMessage,
+	emitter: CursorPartialContentEmitter,
 	deltas: string[],
 ): Promise<string> {
-	const emitter = new CursorPartialContentEmitter(stream, partial, -1, true);
 	for (const delta of deltas) {
 		emitter.appendTextDelta(delta);
 		await Promise.resolve();
@@ -121,11 +120,11 @@ export function flushPendingCursorLiveRunTraceEventsToStream(
 	stream: AssistantMessageEventStream,
 	partial: AssistantMessage,
 	run: CursorLiveRun,
-	options?: { includeTracesBehindQueuedTools?: boolean },
+	options?: { includeTracesBehindQueuedTools?: boolean; emitter?: CursorPartialContentEmitter },
 ): void {
 	if (run.disposed) return;
 	const turn: CursorLiveTurnState = {
-		emitter: new CursorPartialContentEmitter(stream, partial, -1, true),
+		emitter: options?.emitter ?? new CursorPartialContentEmitter(stream, partial, -1, true),
 		emittedText: "",
 	};
 	while (true) {
@@ -157,6 +156,12 @@ function emitCursorLiveQueuedEvent(
 		turn.emitter.appendThinkingDelta(event.text);
 	} else if (event.type === "thinking-completed") {
 		turn.emitter.closeThinking();
+	} else if (event.type === "text-completed") {
+		turn.emitter.completeTextMessage();
+		// Logical separators also keep suffix/prefix dedup aware of SDK messages,
+		// including boundaries queued across Pi tool-use turns.
+		if (turn.emittedText) turn.emittedText += CURSOR_TEXT_MESSAGE_SEPARATOR;
+		if (run?.emittedText) run.emittedText += CURSOR_TEXT_MESSAGE_SEPARATOR;
 	} else if (event.type === "text-delta") {
 		turn.emittedText += event.text;
 		if (run) run.emittedText += event.text;
@@ -176,6 +181,7 @@ function emitCursorNativeToolUseTurn(
 ): void {
 	const shouldTerminate = run.done && !run.finalText?.trim() && !cursorLiveRuns.peekEvent(run);
 	for (const tool of tools) {
+		if (!isJsonObject(tool.args)) throw new Error("Cursor replay tool arguments must be a JSON object");
 		const contentIndex = partial.content.length;
 		partial.content.push({
 			type: "toolCall",
@@ -232,6 +238,7 @@ function emitCursorBridgeToolUseTurn(
 	requests: CursorPiBridgeToolRequest[],
 ): void {
 	for (const request of requests) {
+		if (!isJsonObject(request.args)) throw new Error("Cursor bridge tool arguments must be a JSON object");
 		const contentIndex = partial.content.length;
 		partial.content.push({
 			type: "toolCall",
@@ -296,7 +303,7 @@ export async function drainCursorLiveRunTurn(
 	context: Context,
 	run: CursorLiveRun,
 	toolResultInputTokens: number,
-	options: { mode: CursorLiveRunDrainMode; signal?: AbortSignal; debugRecorder?: CursorSdkEventDebugRecorder },
+	options: { mode: CursorLiveRunDrainMode; signal?: AbortSignal; debugRecorder?: CursorSdkEventDebugRecorder; emitter?: CursorPartialContentEmitter },
 ): Promise<CursorLiveRunDrainOutcome> {
 	const debugRecorder = options.debugRecorder ?? run.debugRecorder;
 	debugRecorder?.recordDrainEvent("turn_start", {
@@ -308,7 +315,7 @@ export async function drainCursorLiveRunTurn(
 	let outcome: CursorLiveRunDrainOutcome | undefined;
 	let outcomeDetails: Record<string, unknown> = {};
 	const turn: CursorLiveTurnState = {
-		emitter: new CursorPartialContentEmitter(stream, partial, -1, true),
+		emitter: options.emitter ?? new CursorPartialContentEmitter(stream, partial, -1, true),
 		emittedText: "",
 	};
 
@@ -378,7 +385,7 @@ export async function drainCursorLiveRunTurn(
 				turn.emitter.closeAll();
 				const finalText = trimCurrentTurnAlreadyEmittedCursorText(run.finalText ?? run.textDeltas.join(""), turn.emittedText, run.emittedText);
 				if (finalText) {
-					await emitTextDeltas(stream, partial, splitTextIntoReplayDeltas(finalText));
+					await emitTextDeltas(turn.emitter, splitTextIntoReplayDeltas(finalText));
 				}
 				applyCursorUsage(partial, model, context, cursorLiveRuns.takeTurnInputTokens(run, toolResultInputTokens), {
 					runtime: "local",

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

@@ -1,5 +1,6 @@
 import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai";
 import type { InteractionUpdate } from "@cursor/sdk";
+import { CURSOR_TEXT_MESSAGE_SEPARATOR } from "./cursor-partial-content-emitter.js";
 import type { CursorLiveRun } from "./cursor-live-run-coordinator.js";
 import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import { truncateCursorDisplayLine } from "./cursor-display-text.js";
@@ -65,6 +66,7 @@ export class CursorSdkTurnCoordinator {
 	private readonly lifecycleEmitter: CursorToolLifecycleEmitter;
 	private readonly contentEmitter;
 	private sdkTurnUsage?: CursorSdkTurnUsage;
+	private hasPendingTextMessage = false;
 
 	constructor(options: CursorSdkTurnCoordinatorOptions) {
 		this.stream = options.stream;
@@ -153,6 +155,7 @@ export class CursorSdkTurnCoordinator {
 			cursorLiveRuns.recordSdkTurnEnded(this.liveRun, sdkTurnUsage);
 		}
 		if (update.type === "text-delta") {
+			if (update.text) this.hasPendingTextMessage = true;
 			this.textDeltas.push(update.text);
 			if (this.liveRun) {
 				cursorLiveRuns.queueEvent(this.liveRun, { type: "text-delta", text: update.text });
@@ -247,6 +250,18 @@ export class CursorSdkTurnCoordinator {
 
 	handleStep(stepEnvelope: unknown): void {
 		const stepType = getField(stepEnvelope, "type");
+		if (stepType === "assistantMessage") {
+			// SDK onStep completes a message; onDelta chunks within it are tokens,
+			// not separate messages. Keep the boundary in both output and final-text
+			// deduplication, without replaying the completed step's text a second time.
+			if (this.hasPendingTextMessage) {
+				this.hasPendingTextMessage = false;
+				this.textDeltas.push(CURSOR_TEXT_MESSAGE_SEPARATOR);
+				if (this.liveRun) cursorLiveRuns.queueEvent(this.liveRun, { type: "text-completed" });
+				else this.contentEmitter.completeTextMessage();
+			}
+			return;
+		}
 		const step = getField(stepEnvelope, "message") ? stepEnvelope : undefined;
 		const rawStepToolCall = getField(step, "message");
 		if (stepType !== "toolCall") return;

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

@@ -1,4 +1,5 @@
 import { CursorLiveRunAbortError } from "./cursor-live-run-coordinator.js";
+import { CursorPartialContentEmitter } from "./cursor-partial-content-emitter.js";
 import {
 	cursorLiveRuns,
 	drainCursorLiveRunTurn,
@@ -28,6 +29,9 @@ export async function emitCursorLiveTurn(emitParams: EmitCursorLiveTurnParams):
 	const { liveRun, turnCoordinator } = prepared.runtime;
 
 	const { options, model } = params;
+	// Drain and abort recovery write to the same partial. Keep its open text block
+	// and deferred message boundary together; a new Pi turn still gets a new emitter.
+	const emitter = new CursorPartialContentEmitter(params.stream, params.partial, -1, true);
 	try {
 		await cursorLiveRuns.withRunLease(liveRun, options?.signal, async () => {
 			await cursorLiveRuns.waitForProgress(liveRun, options?.signal);
@@ -35,6 +39,7 @@ export async function emitCursorLiveTurn(emitParams: EmitCursorLiveTurnParams):
 			turnCoordinator.closeTraceBlock();
 			await drainCursorLiveRunTurn(params.stream, params.partial, model, params.context, liveRun, 0, {
 				mode: "emit",
+				emitter,
 				signal: options?.signal,
 				debugRecorder: sdkEventDebug,
 			});
@@ -45,6 +50,7 @@ export async function emitCursorLiveTurn(emitParams: EmitCursorLiveTurnParams):
 			turnCoordinator.closeTraceBlock();
 			flushPendingCursorLiveRunTraceEventsToStream(params.stream, params.partial, liveRun, {
 				includeTracesBehindQueuedTools: true,
+				emitter,
 			});
 		}
 		throw caught;

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

@@ -1,4 +1,5 @@
 import type { Context, SimpleStreamOptions } from "@earendil-works/pi-ai";
+import { getCursorConversationMessages, resolveCursorPiContext } from "./cursor-pi-context.js";
 import type { AgentModeOption, ModelSelection, SDKAgent } from "@cursor/sdk";
 import { configureCursorSdkHttp1 } from "./cursor-http1.js";
 import { installCursorMcpToolTimeoutOverride } from "./cursor-mcp-timeout-override.js";
@@ -80,11 +81,15 @@ interface PrepareCursorProviderTurnContext extends PrepareCursorProviderTurnPara
 
 function buildCursorCloudPromptContext(context: Context, handoff: "fresh" | "bootstrap" | "never"): Context {
 	if (handoff === "bootstrap") return context;
-	for (let index = context.messages.length - 1; index >= 0; index -= 1) {
-		const message = context.messages[index];
-		if (message.role === "user") return { ...context, messages: [message] };
+	// Fresh cloud runs omit history, not the current Pi instructions. Replay before
+	// selecting the user message, otherwise transcript-only inputs lose the prompt.
+	const current = resolveCursorPiContext(context);
+	const messages = getCursorConversationMessages(context);
+	for (let index = messages.length - 1; index >= 0; index -= 1) {
+		const message = messages[index];
+		if (message.role === "user") return { ...current, messages: [message] };
 	}
-	return { ...context, messages: context.messages.slice(-1) };
+	return { ...current, messages: messages.slice(-1) };
 }
 
 const CLOUD_SEND_PLAN: CursorSessionSendPlan = { mode: "bootstrap", resetAgent: false, reason: "initial" };
@@ -135,7 +140,7 @@ async function prepareCursorCloudProviderTurn(
 					repo: resolvedConfig.cloud.repo.value,
 					branch: resolvedConfig.cloud.branch.value,
 				}),
-			hasPriorContext: context.messages.length > 1,
+			hasPriorContext: getCursorConversationMessages(context).length > 1,
 		});
 		if (!preflight.ok) throw new Error(formatCursorCloudPreflightError(preflight));
 		if (getPendingCursorLiveRun(context) || getActiveCursorLiveRunForCurrentScope()) {

package/src/cursor-record-utils.ts

@@ -1,3 +1,22 @@
+import type { JsonValue } from "@earendil-works/pi-ai";
+
+/** Narrow untyped SDK/MCP arguments at the Pi transcript boundary without rewriting them. */
+export function isJsonObject(value: unknown): value is Record<string, JsonValue> {
+	return value !== null && typeof value === "object" && !Array.isArray(value)
+		&& isJsonValue(value, new Set());
+}
+
+function isJsonValue(value: unknown, ancestors: Set<object>): boolean {
+	if (value === null || typeof value === "string" || typeof value === "boolean") return true;
+	if (typeof value === "number") return Number.isFinite(value);
+	if (typeof value !== "object" || ancestors.has(value)) return false;
+	if (!Array.isArray(value) && Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null) return false;
+	ancestors.add(value);
+	const valid = Object.values(value).every(entry => isJsonValue(entry, ancestors));
+	ancestors.delete(value);
+	return valid;
+}
+
 export function asRecord(value: unknown): Record<string, unknown> | undefined {
 	return value && typeof value === "object" && !Array.isArray(value) ? (value as Record<string, unknown>) : undefined;
 }

package/src/cursor-skill-tool.ts

@@ -18,7 +18,7 @@ import { resolveEffectiveCursorConfigForContext } from "./cursor-runtime-state.j
 export const CURSOR_ACTIVATE_SKILL_TOOL_NAME = "cursor_activate_skill";
 export const CURSOR_ACTIVATE_SKILL_MCP_NAME = "pi__cursor_activate_skill";
 
-const AVAILABLE_SKILLS_SECTION_PATTERN = /\n\nThe following skills provide specialized instructions for specific tasks\.[\s\S]*?<\/available_skills>/;
+const AVAILABLE_SKILLS_SECTION_PATTERN = /<skills>\nThe following skills provide specialized instructions for specific tasks\.[\s\S]*?<\/available_skills>\n<\/skills>|\n\nThe following skills provide specialized instructions for specific tasks\.[\s\S]*?<\/available_skills>/;
 const MAX_SKILL_RESOURCES = 80;
 const RESOURCE_DIR_NAMES = ["scripts", "references", "assets"] as const;