pi-cursor-sdk 0.5.0 → 0.5.2

package/node_modules/hono/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.13.9",
+  "version": "4.13.13",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -11,29 +11,31 @@
     "!dist/**/*.tsbuildinfo"
   ],
   "scripts": {
-    "test": "tsc -p tsconfig.spec.json && vitest --run",
-    "test:watch": "vitest --watch",
+    "test": "tsc -p tsconfig.spec.json && vp test --run",
+    "test:watch": "vp test --watch",
     "test:deno": "deno test --allow-read --allow-env --allow-write --allow-net -c runtime-tests/deno/deno.json runtime-tests/deno && deno test --no-lock -c runtime-tests/deno-jsx/deno.precompile.json runtime-tests/deno-jsx && deno test --no-lock -c runtime-tests/deno-jsx/deno.react-jsx.json runtime-tests/deno-jsx",
-    "test:bun": "bun test --jsx-import-source ../../src/jsx runtime-tests/bun/*",
-    "test:fastly": "vitest --run --project fastly",
-    "test:node": "vitest --run --project node",
-    "test:workerd": "vitest --run --project workerd",
-    "test:lambda": "vitest --run --project lambda",
-    "test:lambda-edge": "vitest --run --project lambda-edge",
-    "test:all": "bun run test && bun test:deno && bun test:bun",
-    "lint": "eslint src runtime-tests build perf-measures benchmarks",
-    "lint:fix": "eslint src runtime-tests build perf-measures benchmarks --fix",
-    "format": "prettier --check --cache \"src/**/*.{js,ts,tsx}\" \"runtime-tests/**/*.{js,ts,tsx}\" \"build/**/*.{js,ts,tsx}\" \"perf-measures/**/*.{js,ts,tsx}\" \"benchmarks/**/*.{js,ts,tsx}\"",
-    "format:fix": "prettier --write --cache --cache-strategy metadata \"src/**/*.{js,ts,tsx}\" \"runtime-tests/**/*.{js,ts,tsx}\" \"build/**/*.{js,ts,tsx}\" \"perf-measures/**/*.{js,ts,tsx}\" \"benchmarks/**/*.{js,ts,tsx}\"",
+    "test:bun": "bun test --jsx-import-source ../../src/jsx runtime-tests/bun",
+    "test:fastly": "vp test --run --project fastly",
+    "test:node": "vp test --run --project node",
+    "test:workerd": "vp test --run --project workerd",
+    "test:all": "pnpm run test && pnpm run test:deno && pnpm run test:bun",
+    "check": "vp check",
+    "check:fix": "vp check --fix",
+    "lint": "vp lint src runtime-tests build perf-measures benchmarks adapters",
+    "lint:fix": "vp lint --fix src runtime-tests build perf-measures benchmarks adapters",
+    "format": "vp fmt --check \"src/**/*.{js,ts,tsx}\" \"runtime-tests/**/*.{js,ts,tsx}\" \"build/**/*.{js,ts,tsx}\" \"perf-measures/**/*.{js,ts,tsx}\" \"benchmarks/**/*.{js,ts,tsx}\" \"adapters/**/*.{js,ts,tsx}\"",
+    "format:fix": "vp fmt \"src/**/*.{js,ts,tsx}\" \"runtime-tests/**/*.{js,ts,tsx}\" \"build/**/*.{js,ts,tsx}\" \"perf-measures/**/*.{js,ts,tsx}\" \"benchmarks/**/*.{js,ts,tsx}\" \"adapters/**/*.{js,ts,tsx}\"",
     "editorconfig-checker": "editorconfig-checker",
     "copy:package.cjs.json": "cp ./package.cjs.json ./dist/cjs/package.json && cp ./package.cjs.json ./dist/types/package.json",
-    "build": "bun run --shell bun remove-dist && bun ./build/build.ts && bun run copy:package.cjs.json",
-    "postbuild": "publint",
-    "watch": "bun run --shell bun remove-dist && bun ./build/build.ts --watch && bun run copy:package.cjs.json",
-    "coverage": "vitest --run --coverage",
-    "prerelease": "bun test:deno && bun run build",
+    "build": "pnpm run remove-dist && vp pack && pnpm run copy:package.cjs.json && publint",
+    "watch": "pnpm run remove-dist && vp pack --watch && pnpm run copy:package.cjs.json",
+    "coverage": "vp test --run --coverage",
+    "prerelease": "pnpm run test:deno && pnpm run build",
     "release": "np --no-publish",
-    "remove-dist": "rm -rf dist"
+    "remove-dist": "rm -rf dist",
+    "build:adapters": "pnpm -r --filter \"./adapters/*\" run build",
+    "test:adapters": "pnpm -r --filter \"./adapters/*\" run test",
+    "release:adapter": "node ./build/release-adapter.ts"
   },
   "exports": {
     ".": {
@@ -101,6 +103,11 @@
       "import": "./dist/helper/route/index.js",
       "require": "./dist/cjs/helper/route/index.js"
     },
+    "./mount": {
+      "types": "./dist/types/middleware/mount/index.d.ts",
+      "import": "./dist/middleware/mount/index.js",
+      "require": "./dist/cjs/middleware/mount/index.js"
+    },
     "./cookie": {
       "types": "./dist/types/helper/cookie/index.d.ts",
       "import": "./dist/helper/cookie/index.js",
@@ -455,6 +462,9 @@
       "route": [
         "./dist/types/helper/route"
       ],
+      "mount": [
+        "./dist/types/middleware/mount"
+      ],
       "cookie": [
         "./dist/types/helper/cookie"
       ],
@@ -674,32 +684,30 @@
     "nodejs"
   ],
   "devDependencies": {
-    "@hono/eslint-config": "^2.1.1",
     "@hono/node-server": "^2.0.12",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^24.3.0",
     "@types/ws": "^8.18.1",
     "@typescript/native-preview": "7.0.0-dev.20260210.1",
-    "@vitest/coverage-v8": "^4.1.7",
+    "@vitest/coverage-v8": "5.0.1",
     "bun-types": "^1.2.20",
     "editorconfig-checker": "6.2.0",
     "esbuild": "^0.27.1",
-    "eslint": "^9.39.3",
     "jsdom": "22.1.0",
     "msw": "^2.6.0",
     "np": "11.2.1",
-    "oxc-parser": "^0.96.0",
     "pkg-pr-new": "^0.0.53",
-    "prettier": "3.7.4",
     "publint": "0.3.15",
+    "rolldown": "^1.2.10",
     "typescript": "^6.0.3",
     "vite-plugin-fastly-js-compute": "^0.4.2",
-    "vitest": "^4.1.9",
+    "vite-plus": "1.0.0",
+    "vitest": "5.0.1",
     "wrangler": "4.107.0",
     "ws": "^8.21.0",
     "zod": "^3.23.8"
   },
-  "packageManager": "bun@1.2.20",
+  "packageManager": "pnpm@12.6.0",
   "engines": {
     "node": ">=16.9.0"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cursor-sdk",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "pi provider extension backed by @cursor/sdk local and cloud agents",
   "author": "Mitch Fultz (https://github.com/fitchmultz)",
   "license": "MIT",
@@ -120,7 +120,7 @@
     "node": ">=24"
   },
   "scripts": {
-    "check:compat": "npm run build && npm run verify && node --test test/ci-compatibility.test.mjs test/native-provider.test.mjs test/native-cursor-flow.test.mjs",
+    "check:compat": "npm run build && npm run verify && node --test test/ci-compatibility.test.mjs test/native-provider.test.mjs test/native-cursor-flow.test.mjs test/native-cursor-prompt.test.mjs",
     "build": "node ./scripts/build.mjs",
     "prepare": "node ./scripts/prepare.mjs",
     "typecheck": "npm run typecheck:src && npm run typecheck:tests && npm run typecheck:replay-compile",
@@ -161,11 +161,11 @@
     "smoke:platform:all": "npm run smoke:platform:doctor && node scripts/platform-smoke.mjs run --target macos,ubuntu,windows-native"
   },
   "dependencies": {
-    "@cursor/sdk": "1.0.32",
-    "@hono/node-server": "2.1.1",
-    "@modelcontextprotocol/hono": "2.0.1",
-    "@modelcontextprotocol/server": "2.1.0",
-    "hono": "4.13.9"
+    "@cursor/sdk": "1.0.36",
+    "@hono/node-server": "2.1.3",
+    "@modelcontextprotocol/hono": "2.0.2",
+    "@modelcontextprotocol/server": "2.3.1",
+    "hono": "4.13.13"
   },
   "bundledDependencies": [
     "@hono/node-server",
@@ -180,18 +180,20 @@
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "0.99.1",
-    "@earendil-works/pi-coding-agent": "0.99.1",
-    "@earendil-works/pi-tui": "0.99.1",
-    "@modelcontextprotocol/client": "2.1.0",
-    "@types/node": "24.19.0",
+    "@connectrpc/connect": "2.2.0",
+    "@earendil-works/pi-ai": "1.0.4",
+    "@earendil-works/pi-coding-agent": "1.0.4",
+    "@earendil-works/pi-tui": "1.0.4",
+    "@modelcontextprotocol/client": "2.3.1",
+    "@types/node": "24.19.1",
     "@typescript/typescript6": "6.0.2",
     "@xterm/xterm": "6.0.0",
     "node-pty": "1.1.0",
     "playwright": "1.63.0",
-    "typebox": "1.3.27",
+    "typebox": "1.3.36",
     "typescript": "7.0.2",
-    "vitest": "5.0.2"
+    "vitest": "5.0.3",
+    "yaml": "2.9.0"
   },
   "pi": {
     "extensions": [

package/scripts/lib/cursor-sdk-output-filter.d.mts

@@ -1,5 +1,6 @@
 export {
 	CURSOR_SDK_STARTUP_NOISE_PATTERNS,
+	withCursorSdkOutputNoticeHandler,
 	installCursorSdkOutputFilter,
 	isCursorSdkOutputSuppressed,
 	isCursorSdkStartupNoise,

package/scripts/lib/cursor-sdk-output-filter.mjs

@@ -1,5 +1,6 @@
 export {
 	CURSOR_SDK_STARTUP_NOISE_PATTERNS,
+	withCursorSdkOutputNoticeHandler,
 	installCursorSdkOutputFilter,
 	isCursorSdkOutputSuppressed,
 	isCursorSdkStartupNoise,

package/scripts/platform-smoke/artifacts.mjs

@@ -324,7 +324,13 @@ function compressPlatformArtifactBundle(bundle) {
 	if (!validatePlatformArtifactBundle(bundle)) throw new Error("platform artifact bundle exceeds decoded limits");
 	const serialized = Buffer.from(JSON.stringify(bundle));
 	if (serialized.length > MAX_INFLATED_BUNDLE_JSON_BYTES) throw new Error("platform artifact bundle exceeds inflated JSON limit");
-	const compressed = gzipSync(serialized, { level: 9 });
+	let compressed;
+	try {
+		compressed = gzipSync(serialized, { level: 9, maxOutputLength: MAX_COMPRESSED_BUNDLE_BYTES });
+	} catch (error) {
+		if (error?.code === "ERR_BUFFER_TOO_LARGE") throw new Error("platform artifact bundle exceeds compressed limit");
+		throw error;
+	}
 	if (compressed.length > MAX_COMPRESSED_BUNDLE_BYTES) throw new Error("platform artifact bundle exceeds compressed limit");
 	return compressed;
 }

package/shared/cursor-sdk-output-filter.d.mts

@@ -1,5 +1,8 @@
 export declare const CURSOR_SDK_STARTUP_NOISE_PATTERNS: readonly string[];
+export type CursorSdkCapabilityNotice = "outsidePlugin" | "parserUnavailable";
+export type CursorSdkOutputNoticeHandler = (kind: CursorSdkCapabilityNotice, message: string) => void | boolean;
 export declare function isCursorSdkOutputSuppressed(): boolean;
 export declare function suppressCursorSdkOutput<T>(operation: () => T): T;
+export declare function withCursorSdkOutputNoticeHandler<T>(handler: CursorSdkOutputNoticeHandler | undefined, operation: () => T): T;
 export declare function isCursorSdkStartupNoise(text: string): boolean;
 export declare function installCursorSdkOutputFilter(): () => void;

package/shared/cursor-sdk-output-filter.mjs

@@ -1,17 +1,34 @@
 import { AsyncLocalStorage } from "node:async_hooks";
+import { isUtf8 } from "node:buffer";
+import { StringDecoder } from "node:string_decoder";
+import { stripVTControlCharacters } from "node:util";
 
 const cursorSdkOutputSuppression = new AsyncLocalStorage();
+const noticeOwner = new AsyncLocalStorage();
+// ponytail: larger frames pass unchanged. Raise this cap for a captured larger
+// SDK frame, or use a public SDK sink when unbounded suppression is required.
+const MAX_CANDIDATE_BYTES = 16 * 1024;
+const PARSER_WARNING = "shell-parser: tree-sitter natives are unavailable in this artifact; shell command analysis degrades to parsingFailed";
+const PLUGIN_PREFIX = "[local-plugins-bootstrap] loadUserLocalPlugin ";
+const HOOK_NOTICES = [
+	...["startup", "resume", "clear", "compact"].map(trigger => `[hooks] SessionStart trigger matcher "${trigger}" is not supported in Cursor, hooks will fire for all triggers`),
+	...["manual", "auto"].map(trigger => `[hooks] PreCompact trigger matcher "${trigger}" is not supported in Cursor, hooks will fire for all triggers`),
+	'[hooks] Tool "Glob" is not supported in Cursor and will be ignored',
+];
 
 export const CURSOR_SDK_STARTUP_NOISE_PATTERNS = [
-	"[hooks]",
-	"managed_skills.",
+	"managed_skills.startup_inventory",
+	"managed_skills.removed",
 	"CursorPluginsAgentSkillsService load completed",
 	"LocalCursorRulesService load completed",
 	"AgentSkillsCursorRulesService load completed",
-	"Error initializing ignore mapping for",
-	"Ripgrep path not configured. Call configureRipgrepPath() at startup.",
 ];
 
+const CURSOR_SDK_CAPABILITY_NOTICES = {
+	outsidePlugin: "Cursor skipped a local plugin because its symlink points outside the local plugin directory. Install it inside that directory to enable it.",
+	parserUnavailable: "Cursor shell analysis is degraded because native parsers are unavailable (parsingFailed). Check the native parser installation or CURSOR_TREE_SITTER_VENDOR_DIR.",
+};
+
 export function isCursorSdkOutputSuppressed() {
 	return cursorSdkOutputSuppression.getStore() === true;
 }
@@ -20,67 +37,123 @@ export function suppressCursorSdkOutput(operation) {
 	return cursorSdkOutputSuppression.run(true, operation);
 }
 
+/** Attribution follows the request's async work, including overlapping native sessions. */
+export function withCursorSdkOutputNoticeHandler(handler, operation) {
+	return noticeOwner.run(handler, operation);
+}
+
+function classify(text) {
+	if (text.replace(/\x1b\[[\d;]*m/g, "").includes("\x1b")) return;
+	const line = stripVTControlCharacters(text).replace(/\r?\n$/, "");
+	if (line === PARSER_WARNING) return "parserUnavailable";
+	if (/^\[local-plugins-bootstrap\] loadUserLocalPlugin [^\r\n]+ rejected: symlink target [^\r\n]+ is outside [^\r\n]+(?: \{[^\r\n]*\})?$/.test(line)) return "outsidePlugin";
+	if (HOOK_NOTICES.includes(line)) return "noise";
+	const info = /^(?:[01]\d|2[0-3]):[0-5]\d:[0-5]\d\.\d{3} INFO  (.+?)(?: ctx=[^\s]+)?(?: meta=\{[^\r\n]*\})?$/.exec(line);
+	if (info && CURSOR_SDK_STARTUP_NOISE_PATTERNS.includes(info[1])) return "noise";
+}
+
+// ponytail: framed text cannot attribute an identical complete SDK signature to
+// its emitter. Upgrade to a public SDK logger/sink when strict attribution exists.
 export function isCursorSdkStartupNoise(text) {
-	return CURSOR_SDK_STARTUP_NOISE_PATTERNS.some((pattern) => text.includes(pattern));
+	return classify(text) === "noise";
+}
+
+function possibleDiagnostic(text) {
+	// Only SGR may lead a diagnostic; Pi cursor/prompt controls forward immediately.
+	const withoutSgr = text.replace(/\x1b\[[\d;]*m/g, "");
+	const plain = stripVTControlCharacters(withoutSgr.replace(/\x1b(?:\[[\d;]*)?$/, ""));
+	if (withoutSgr.includes("\x1b") && !/\x1b(?:\[[\d;]*)?$/.test(withoutSgr)) return false;
+	if (!plain) return true;
+	if (HOOK_NOTICES.some(prefix => prefix.startsWith(plain) || plain === `${prefix}\r`)) return true;
+	if (PARSER_WARNING.startsWith(plain) || plain === `${PARSER_WARNING}\r`) return true;
+	if (PLUGIN_PREFIX.startsWith(plain) || plain.startsWith(PLUGIN_PREFIX)) return true;
+	const timestamp = "00:00:00.000 INFO  ";
+	const normalized = plain.replace(/\d/g, "0");
+	if (timestamp.startsWith(normalized)) return true;
+	if (!normalized.startsWith(timestamp)) return false;
+	const message = plain.slice(timestamp.length);
+	return CURSOR_SDK_STARTUP_NOISE_PATTERNS.some(prefix => prefix.startsWith(message) || message === prefix || message.startsWith(`${prefix} `));
 }
 
 function createFilteredProcessWrite(write, stream) {
-	return (chunk, encodingOrCallback, callback) => {
-		const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
-		if (isCursorSdkOutputSuppressed() || isCursorSdkStartupNoise(text)) {
-			const done = typeof encodingOrCallback === "function" ? encodingOrCallback : callback;
-			done?.();
-			return true;
+	let pending = [], size = 0, text = "", decoder = new StringDecoder("utf8");
+	let owner, suppressed = false;
+	let active = true;
+	function reset() {
+		pending = []; size = 0; text = ""; decoder = new StringDecoder("utf8"); owner = undefined; suppressed = false;
+	}
+	function finish(output) {
+		const original = Buffer.concat(pending);
+		const kind = isUtf8(original) ? classify(text + decoder.end()) : undefined;
+		const handler = owner, wasSuppressed = suppressed;
+		reset();
+		let handled = kind === "noise";
+		if (kind && kind !== "noise" && handler) {
+			// A failed native notice must not turn a capability warning into silence.
+			try {
+				handled = cursorSdkOutputSuppression.run(false, () => handler(kind, CURSOR_SDK_CAPABILITY_NOTICES[kind])) !== false;
+			} catch { handled = false; }
+		}
+		if (!handled && (kind || !wasSuppressed)) output.push(original);
+	}
+	const filteredWrite = (chunk, encodingOrCallback, callback) => {
+		if (!active) return write.call(stream, chunk, encodingOrCallback, callback);
+		if (typeof chunk !== "string" && !(chunk instanceof Uint8Array)) return write.call(stream, chunk, encodingOrCallback, callback);
+		const bytes = typeof chunk === "string" ? Buffer.from(chunk, typeof encodingOrCallback === "string" ? encodingOrCallback : "utf8") : Buffer.from(chunk);
+		const output = [];
+		for (let offset = 0; offset < bytes.length;) {
+			const newline = bytes.indexOf(10, offset);
+			const end = newline < 0 ? bytes.length : newline + 1;
+			const part = bytes.subarray(offset, end);
+			// A write invocation is also a frame boundary after unknown bytes have
+			// forwarded: Pi's native footer/prompt need not end with a newline.
+			if (size === 0) { owner = noticeOwner.getStore(); suppressed = isCursorSdkOutputSuppressed(); }
+			pending.push(part); size += part.length;
+			if (size <= MAX_CANDIDATE_BYTES) text += decoder.write(part);
+			if (size > MAX_CANDIDATE_BYTES || !text || (newline < 0 && !possibleDiagnostic(text))) {
+				if (!suppressed) output.push(...pending);
+				reset();
+			} else if (newline >= 0) finish(output);
+			offset = end;
 		}
-		return write.call(stream, chunk, encodingOrCallback, callback);
+		const done = typeof encodingOrCallback === "function" ? encodingOrCallback : callback;
+		if (output.length) return write.call(stream, Buffer.concat(output), done);
+		if (done) process.nextTick(done);
+		return true;
 	};
-}
-
-function createFilteredConsoleMethod(method) {
-	return (...args) => {
-		const text = args.map((arg) => (typeof arg === "string" ? arg : String(arg))).join(" ");
-		if (isCursorSdkOutputSuppressed() || isCursorSdkStartupNoise(text)) return;
-		method(...args);
+	return {
+		write: filteredWrite,
+		restore() {
+			active = false;
+			const output = [];
+			if (size) finish(output);
+			if (output.length) write.call(stream, Buffer.concat(output));
+		},
 	};
 }
 
 let activeOutputFilterInstalls = 0;
 let outputFilterOriginals;
+let sinks;
 
 export function installCursorSdkOutputFilter() {
 	if (activeOutputFilterInstalls === 0) {
-		outputFilterOriginals = {
-			stdoutWrite: process.stdout.write,
-			stderrWrite: process.stderr.write,
-			consoleLog: console.log,
-			consoleInfo: console.info,
-			consoleWarn: console.warn,
-			consoleError: console.error,
-			consoleDebug: console.debug,
-		};
-		process.stdout.write = createFilteredProcessWrite(outputFilterOriginals.stdoutWrite, process.stdout);
-		process.stderr.write = createFilteredProcessWrite(outputFilterOriginals.stderrWrite, process.stderr);
-		console.log = createFilteredConsoleMethod(outputFilterOriginals.consoleLog);
-		console.info = createFilteredConsoleMethod(outputFilterOriginals.consoleInfo);
-		console.warn = createFilteredConsoleMethod(outputFilterOriginals.consoleWarn);
-		console.error = createFilteredConsoleMethod(outputFilterOriginals.consoleError);
-		console.debug = createFilteredConsoleMethod(outputFilterOriginals.consoleDebug);
+		outputFilterOriginals = { stdoutWrite: process.stdout.write, stderrWrite: process.stderr.write };
+		sinks = [createFilteredProcessWrite(outputFilterOriginals.stdoutWrite, process.stdout), createFilteredProcessWrite(outputFilterOriginals.stderrWrite, process.stderr)];
+		process.stdout.write = sinks[0].write;
+		process.stderr.write = sinks[1].write;
 	}
 	activeOutputFilterInstalls += 1;
-
 	let restored = false;
 	return () => {
 		if (restored) return;
 		restored = true;
-		activeOutputFilterInstalls = Math.max(activeOutputFilterInstalls - 1, 0);
-		if (activeOutputFilterInstalls > 0 || !outputFilterOriginals) return;
+		activeOutputFilterInstalls -= 1;
+		if (activeOutputFilterInstalls > 0) return;
 		process.stdout.write = outputFilterOriginals.stdoutWrite;
 		process.stderr.write = outputFilterOriginals.stderrWrite;
-		console.log = outputFilterOriginals.consoleLog;
-		console.info = outputFilterOriginals.consoleInfo;
-		console.warn = outputFilterOriginals.consoleWarn;
-		console.error = outputFilterOriginals.consoleError;
-		console.debug = outputFilterOriginals.consoleDebug;
-		outputFilterOriginals = undefined;
+		const finishing = sinks;
+		sinks = outputFilterOriginals = undefined;
+		for (const sink of finishing) sink.restore();
 	};
 }

package/src/context.ts

@@ -12,6 +12,8 @@ export interface CursorPrompt {
 }
 
 export interface CursorPromptOptions {
+	/** From the consumed native receipt; absent for requests that differ from the canonical projection. */
+	nativeSourceRoles?: readonly string[];
 	maxInputTokens?: number;
 	charsPerToken?: number;
 	imageTokenEstimate?: number;
@@ -50,6 +52,7 @@ export function getCursorToolTailGuardText(
 			: getCursorPlanModeToolGuidanceText(options.agentMode, { includePiBridgeGuidance: options.includePiBridgeGuidance }),
 		"Exact-output requests: output exactly the requested text; no preamble or checks unless asked.",
 		"Tools: call available Cursor SDK/MCP tools; never print tool cards as assistant text.",
+		"Do not comment on GitHub issues or PRs unless the user asked.",
 		options.includePiBridgeGuidance === false ? undefined : CURSOR_PI_BRIDGE_PREFERENCE_TEXT,
 	].filter((line): line is string => line !== undefined).join("\n");
 }
@@ -58,7 +61,7 @@ function getCursorToolBoundaryText(
 	options: Pick<CursorPromptOptions, "agentMode" | "includePiAskQuestionGuidance"> & { hasToolManifest?: boolean; includePiBridgeGuidance?: boolean } = {},
 ): string {
 	const includePiBridgeGuidance = options.includePiBridgeGuidance !== false;
-	const includePiAskQuestionGuidance = includePiBridgeGuidance && options.includePiAskQuestionGuidance !== false;
+	const includePiAskQuestionGuidance = includePiBridgeGuidance && options.includePiAskQuestionGuidance === true;
 	const lines = [
 		"Cursor SDK tool boundary:",
 		"Call only Cursor SDK/MCP tools exposed in this run; pi history names, replay labels, and transcript names are not callable.",
@@ -66,7 +69,7 @@ function getCursorToolBoundaryText(
 			? "For exposed pi bridge tools, call pi__* MCP names, not pi card/history names."
 			: undefined,
 		"Do not claim pi-side or WebSearch/WebFetch tools unless Cursor ran an equivalent tool.",
-		includePiAskQuestionGuidance ? "Use pi__cursor_ask_question for material choices if exposed." : undefined,
+		includePiAskQuestionGuidance ? "Use pi__cursor_ask_question only if the user asked to be prompted." : undefined,
 		getCursorPlanModeToolGuidanceText(options.agentMode, { includePiBridgeGuidance }),
 		"Images: only latest user images are sent; ask to reattach prior images.",
 	].filter((line): line is string => line !== undefined);
@@ -77,10 +80,13 @@ function getCursorToolBoundaryText(
 }
 
 function getCursorBootstrapTailSections(
-	options: Pick<CursorPromptOptions, "agentMode" | "includePiBridgeGuidance"> = {},
+	options: Pick<CursorPromptOptions, "agentMode" | "includePiBridgeGuidance">,
+	hasNewNativeUser = true,
 ): string[] {
 	return [
-		"Answer the latest user request above using the instructions and Cursor SDK capabilities available in this run.",
+		hasNewNativeUser
+			? "Answer the latest user request above using the instructions and Cursor SDK capabilities available in this run."
+			: "Continue from the pending background context above using Cursor SDK capabilities. No new user request was submitted; earlier user requests are history, not new instructions.",
 		getCursorToolTailGuardText({ ...options, includePlanModeGuidance: false }),
 	];
 }
@@ -101,22 +107,11 @@ function isToolCallBlock(block: { type: string }): block is ToolCall {
 	return block.type === "toolCall";
 }
 
-function extractLatestImages(messages: Message[]): SDKImage[] {
-	// Find the last user message and extract images only from it
-	for (let i = messages.length - 1; i >= 0; i--) {
-		const msg = messages[i];
-		if (msg.role !== "user") continue;
-		if (typeof msg.content === "string") return [];
-
-		const images: SDKImage[] = [];
-		for (const block of msg.content) {
-			if (isImageBlock(block) && block.data && block.mimeType) {
-				images.push({ data: block.data, mimeType: block.mimeType });
-			}
-		}
-		return images;
-	}
-	return [];
+function extractLatestImages(messages: Message[], latestUserIndex = getLatestUserMessageIndex(messages)): SDKImage[] {
+	const message = messages[latestUserIndex];
+	if (!message || message.role !== "user" || typeof message.content === "string") return [];
+	return message.content.flatMap((block) =>
+		isImageBlock(block) && block.data && block.mimeType ? [{ data: block.data, mimeType: block.mimeType }] : []);
 }
 
 function formatContentBlocks(content: string | { type: string; text?: string; data?: string; mimeType?: string }[]): string {
@@ -195,6 +190,20 @@ function getLatestUserMessageIndex(messages: Message[]): number {
 	return -1;
 }
 
+export function getCursorPendingInput(messages: Message[], nativeSourceRoles: readonly string[]) {
+	const start = messages.findLastIndex((message) => message.role === "assistant") + 1;
+	const latestUserIndex = nativeSourceRoles.findLastIndex((role, index) => index >= start && role === "user");
+	return { start, latestUserIndex };
+}
+
+function formatPromptMessage(message: Message, index: number, nativeSourceRoles?: readonly string[]): string | undefined {
+	if (message.role === "user" && nativeSourceRoles && nativeSourceRoles[index] !== "user") {
+		const text = formatContentBlocks(message.content);
+		return text ? `Background context: ${text}` : undefined;
+	}
+	return formatMessage(message);
+}
+
 function getSectionCost(section: string): number {
 	return section.length + SECTION_SEPARATOR.length;
 }
@@ -203,7 +212,7 @@ function applyPromptBudget(
 	sectionsBeforeMessages: string[],
 	messageSections: Array<{ index: number; text: string }>,
 	sectionsAfterMessages: string[],
-	latestUserMessageIndex: number,
+	requiredMessageIndexes: readonly number[],
 	options: CursorPromptOptions,
 ): string[] {
 	const maxInputTokens = options.maxInputTokens;
@@ -213,7 +222,7 @@ function applyPromptBudget(
 
 	const charsPerToken = options.charsPerToken ?? CURSOR_APPROX_CHARS_PER_TOKEN;
 	const maxChars = Math.max(1, Math.floor(maxInputTokens * charsPerToken));
-	const requiredMessageSections = messageSections.filter((section) => section.index === latestUserMessageIndex);
+	const requiredMessageSections = messageSections.filter((section) => requiredMessageIndexes.includes(section.index));
 	const requiredCost = [...sectionsBeforeMessages, ...requiredMessageSections.map((section) => section.text), ...sectionsAfterMessages].reduce(
 		(total, section) => total + getSectionCost(section),
 		0,
@@ -368,6 +377,7 @@ export function computeCursorContextFingerprint(context: Context): string {
 export function shouldBootstrapCursorContext(
 	sendState: { bootstrapped: boolean; contextFingerprint: string },
 	context: Context,
+	nativeSourceRoles?: readonly string[],
 ): boolean {
 	if (!sendState.bootstrapped) return true;
 	const previous = parseCursorContextFingerprint(sendState.contextFingerprint);
@@ -385,9 +395,16 @@ export function shouldBootstrapCursorContext(
 	for (let index = 0; index < previous.messageHashes.length; index += 1) {
 		if (current.messageHashes[index] !== previous.messageHashes[index]) return true;
 	}
-	// An incremental prompt carries only the latest new user message. Rebootstrap
-	// if additional model-visible input (such as ! shell output) would be lost.
 	const appended = normalizePiContextMessages(context.messages.slice(previous.messageHashes.length));
+	if (nativeSourceRoles) {
+		const messages = normalizePiContextMessages(context.messages);
+		const offset = messages.length - appended.length;
+		// Native summaries invalidate the pool; other pending input travels together.
+		if (nativeSourceRoles.slice(offset).some((role) => role === "branchSummary" || role === "compactionSummary")) return true;
+		const { start } = getCursorPendingInput(messages, nativeSourceRoles);
+		return appended.some((message, index) => message.role === "user" && offset + index < start);
+	}
+	// Without native origin, an incremental prompt carries only the final user.
 	const appendedUsers = appended.filter((message) => message.role === "user");
 	return appended.length > 0 && (appendedUsers.length !== 1 || appended.at(-1)?.role !== "user");
 }
@@ -403,15 +420,20 @@ export function shouldBootstrapCursorSend(
 export function buildCursorIncrementalPrompt(context: Context, options: CursorPromptOptions = {}): CursorPrompt {
 	// Incremental sends omit Pi system instructions and the full tool boundary; the session agent retains both from bootstrap.
 	const messages = normalizePiContextMessages(context.messages);
-	const latestUserMessageIndex = getLatestUserMessageIndex(messages);
+	const pending = options.nativeSourceRoles && getCursorPendingInput(messages, options.nativeSourceRoles);
+	const latestUserMessageIndex = pending ? pending.latestUserIndex : getLatestUserMessageIndex(messages);
 	const latestUserMessage = latestUserMessageIndex >= 0 ? messages[latestUserMessageIndex] : undefined;
 	const latestUserText = latestUserMessage ? formatMessage(latestUserMessage) : undefined;
 	const sectionsBeforeMessages = [
 		"Continue the conversation using Cursor SDK capabilities only. Do not list, promise, or call pi-only tools from earlier context as if they were available.",
 	];
-	const latestUserMessageSections =
-		latestUserText && latestUserMessageIndex >= 0 ? [{ index: latestUserMessageIndex, text: latestUserText }] : [];
-	const images = extractLatestImages(messages);
+	const latestUserMessageSections = pending
+		? messages.flatMap((message, index) => {
+			const text = index >= pending.start ? formatPromptMessage(message, index, options.nativeSourceRoles) : undefined;
+			return text ? [{ index, text }] : [];
+		})
+		: latestUserText && latestUserMessageIndex >= 0 ? [{ index: latestUserMessageIndex, text: latestUserText }] : [];
+	const images = extractLatestImages(messages, latestUserMessageIndex);
 	const imageTokenReserve = images.length * (options.imageTokenEstimate ?? 0);
 	const budgetOptions =
 		options.maxInputTokens === undefined
@@ -421,7 +443,7 @@ export function buildCursorIncrementalPrompt(context: Context, options: CursorPr
 		sectionsBeforeMessages,
 		latestUserMessageSections,
 		[getCursorToolTailGuardText(options)],
-		latestUserMessageIndex,
+		latestUserMessageSections.map((section) => section.index),
 		budgetOptions,
 	);
 	return { text: parts.join(SECTION_SEPARATOR), images };
@@ -454,12 +476,13 @@ export function buildCursorPrompt(context: Context, options: CursorPromptOptions
 	const messages = normalizePiContextMessages(context.messages);
 	const messageSections = messages
 		.map((msg, index) => {
-			const text = formatMessage(msg);
+			const text = formatPromptMessage(msg, index, options.nativeSourceRoles);
 			return text ? { index, text } : undefined;
 		})
 		.filter((section): section is { index: number; text: string } => section !== undefined);
-	const sectionsAfterMessages = getCursorBootstrapTailSections(options);
-	const images = extractLatestImages(messages);
+	const pending = options.nativeSourceRoles && getCursorPendingInput(messages, options.nativeSourceRoles);
+	const sectionsAfterMessages = getCursorBootstrapTailSections(options, !pending || pending.latestUserIndex >= 0);
+	const images = extractLatestImages(messages, pending ? pending.latestUserIndex : getLatestUserMessageIndex(messages));
 	const imageTokenReserve = images.length * (options.imageTokenEstimate ?? 0);
 	const budgetOptions =
 		options.maxInputTokens === undefined
@@ -469,7 +492,8 @@ export function buildCursorPrompt(context: Context, options: CursorPromptOptions
 		sectionsBeforeMessages,
 		messageSections,
 		sectionsAfterMessages,
-		getLatestUserMessageIndex(messages),
+		pending ? messageSections.filter((section) => section.index >= pending.start).map((section) => section.index)
+			: [getLatestUserMessageIndex(messages)],
 		budgetOptions,
 	);
 	const text = parts.join(SECTION_SEPARATOR);