pi-cursor-sdk 0.3.6 → 0.3.8

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.3.8 - 2026-09-19
+
+### Fixed
+
+- Narrow SDK replay and MCP bridge arguments to JSON objects before emitting Pi tool calls, preserving valid payloads without serialization or casts. This supports Pi's tightened transcript types and reports non-JSON arguments before dispatch.
+- Compile source and test fixtures against published Pi 0.85.1, pinned official source, and the fork. Native packed-host checks require common provider, replay, and runtime behavior on every host. The fork additionally qualifies legacy `SystemMessage.replace` checkpoints; current official Pi removed that host feature, which is not required by this extension.
+- Load the already-shipped TypeScript source graph through Pi's native loader so provider streams and replay helpers remain host-owned even with local Pi peer packages installed. Keep compiled output for scripts and programmatic consumers.
+- Preserve hyperlink text and split terminal control sequences when checking platform-smoke read cards, using Node's terminal-control stripping rather than a custom regular expression.
+
+### Changed
+
+- Native source loading fixes host peer identity at the cost of more initial startup/load work. On macOS/Node 24.21.0/Pi fork `90e6`, three fresh-process, warm-cache loader runs measured 0.85–1.24 s for source versus 0.08–0.13 s for dist; these are not TUI startup timings or guarantees for other environments or repeated `/reload`.
+- **Filter migration required:** update old dist-targeting extension filters to preserve include/exclude intent (`+dist/index.js` → `+src/index.ts`, `-dist/index.js` → `-src/index.ts`, `!dist/**` → `!src/**`). The old exclusion alone no longer disables Cursor; retain `-dist/index.js` alongside `-src/index.ts` for rollback. See README's “Existing extension filters”; settings are not rewritten automatically.
+
+## 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
 
@@ -70,6 +70,15 @@ Alternative GitHub install:
 pi install https://github.com/fitchmultz/pi-cursor-sdk
 ```
 
+### Existing extension filters
+
+The Pi entrypoint is now `src/index.ts`. Update any filters in this package's `extensions` setting that target the old `dist/` entry, preserving their include/exclude intent:
+
+- Exact filters: `+dist/index.js` → `+src/index.ts`; `-dist/index.js` → `-src/index.ts`.
+- Glob filters: for example, `dist/**` → `src/**` and `!dist/**` → `!src/**`. Adjust other old-dist patterns to match the new entrypoint with the same intent.
+
+To keep Cursor disabled across upgrades and rollback, retain `-dist/index.js` and add `-src/index.ts`; the old exclusion alone no longer disables Cursor. The package does not rewrite user or project settings.
+
 ### Project-local install
 
 Use `-l` if you want the package recorded in the current project's `.pi/settings.json` instead of your global pi settings:
@@ -91,11 +100,13 @@ Without `--approve`, the project-local extension still runs after Pi trusts the
 For development from this repository:
 
 ```bash
-npm install   # runs prepare, which compiles src/ into dist/ (the manifest entry pi loads)
+npm install   # runs prepare to build dist/ for scripts and programmatic consumers
 pi --approve -e . --model cursor/grok-4.6
 ```
 
-After editing `src/`, run `npm run build` before the next `pi -e .` run, or pi loads the previous build.
+Pi loads the packaged `src/index.ts` graph through its native TypeScript loader. This keeps Pi imports bound to the running host even when another Pi version is installed alongside the extension. `dist/` remains shipped for scripts and programmatic consumers. After editing `src/`, run `npm run build` for validation and compiled consumers, then restart Pi.
+
+The host-identity fix adds initial startup/load work: three fresh-process loader measurements on macOS with Node 24.21.0, Pi fork `90e6`, a warm Jiti disk cache, and network denied took 0.85–1.24 s for source versus 0.08–0.13 s for dist. These are environment-specific loader timings, not full TUI startup measurements or timing guarantees. That host caches extension factories for the same cwd; the initial-load cost does not describe every in-process `/reload`.
 
 ## Configure your Cursor SDK API key
 
@@ -708,7 +719,7 @@ npm install
 CURSOR_API_KEY="your-key" pi --approve -e . --model cursor/grok-4.6
 ```
 
-After editing `src/`, run `npm run build` before the next `pi -e .` run, or pi loads the previous build.
+After editing `src/`, run `npm run build` for validation and compiled consumers, then restart Pi to load the changed source graph.
 
 Maintainer design notes live in [`docs/cursor-model-ux-spec.md`](docs/cursor-model-ux-spec.md).
 

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,12 +3,13 @@ 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";
 import { formatInactiveCursorReplayTrace } from "./cursor-native-replay-trace.js";
 import { partitionNativeToolsByActiveContext } from "./cursor-native-replay-routing.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+$/;
 let cursorNativeReplayIdleDisposeMs = DEFAULT_CURSOR_NATIVE_REPLAY_IDLE_DISPOSE_MS;
@@ -50,8 +51,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 +80,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 +110,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)
@@ -120,6 +129,8 @@ function emitCursorLiveQueuedEvent(turn, event, run) {
 function emitCursorNativeToolUseTurn(stream, partial, model, context, run, toolResultInputTokens, tools, debugRecorder) {
     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",
@@ -164,6 +175,8 @@ function emitInactiveCursorReplayTrace(turn, tools, debugRecorder) {
 }
 function emitCursorBridgeToolUseTurn(stream, partial, model, context, run, toolResultInputTokens, requests) {
     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",
@@ -231,7 +244,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 +304,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-record-utils.js

@@ -1,3 +1,22 @@
+/** Narrow untyped SDK/MCP arguments at the Pi transcript boundary without rewriting them. */
+export function isJsonObject(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value)
+        && isJsonValue(value, new Set());
+}
+function isJsonValue(value, ancestors) {
+    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) {
     return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }

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-dogfood-checklist.md

@@ -4,7 +4,7 @@ Short maintainer checklist for **minimal-surface** validation after prompt, brid
 
 ## Minimal environment
 
-- Build first after any `src/` edit: `npm run build` (the pi manifest loads compiled `dist/`)
+- Build first after any `src/` edit: `npm run build` (validation and compiled-script consumers); restart Pi to load the changed `src/index.ts` manifest graph
 - Extension only: `pi --approve -e . --cursor-no-fast --model cursor/grok-4.6`
 - Fresh session dir: `--session-dir /tmp/pi-cursor-dogfood-<id>`
 - Baseline surface (no ambient Cursor MCP/rules):

package/docs/cursor-live-smoke-checklist.md

@@ -8,7 +8,7 @@ Use this manual checklist during development and debugging of Cursor provider/ru
 
 ## Inner-loop rule
 
-- Build first: `npm run build` after any `src/` edit — the pi manifest loads compiled `dist/`, so unbuilt runs validate stale code. (the cloud/steering/local-resume/provider-debug launchers rebuild automatically even when run directly with `node scripts/...`; `smoke:live`/`smoke:visual`/`smoke:isolated` build via their npm scripts; direct `pi -e .` invocations do not build.)
+- Build first: `npm run build` after any `src/` edit validates emit and updates `dist/` for scripts/programmatic consumers. Pi loads the packaged `src/index.ts` graph; restart Pi after source changes. The cloud/steering/local-resume/provider-debug launchers rebuild automatically even when run directly with `node scripts/...`; `smoke:live`/`smoke:visual`/`smoke:isolated` build via their npm scripts. Packed-install gates must exercise the tarball's actual manifest, not a checkout path.
 - Run from a clean working tree except for the intended branch diff.
 - Use the local extension under test: `pi --approve -e . --cursor-no-fast --model cursor/grok-4.6`.
 - Use a temporary `--session-dir` for every run.

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.