pi-cursor-sdk 0.3.6 → 0.3.7

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.3.7 - 2026-09-16
+
+### Fixed
+
+- Preserve completed Cursor SDK assistant-message boundaries in streamed and persisted output: separate progress messages from the next message without splitting token chunks, duplicating the SDK final result, or adding whitespace to an exact final answer. Carry boundaries through local native-replay drain as well as direct/cloud turns.
+
+- Support transcript-only Pi provider requests via the host's public replay helpers, without requiring those exports on stock Pi 0.84.0 or 0.85.1. Preserve current instructions, section updates, and explicit empty replay-tool snapshots.
+- Fingerprint replayed instructions and tool definitions plus individual system-message content/section/tool deltas, so unchanged transcripts stay incremental and changed context reboots correctly.
+- Preserve current Pi instructions in fresh cloud prompts, and ignore system updates when finding pending replay/bridge tool results and steering input.
+- Handle Pi's XML-wrapped tool/rule/skill sections and project-context serialization without duplicating local rules or skill catalogs. Cloud keeps project instructions and omits the local skill catalog.
+
 ## 0.3.6 - 2026-08-18
 
 ### Fixed

package/README.md

@@ -51,10 +51,10 @@ If pi started without a key, run `/cursor-refresh-models` after `/login` to refr
 ## Requirements
 
 - Node.js 22.19+
-- Pi 0.84.0 or later; pi core peer metadata remains optional and uses `"*"` ranges per Pi package guidance
+- Pi 0.84.0 or later; stock Pi 0.84.0 and 0.85.1 are supported without a fork. Pi core peer metadata remains optional and uses `"*"` ranges per Pi package guidance
 - a Cursor SDK API key saved through `/login`, available as `CURSOR_API_KEY`, or passed with pi's `--api-key`
 
-No global `@cursor/sdk` install is required. This package depends on exact `@cursor/sdk@1.0.27`, so normal package installation brings in the SDK version this extension was built and tested against. Cursor SDK 1.0.27 declares its Node ConnectRPC transport dependency directly, so npm installs place `@connectrpc/connect-node` where the SDK can resolve it. The extension intentionally does not bundle `@cursor/sdk` or its platform packages, because packing from one maintainer OS can otherwise ship the wrong optional SDK binary for another OS. Cursor SDK 1.0.27 keeps the older `sqlite3 -> node-gyp@8` dependency chain out of the runtime tree, so deprecated install warnings for `inflight`, `rimraf`, `glob@7`, `npmlog`, `gauge`, `are-we-there-yet`, and `tar@6` from that chain are not expected. Older Pi and Cursor SDK compatibility paths are not maintained.
+No global `@cursor/sdk` install is required. This package depends on exact `@cursor/sdk@1.0.27`, so normal package installation brings in the SDK version this extension was built and tested against. Cursor SDK 1.0.27 declares its Node ConnectRPC transport dependency directly, so npm installs place `@connectrpc/connect-node` where the SDK can resolve it. The extension intentionally does not bundle `@cursor/sdk` or its platform packages, because packing from one maintainer OS can otherwise ship the wrong optional SDK binary for another OS. Cursor SDK 1.0.27 keeps the older `sqlite3 -> node-gyp@8` dependency chain out of the runtime tree, so deprecated install warnings for `inflight`, `rimraf`, `glob@7`, `npmlog`, `gauge`, `are-we-there-yet`, and `tar@6` from that chain are not expected. Pi hosts that pass transcript-only provider contexts are also supported through their public replay helpers, detected at runtime; no fork-only API or dependency is required. Older Pi (before 0.84.0) and Cursor SDK compatibility paths are not maintained.
 
 ## Install
 

package/dist/context.js

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { getCursorConversationMessages, resolveCursorPiContext } from "./cursor-pi-context.js";
 import { convertToLlm } from "@earendil-works/pi-coding-agent";
 import { CURSOR_PI_BRIDGE_PREFERENCE_TEXT } from "./cursor-bridge-contract.js";
 import { getCursorReplayPromptLabel } from "./cursor-tool-presentation-registry.js";
@@ -53,7 +54,7 @@ function getCursorBootstrapTailSections(options = {}) {
     ];
 }
 function normalizePiContextMessages(messages) {
-    return convertToLlm(messages);
+    return convertToLlm(getCursorConversationMessages({ messages }));
 }
 function isTextBlock(block) {
     return block.type === "text";
@@ -102,6 +103,9 @@ function formatToolCall(toolCall) {
 }
 function sanitizeSystemPromptForCursor(systemPrompt) {
     let sanitized = systemPrompt;
+    // Transcript-era Pi wraps its built-in tool catalog/rules in XML sections.
+    sanitized = sanitized.replace(/<tools>\n[\s\S]*?\n\nIn addition to the tools above, you may have access to other custom tools depending on the project\.\n<\/tools>/g, "Pi tool catalog omitted: Cursor can call only Cursor SDK tools exposed in this run.");
+    sanitized = sanitized.replace(/<rules>\n[\s\S]*?\n<\/rules>\n\n(?=<docs>\nPi documentation )/g, "<rules>\n- Be concise in your responses.\n- Show file paths clearly when working with files.\n</rules>\n\n");
     sanitized = sanitized.replace(/Available tools:\n[\s\S]*?\n\nIn addition to the tools above, you may have access to other custom tools depending on the project\.\n\n/g, "Pi tool catalog omitted: Cursor can call only Cursor SDK tools exposed in this run.\n\n");
     sanitized = sanitized.replace(/Guidelines:\n[\s\S]*?\n\nPi documentation /g, "Guidelines:\n- Be concise in your responses.\n- Show file paths clearly when working with files.\n\nPi documentation ");
     // Keep the Agent Skills catalog. Cursor-specific skill activation wording is normalized
@@ -210,11 +214,21 @@ function serializeMessageForFingerprint(message, index) {
             return hashCursorContextValue(`assistant:${message.timestamp ?? index}:${JSON.stringify(message.content)}`);
         case "toolResult":
             return hashCursorContextValue(`toolResult:${message.timestamp ?? index}:${message.toolCallId}:${message.toolName}:${JSON.stringify(message.content)}:${message.isError === true}`);
+        default:
+            // System messages are handled by serializeRawPiMessageForFingerprint.
+            throw new Error("Unsupported Pi message role in Cursor context fingerprint.");
     }
 }
 function serializeRawPiMessageForFingerprint(message, index) {
     const role = message.role;
     switch (role) {
+        case "system": {
+            const entry = message;
+            return hashCursorContextValue(JSON.stringify({
+                role, content: entry.content, sections: entry.sections,
+                toolsAdded: entry.toolsAdded, toolsRemoved: entry.toolsRemoved,
+            }));
+        }
         case "branchSummary": {
             const entry = message;
             return hashCursorContextValue(`branchSummary:${entry.timestamp ?? index}:${entry.fromId ?? ""}:${entry.summary ?? ""}`);
@@ -253,7 +267,7 @@ function parseCursorContextFingerprint(fingerprint) {
 }
 export function computeCursorContextFingerprint(context) {
     const payload = {
-        systemHash: hashCursorContextValue(context.systemPrompt ?? ""),
+        systemHash: hashCursorContextValue(JSON.stringify(resolveCursorPiContext(context))),
         messageHashes: context.messages.map((message, index) => serializeRawPiMessageForFingerprint(message, index)),
     };
     return JSON.stringify(payload);
@@ -316,8 +330,9 @@ export function buildCursorPrompt(context, options = {}) {
     if (options.toolManifest) {
         sectionsBeforeMessages.push(options.toolManifest);
     }
-    if (context.systemPrompt) {
-        sectionsBeforeMessages.push(`System instructions from pi:\n${sanitizeSystemPromptForCursor(context.systemPrompt)}`);
+    const { systemPrompt } = resolveCursorPiContext(context);
+    if (systemPrompt) {
+        sectionsBeforeMessages.push(`System instructions from pi:\n${sanitizeSystemPromptForCursor(systemPrompt)}`);
     }
     const messages = normalizePiContextMessages(context.messages);
     const messageSections = messages

package/dist/cursor-agents-context.js

@@ -73,10 +73,19 @@ export function shouldSuppressPiAgentsContext(model, contextFiles, settingSource
 export function serializePiProjectInstructionsBlock(file) {
     return `${PI_PROJECT_INSTRUCTIONS_OPEN_PREFIX}${file.path}">\n${file.content}\n${PI_PROJECT_INSTRUCTIONS_CLOSE}\n\n`;
 }
-/** Exact pi `buildSystemPrompt()` serialization for the full project context section. */
-export function serializePiProjectContextSection(contextFiles) {
+/** The two supported Pi project-context serializations; legacy includes outer spacing. */
+export function serializePiProjectContextSection(contextFiles, format = "legacy") {
     if (contextFiles.length === 0)
         return "";
+    if (format === "transcript") {
+        return [
+            "<project_context>",
+            "Project-specific instructions and guidelines:",
+            "",
+            contextFiles.map((file) => serializePiProjectInstructionsBlock(file).trimEnd()).join("\n\n"),
+            "</project_context>",
+        ].join("\n");
+    }
     return `${PI_PROJECT_CONTEXT_OPEN}${contextFiles.map(serializePiProjectInstructionsBlock).join("")}${PI_PROJECT_CONTEXT_CLOSE}`;
 }
 /** Remove pi context blocks that overlap Cursor setting sources. */
@@ -92,12 +101,17 @@ export function removePiAgentsContextFromSystemPrompt(systemPrompt, contextFiles
     }
     if (!removedAny)
         return systemPrompt;
-    const originalSection = serializePiProjectContextSection(contextFiles);
-    const start = systemPrompt.indexOf(originalSection);
-    if (start < 0)
-        return systemPrompt;
-    const replacementSection = serializePiProjectContextSection(retainedContextFiles);
-    return systemPrompt.slice(0, start) + replacementSection + systemPrompt.slice(start + originalSection.length);
+    // Match only the exact known files in either supported serialization; never
+    // strip arbitrary user-authored XML or neighboring custom sections.
+    for (const format of ["legacy", "transcript"]) {
+        const originalSection = serializePiProjectContextSection(contextFiles, format);
+        const start = systemPrompt.indexOf(originalSection);
+        if (start < 0)
+            continue;
+        const replacementSection = serializePiProjectContextSection(retainedContextFiles, format);
+        return systemPrompt.slice(0, start) + replacementSection + systemPrompt.slice(start + originalSection.length);
+    }
+    return systemPrompt;
 }
 export function resolveCursorFacingSystemPrompt(systemPrompt, model, systemPromptOptions, settingSourcesRaw, agentDir, runtime = "local") {
     if (runtime === "cloud" || !systemPromptOptions)

package/dist/cursor-context-tools.js

@@ -1,4 +1,6 @@
+import { resolveCursorPiContext } from "./cursor-pi-context.js";
 /** Tool names from the provider context snapshot at stream start (not live pi.getActiveTools()). */
 export function getActiveContextToolNames(context) {
-    return context.tools ? new Set(context.tools.map((tool) => tool.name)) : undefined;
+    const { tools } = resolveCursorPiContext(context);
+    return tools === undefined ? undefined : new Set(tools.map((tool) => tool.name));
 }

package/dist/cursor-live-run-coordinator.js

@@ -1,3 +1,4 @@
+import { getCursorConversationMessages } from "./cursor-pi-context.js";
 import { consumeCursorLiveToolResults, createCursorLiveRunAccountingState, recordCursorLiveSdkTurnEnded, takeCursorLiveSdkTurnUsage, takeCursorLiveTurnInputTokens, } from "./cursor-live-run-accounting.js";
 import { getCursorSessionScopeKey } from "./cursor-session-scope.js";
 import { installCursorSdkProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
@@ -24,16 +25,17 @@ async function cancelCursorLiveSdkRun(run) {
     }
 }
 export function hasTrailingUserMessagesAfterToolResults(context) {
-    let index = context.messages.length - 1;
+    const messages = getCursorConversationMessages(context);
+    let index = messages.length - 1;
     let sawTrailingUser = false;
-    while (index >= 0 && context.messages[index]?.role === "user") {
+    while (index >= 0 && messages[index]?.role === "user") {
         sawTrailingUser = true;
         index -= 1;
     }
     if (!sawTrailingUser)
         return false;
     let sawToolResult = false;
-    while (index >= 0 && context.messages[index]?.role === "toolResult") {
+    while (index >= 0 && messages[index]?.role === "toolResult") {
         sawToolResult = true;
         index -= 1;
     }
@@ -269,12 +271,13 @@ export function createCursorLiveRunCoordinator(deps) {
             return taken.sdkTurnUsage;
         },
         getPendingFromContext(context, getReplayId) {
-            let index = context.messages.length - 1;
-            while (index >= 0 && context.messages[index]?.role === "user") {
+            const messages = getCursorConversationMessages(context);
+            let index = messages.length - 1;
+            while (index >= 0 && messages[index]?.role === "user") {
                 index -= 1;
             }
             for (; index >= 0; index -= 1) {
-                const message = context.messages[index];
+                const message = messages[index];
                 if (message.role !== "toolResult")
                     break;
                 const replayId = getReplayId(message.toolCallId);

package/dist/cursor-partial-content-emitter.js

@@ -1,4 +1,5 @@
 const DEFAULT_THINKING_TRACE_MAX_CHARS = 50000;
+export const CURSOR_TEXT_MESSAGE_SEPARATOR = "\n\n";
 export class CursorPartialContentEmitter {
     stream;
     partial;
@@ -6,6 +7,7 @@ export class CursorPartialContentEmitter {
     mutuallyExclusive;
     thinkingContentIndex = -1;
     textContentIndex = -1;
+    textMessageCompleted = false;
     activityTraceChars = 0;
     activityTraceTruncated = false;
     constructor(stream, partial, thinkingMaxChars = DEFAULT_THINKING_TRACE_MAX_CHARS, mutuallyExclusive = true) {
@@ -79,12 +81,22 @@ export class CursorPartialContentEmitter {
             partial: this.partial,
         });
     }
+    completeTextMessage() {
+        // Defer the separator until more text arrives: an exact final answer must
+        // not gain trailing whitespace. A fresh Pi tool-use turn needs no prefix.
+        this.textMessageCompleted = this.partial.content.some((block) => block.type === "text" && block.text.length > 0);
+    }
     appendTextDelta(delta, options) {
         const closeThinking = options?.closeThinking ?? this.mutuallyExclusive;
         if (closeThinking)
             this.closeThinking();
         if (!delta)
             return;
+        if (this.textMessageCompleted) {
+            this.textMessageCompleted = false;
+            this.appendTextDelta(CURSOR_TEXT_MESSAGE_SEPARATOR, { closeThinking: false });
+            this.closeText();
+        }
         if (this.textContentIndex < 0) {
             this.textContentIndex = this.partial.content.length;
             this.partial.content.push({ type: "text", text: "" });

package/dist/cursor-pi-context.js

@@ -0,0 +1,30 @@
+import * as piAi from "@earendil-works/pi-ai";
+const optionalHelpers = piAi;
+const transcriptHelpers = typeof optionalHelpers.normalizeContext === "function"
+    && typeof optionalHelpers.getCurrentSystemPrompt === "function"
+    && typeof optionalHelpers.getCurrentTools === "function"
+    ? optionalHelpers : undefined;
+export function isCursorSystemMessage(message) {
+    return message.role === "system";
+}
+/** Conversation-only view for Cursor text/history and trailing tool-result scans. */
+export function getCursorConversationMessages(context) {
+    return context.messages.filter((message) => !isCursorSystemMessage(message));
+}
+export function resolveCursorPiContext(context) {
+    if (!transcriptHelpers) {
+        if (context.messages.some(isCursorSystemMessage)) {
+            throw new Error("Pi transcript context requires the host's public transcript replay helpers.");
+        }
+        return { systemPrompt: context.systemPrompt ?? "", tools: context.tools };
+    }
+    const messages = transcriptHelpers.normalizeContext(context).messages;
+    const legacyWithoutTools = ("systemPrompt" in context || "tools" in context)
+        && context.tools === undefined && !context.messages.some(isCursorSystemMessage);
+    return {
+        systemPrompt: transcriptHelpers.getCurrentSystemPrompt(messages),
+        // A messages-only provider request is authoritative, including no declarations.
+        // An explicitly legacy shorthand context retains its absent-snapshot semantics.
+        tools: legacyWithoutTools ? undefined : transcriptHelpers.getCurrentTools(messages),
+    };
+}

package/dist/cursor-provider-live-run-drain.js

@@ -3,7 +3,7 @@ import { CursorLiveRunAbortError, createCursorLiveRunCoordinator, hasTrailingUse
 import { deleteCursorNativeToolDisplay, recordCursorNativeToolDisplay, } from "./cursor-native-tool-display-state.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";
@@ -50,8 +50,7 @@ function splitTextIntoReplayDeltas(text) {
     }
     return deltas;
 }
-async function emitTextDeltas(stream, partial, deltas) {
-    const emitter = new CursorPartialContentEmitter(stream, partial, -1, true);
+async function emitTextDeltas(emitter, deltas) {
     for (const delta of deltas) {
         emitter.appendTextDelta(delta);
         await Promise.resolve();
@@ -80,7 +79,7 @@ export function flushPendingCursorLiveRunTraceEventsToStream(stream, partial, ru
     if (run.disposed)
         return;
     const turn = {
-        emitter: new CursorPartialContentEmitter(stream, partial, -1, true),
+        emitter: options?.emitter ?? new CursorPartialContentEmitter(stream, partial, -1, true),
         emittedText: "",
     };
     while (true) {
@@ -110,6 +109,15 @@ function emitCursorLiveQueuedEvent(turn, event, run) {
     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)
@@ -231,7 +239,7 @@ export async function drainCursorLiveRunTurn(stream, partial, model, context, ru
     let outcome;
     let outcomeDetails = {};
     const turn = {
-        emitter: new CursorPartialContentEmitter(stream, partial, -1, true),
+        emitter: options.emitter ?? new CursorPartialContentEmitter(stream, partial, -1, true),
         emittedText: "",
     };
     try {
@@ -291,7 +299,7 @@ export async function drainCursorLiveRunTurn(stream, partial, model, context, ru
                 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/dist/cursor-provider-turn-coordinator.js

@@ -1,3 +1,4 @@
+import { CURSOR_TEXT_MESSAGE_SEPARATOR } from "./cursor-partial-content-emitter.js";
 import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import { truncateCursorDisplayLine } from "./cursor-display-text.js";
 import { recordDiscardedIncompleteStartedToolCall, } from "./cursor-sdk-event-debug.js";
@@ -29,6 +30,7 @@ export class CursorSdkTurnCoordinator {
     lifecycleEmitter;
     contentEmitter;
     sdkTurnUsage;
+    hasPendingTextMessage = false;
     constructor(options) {
         this.stream = options.stream;
         this.partial = options.partial;
@@ -106,6 +108,8 @@ 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 });
@@ -206,6 +210,20 @@ export class CursorSdkTurnCoordinator {
     }
     handleStep(stepEnvelope) {
         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")

package/dist/cursor-provider-turn-emit.js

@@ -1,4 +1,5 @@
 import { CursorLiveRunAbortError } from "./cursor-live-run-coordinator.js";
+import { CursorPartialContentEmitter } from "./cursor-partial-content-emitter.js";
 import { cursorLiveRuns, drainCursorLiveRunTurn, flushPendingCursorLiveRunTraceEventsToStream, settleCursorLiveToolBatch, } from "./cursor-provider-live-run-drain.js";
 import { buildIncompleteCursorToolRunOutcome, } from "./cursor-incomplete-tool-visibility.js";
 export async function emitCursorLiveTurn(emitParams) {
@@ -7,6 +8,9 @@ export async function emitCursorLiveTurn(emitParams) {
         throw new Error("emitCursorLiveTurn requires a live run");
     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);
@@ -14,6 +18,7 @@ export async function emitCursorLiveTurn(emitParams) {
             turnCoordinator.closeTraceBlock();
             await drainCursorLiveRunTurn(params.stream, params.partial, model, params.context, liveRun, 0, {
                 mode: "emit",
+                emitter,
                 signal: options?.signal,
                 debugRecorder: sdkEventDebug,
             });
@@ -25,6 +30,7 @@ export async function emitCursorLiveTurn(emitParams) {
             turnCoordinator.closeTraceBlock();
             flushPendingCursorLiveRunTraceEventsToStream(params.stream, params.partial, liveRun, {
                 includeTracesBehindQueuedTools: true,
+                emitter,
             });
         }
         throw caught;

package/dist/cursor-provider-turn-prepare.js

@@ -1,3 +1,4 @@
+import { getCursorConversationMessages, resolveCursorPiContext } from "./cursor-pi-context.js";
 import { configureCursorSdkHttp1 } from "./cursor-http1.js";
 import { installCursorMcpToolTimeoutOverride } from "./cursor-mcp-timeout-override.js";
 import { ensureCursorRipgrepPath } from "./cursor-ripgrep-path.js";
@@ -25,12 +26,16 @@ import { loadCursorSdk } from "./cursor-sdk-runtime.js";
 function buildCursorCloudPromptContext(context, handoff) {
     if (handoff === "bootstrap")
         return context;
-    for (let index = context.messages.length - 1; index >= 0; index -= 1) {
-        const message = context.messages[index];
+    // 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 { ...context, messages: [message] };
+            return { ...current, messages: [message] };
     }
-    return { ...context, messages: context.messages.slice(-1) };
+    return { ...current, messages: messages.slice(-1) };
 }
 const CLOUD_SEND_PLAN = { mode: "bootstrap", resetAgent: false, reason: "initial" };
 export function resolveCursorProviderTurnConfig(cwd) {
@@ -69,7 +74,7 @@ async function prepareCursorCloudProviderTurn(prepareParams) {
                     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));

package/dist/cursor-skill-tool.js

@@ -8,7 +8,7 @@ import { resolveCursorPiToolBridgeEnabled } from "./cursor-pi-tool-bridge-env.js
 import { resolveEffectiveCursorConfigForContext } from "./cursor-runtime-state.js";
 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"];
 let currentSkillsByName = new Map();

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

@@ -8,6 +8,8 @@ Implemented design target. This file describes the intended Cursor model UX and
 
 Current implementation notes:
 
+- Provider contexts support stock Pi 0.84.0/0.85.1 shorthand fields and transcript-only hosts. `cursor-pi-context.ts` feature-detects public Pi replay helpers through a static namespace import; no new export is required from stock Pi. Current instructions and tools are replayed natively, system deltas are fingerprinted, and system messages are excluded from Cursor conversation formatting and trailing-result scans. Fresh cloud context preserves current instructions while excluding history. Native replay uses the request tool snapshot (including empty); the pi bridge retains its separate registry-owned surface. XML prompt sections are sanitized/deduplicated alongside the stock format.
+
 - Cursor context variants use `base@context` pi model IDs.
 - Cursor `reasoning`, `effort`, and boolean `thinking` parameters are driven by pi native thinking when the Cursor SDK exposes those controls.
 - Cursor `fast` is extension state by default; models that expose `fast` also get selection-only `:fast` / `:slow` virtual aliases for per-agent overrides.

package/docs/cursor-testing-lessons.md

@@ -33,7 +33,7 @@ When changing provider/runtime behavior, ask whether the bug spans **pi extensio
 Native replay routing intentionally uses two layers:
 
 1. **Extension resync** (`before_agent_start`, `turn_start`) updates pi's active tool set via `syncRegisteredNativeCursorToolsForModel`. This fixes the common case where plan-mode execute strips `grep`/`find`/`cursor` before the next turn.
-2. **Provider routing** uses the **`context.tools` snapshot** captured when `streamCursor()` starts (`getActiveContextToolNames` in `src/cursor-context-tools.ts`). It does not read live `pi.getActiveTools()` mid-stream.
+2. **Provider routing** uses the **request tool snapshot** captured when `streamCursor()` starts (`getActiveContextToolNames` in `src/cursor-context-tools.ts`): legacy `context.tools` on stock Pi 0.84/0.85, or tools replayed by the host's public helpers on transcript-only Pi. An explicit empty snapshot is not an absent legacy snapshot. It does not read live `pi.getActiveTools()` mid-stream. The bridge intentionally retains its separate registry-owned surface.
 
 `src/cursor-native-replay-routing.ts` centralizes provider-side routing against the same `context.tools` snapshot:
 
@@ -48,6 +48,12 @@ Disposition outcomes:
 
 If resync runs but `context.tools` is still stale (e.g. only `read` listed), the provider must **not** emit `toolUse` for inactive tools. `test/cursor-native-replay-stress.test.ts` covers that stale-snapshot path.
 
+## Stock/transcript provider contract
+
+`test/cursor-provider-pi-context.test.ts` drives real `ModelRuntime` / `ModelRegistry` requests into `streamCursor`, with only Cursor SDK execution mocked. Run it against each supported host with all Pi peer imports pinned to that host (including nested native imports); a top-level package version alone is not resolution evidence. Cover stock 0.84.0, stock 0.85.1, and the transcript host. Transcript-only cases are not stock features and are skipped there.
+
+The test covers bootstrap/incremental prompts, empty-vs-absent request tools, native replay/drain, cloud fresh/bootstrap selection, and actual host prompt serialization for context files and skills. It is offline contract evidence, not a replacement for the required live platform/cloud release gates.
+
 ## Auth: use `auth.json`, not only env
 
 pi resolves Cursor auth in this order:

package/package.json

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

package/src/context.ts

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { getCursorConversationMessages, resolveCursorPiContext } from "./cursor-pi-context.js";
 import type { Context, Message, ToolCall } from "@earendil-works/pi-ai";
 import { convertToLlm } from "@earendil-works/pi-coding-agent";
 import type { AgentModeOption, SDKImage } from "@cursor/sdk";
@@ -85,7 +86,7 @@ function getCursorBootstrapTailSections(
 }
 
 function normalizePiContextMessages(messages: Context["messages"]): Message[] {
-	return convertToLlm(messages as Parameters<typeof convertToLlm>[0]);
+	return convertToLlm(getCursorConversationMessages({ messages }) as Parameters<typeof convertToLlm>[0]);
 }
 
 function isTextBlock(block: { type: string }): block is { type: "text"; text: string } {
@@ -137,6 +138,15 @@ function formatToolCall(toolCall: ToolCall): string {
 
 function sanitizeSystemPromptForCursor(systemPrompt: string): string {
 	let sanitized = systemPrompt;
+	// Transcript-era Pi wraps its built-in tool catalog/rules in XML sections.
+	sanitized = sanitized.replace(
+		/<tools>\n[\s\S]*?\n\nIn addition to the tools above, you may have access to other custom tools depending on the project\.\n<\/tools>/g,
+		"Pi tool catalog omitted: Cursor can call only Cursor SDK tools exposed in this run.",
+	);
+	sanitized = sanitized.replace(
+		/<rules>\n[\s\S]*?\n<\/rules>\n\n(?=<docs>\nPi documentation )/g,
+		"<rules>\n- Be concise in your responses.\n- Show file paths clearly when working with files.\n</rules>\n\n",
+	);
 	sanitized = sanitized.replace(
 		/Available tools:\n[\s\S]*?\n\nIn addition to the tools above, you may have access to other custom tools depending on the project\.\n\n/g,
 		"Pi tool catalog omitted: Cursor can call only Cursor SDK tools exposed in this run.\n\n",
@@ -279,12 +289,24 @@ function serializeMessageForFingerprint(message: Message, index: number): string
 			return hashCursorContextValue(
 				`toolResult:${message.timestamp ?? index}:${message.toolCallId}:${message.toolName}:${JSON.stringify(message.content)}:${message.isError === true}`,
 			);
+		default:
+			// System messages are handled by serializeRawPiMessageForFingerprint.
+			throw new Error("Unsupported Pi message role in Cursor context fingerprint.");
 	}
 }
 
 function serializeRawPiMessageForFingerprint(message: Context["messages"][number], index: number): string {
 	const role = (message as { role?: string }).role;
 	switch (role) {
+		case "system": {
+			const entry = message as {
+				content: unknown; sections?: unknown; toolsAdded?: unknown; toolsRemoved?: unknown;
+			};
+			return hashCursorContextValue(JSON.stringify({
+				role, content: entry.content, sections: entry.sections,
+				toolsAdded: entry.toolsAdded, toolsRemoved: entry.toolsRemoved,
+			}));
+		}
 		case "branchSummary": {
 			const entry = message as { summary?: string; fromId?: string; timestamp?: number };
 			return hashCursorContextValue(
@@ -337,7 +359,7 @@ function parseCursorContextFingerprint(fingerprint: string): CursorContextFinger
 
 export function computeCursorContextFingerprint(context: Context): string {
 	const payload: CursorContextFingerprintPayload = {
-		systemHash: hashCursorContextValue(context.systemPrompt ?? ""),
+		systemHash: hashCursorContextValue(JSON.stringify(resolveCursorPiContext(context))),
 		messageHashes: context.messages.map((message, index) => serializeRawPiMessageForFingerprint(message, index)),
 	};
 	return JSON.stringify(payload);
@@ -412,8 +434,9 @@ export function buildCursorPrompt(context: Context, options: CursorPromptOptions
 		sectionsBeforeMessages.push(options.toolManifest);
 	}
 
-	if (context.systemPrompt) {
-		sectionsBeforeMessages.push(`System instructions from pi:\n${sanitizeSystemPromptForCursor(context.systemPrompt)}`);
+	const { systemPrompt } = resolveCursorPiContext(context);
+	if (systemPrompt) {
+		sectionsBeforeMessages.push(`System instructions from pi:\n${sanitizeSystemPromptForCursor(systemPrompt)}`);
 	}
 
 	const messages = normalizePiContextMessages(context.messages);

package/src/cursor-agents-context.ts

@@ -114,9 +114,21 @@ export function serializePiProjectInstructionsBlock(file: PiAgentsContextFile):
 	return `${PI_PROJECT_INSTRUCTIONS_OPEN_PREFIX}${file.path}">\n${file.content}\n${PI_PROJECT_INSTRUCTIONS_CLOSE}\n\n`;
 }
 
-/** Exact pi `buildSystemPrompt()` serialization for the full project context section. */
-export function serializePiProjectContextSection(contextFiles: readonly PiAgentsContextFile[]): string {
+/** The two supported Pi project-context serializations; legacy includes outer spacing. */
+export function serializePiProjectContextSection(
+	contextFiles: readonly PiAgentsContextFile[],
+	format: "legacy" | "transcript" = "legacy",
+): string {
 	if (contextFiles.length === 0) return "";
+	if (format === "transcript") {
+		return [
+			"<project_context>",
+			"Project-specific instructions and guidelines:",
+			"",
+			contextFiles.map((file) => serializePiProjectInstructionsBlock(file).trimEnd()).join("\n\n"),
+			"</project_context>",
+		].join("\n");
+	}
 	return `${PI_PROJECT_CONTEXT_OPEN}${contextFiles.map(serializePiProjectInstructionsBlock).join("")}${PI_PROJECT_CONTEXT_CLOSE}`;
 }
 
@@ -138,12 +150,16 @@ export function removePiAgentsContextFromSystemPrompt(
 	}
 	if (!removedAny) return systemPrompt;
 
-	const originalSection = serializePiProjectContextSection(contextFiles);
-	const start = systemPrompt.indexOf(originalSection);
-	if (start < 0) return systemPrompt;
-
-	const replacementSection = serializePiProjectContextSection(retainedContextFiles);
-	return systemPrompt.slice(0, start) + replacementSection + systemPrompt.slice(start + originalSection.length);
+	// Match only the exact known files in either supported serialization; never
+	// strip arbitrary user-authored XML or neighboring custom sections.
+	for (const format of ["legacy", "transcript"] as const) {
+		const originalSection = serializePiProjectContextSection(contextFiles, format);
+		const start = systemPrompt.indexOf(originalSection);
+		if (start < 0) continue;
+		const replacementSection = serializePiProjectContextSection(retainedContextFiles, format);
+		return systemPrompt.slice(0, start) + replacementSection + systemPrompt.slice(start + originalSection.length);
+	}
+	return systemPrompt;
 }
 
 export function resolveCursorFacingSystemPrompt(

package/src/cursor-context-tools.ts

@@ -1,6 +1,8 @@
 import type { Context } from "@earendil-works/pi-ai";
+import { resolveCursorPiContext } from "./cursor-pi-context.js";
 
 /** Tool names from the provider context snapshot at stream start (not live pi.getActiveTools()). */
 export function getActiveContextToolNames(context: Context): ReadonlySet<string> | undefined {
-	return context.tools ? new Set(context.tools.map((tool) => tool.name)) : undefined;
+	const { tools } = resolveCursorPiContext(context);
+	return tools === undefined ? undefined : new Set(tools.map((tool) => tool.name));
 }

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

@@ -1,4 +1,5 @@
 import type { Context, ToolResultMessage } from "@earendil-works/pi-ai";
+import { getCursorConversationMessages } from "./cursor-pi-context.js";
 import type { SDKAgent } from "@cursor/sdk";
 import {
 	consumeCursorLiveToolResults,
@@ -27,6 +28,7 @@ export type CursorLiveQueuedEvent =
 	| { type: "thinking-delta"; text: string }
 	| { type: "thinking-completed" }
 	| { type: "text-delta"; text: string }
+	| { type: "text-completed" }
 	| { type: "tool"; tool: CursorNativeToolDisplayItem }
 	| { type: "bridge-tool"; request: CursorPiBridgeToolRequest };
 
@@ -155,16 +157,17 @@ interface CursorLiveRunPrivateState {
 }
 
 export function hasTrailingUserMessagesAfterToolResults(context: Context): boolean {
-	let index = context.messages.length - 1;
+	const messages = getCursorConversationMessages(context);
+	let index = messages.length - 1;
 	let sawTrailingUser = false;
-	while (index >= 0 && context.messages[index]?.role === "user") {
+	while (index >= 0 && messages[index]?.role === "user") {
 		sawTrailingUser = true;
 		index -= 1;
 	}
 	if (!sawTrailingUser) return false;
 
 	let sawToolResult = false;
-	while (index >= 0 && context.messages[index]?.role === "toolResult") {
+	while (index >= 0 && messages[index]?.role === "toolResult") {
 		sawToolResult = true;
 		index -= 1;
 	}
@@ -418,13 +421,14 @@ export function createCursorLiveRunCoordinator(deps: CursorLiveRunCoordinatorDep
 		},
 
 		getPendingFromContext(context, getReplayId): CursorLiveRun | undefined {
-			let index = context.messages.length - 1;
-			while (index >= 0 && context.messages[index]?.role === "user") {
+			const messages = getCursorConversationMessages(context);
+			let index = messages.length - 1;
+			while (index >= 0 && messages[index]?.role === "user") {
 				index -= 1;
 			}
 
 			for (; index >= 0; index -= 1) {
-				const message = context.messages[index];
+				const message = messages[index];
 				if (message.role !== "toolResult") break;
 				const replayId = getReplayId(message.toolCallId);
 				if (replayId) {

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

@@ -1,6 +1,7 @@
 import type { AssistantMessage, AssistantMessageEventStream } from "@earendil-works/pi-ai";
 
 const DEFAULT_THINKING_TRACE_MAX_CHARS = 50000;
+export const CURSOR_TEXT_MESSAGE_SEPARATOR = "\n\n";
 
 export interface CursorPartialContentEmitterOptions {
 	stream: AssistantMessageEventStream;
@@ -12,6 +13,7 @@ export interface CursorPartialContentEmitterOptions {
 export class CursorPartialContentEmitter {
 	private thinkingContentIndex = -1;
 	private textContentIndex = -1;
+	private textMessageCompleted = false;
 	private activityTraceChars = 0;
 	private activityTraceTruncated = false;
 
@@ -86,10 +88,21 @@ export class CursorPartialContentEmitter {
 		});
 	}
 
+	completeTextMessage(): void {
+		// Defer the separator until more text arrives: an exact final answer must
+		// not gain trailing whitespace. A fresh Pi tool-use turn needs no prefix.
+		this.textMessageCompleted = this.partial.content.some((block) => block.type === "text" && block.text.length > 0);
+	}
+
 	appendTextDelta(delta: string, options?: { closeThinking?: boolean }): void {
 		const closeThinking = options?.closeThinking ?? this.mutuallyExclusive;
 		if (closeThinking) this.closeThinking();
 		if (!delta) return;
+		if (this.textMessageCompleted) {
+			this.textMessageCompleted = false;
+			this.appendTextDelta(CURSOR_TEXT_MESSAGE_SEPARATOR, { closeThinking: false });
+			this.closeText();
+		}
 		if (this.textContentIndex < 0) {
 			this.textContentIndex = this.partial.content.length;
 			this.partial.content.push({ type: "text", text: "" });

package/src/cursor-pi-context.ts

@@ -0,0 +1,44 @@
+import * as piAi from "@earendil-works/pi-ai";
+import type { Context, Message, Tool } from "@earendil-works/pi-ai";
+
+// Stock 0.84/0.85 do not export transcript helpers. Keep the namespace import in
+// Pi's static extension graph: the host loader supplies its own peer module.
+// Context remains the common structural input (its shorthand fields are optional);
+// transcript hosts pass messages only. Never implement Pi's replay rules here.
+interface PiTranscriptHelpers {
+	normalizeContext(context: Context): { messages: readonly { role: string }[] };
+	getCurrentSystemPrompt(messages: readonly { role: string }[]): string;
+	getCurrentTools(messages: readonly { role: string }[]): Tool[];
+}
+const optionalHelpers = piAi as typeof piAi & Partial<PiTranscriptHelpers>;
+const transcriptHelpers = typeof optionalHelpers.normalizeContext === "function"
+	&& typeof optionalHelpers.getCurrentSystemPrompt === "function"
+	&& typeof optionalHelpers.getCurrentTools === "function"
+	? optionalHelpers as PiTranscriptHelpers : undefined;
+
+export function isCursorSystemMessage(message: { role: string }): boolean {
+	return message.role === "system";
+}
+
+/** Conversation-only view for Cursor text/history and trailing tool-result scans. */
+export function getCursorConversationMessages(context: Pick<Context, "messages">): Message[] {
+	return context.messages.filter((message) => !isCursorSystemMessage(message));
+}
+
+export function resolveCursorPiContext(context: Context): { systemPrompt: string; tools: Tool[] | undefined } {
+	if (!transcriptHelpers) {
+		if (context.messages.some(isCursorSystemMessage)) {
+			throw new Error("Pi transcript context requires the host's public transcript replay helpers.");
+		}
+		return { systemPrompt: context.systemPrompt ?? "", tools: context.tools };
+	}
+	const messages = transcriptHelpers.normalizeContext(context).messages;
+	const legacyWithoutTools = ("systemPrompt" in context || "tools" in context)
+		&& context.tools === undefined && !context.messages.some(isCursorSystemMessage);
+	return {
+		systemPrompt: transcriptHelpers.getCurrentSystemPrompt(messages),
+		// A messages-only provider request is authoritative, including no declarations.
+		// An explicitly legacy shorthand context retains its absent-snapshot semantics.
+		tools: legacyWithoutTools ? undefined : transcriptHelpers.getCurrentTools(messages),
+	};
+}

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

@@ -21,7 +21,7 @@ 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";
@@ -88,11 +88,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 +119,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 +155,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;
@@ -296,7 +300,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 +312,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 +382,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-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;