@emmaneugene/pi-cursor-sdk 0.4.0 → 0.4.2

package/node_modules/cross-spawn/node_modules/which/CHANGELOG.md

@@ -0,0 +1,166 @@
+# Changes
+
+
+## 2.0.2
+
+* Rename bin to `node-which`
+
+## 2.0.1
+
+* generate changelog and publish on version bump
+* enforce 100% test coverage
+* Promise interface
+
+## 2.0.0
+
+* Parallel tests, modern JavaScript, and drop support for node < 8
+
+## 1.3.1
+
+* update deps
+* update travis
+
+## v1.3.0
+
+* Add nothrow option to which.sync
+* update tap
+
+## v1.2.14
+
+* appveyor: drop node 5 and 0.x
+* travis-ci: add node 6, drop 0.x
+
+## v1.2.13
+
+* test: Pass missing option to pass on windows
+* update tap
+* update isexe to 2.0.0
+* neveragain.tech pledge request
+
+## v1.2.12
+
+* Removed unused require
+
+## v1.2.11
+
+* Prevent changelog script from being included in package
+
+## v1.2.10
+
+* Use env.PATH only, not env.Path
+
+## v1.2.9
+
+* fix for paths starting with ../
+* Remove unused `is-absolute` module
+
+## v1.2.8
+
+* bullet items in changelog that contain (but don't start with) #
+
+## v1.2.7
+
+* strip 'update changelog' changelog entries out of changelog
+
+## v1.2.6
+
+* make the changelog bulleted
+
+## v1.2.5
+
+* make a changelog, and keep it up to date
+* don't include tests in package
+* Properly handle relative-path executables
+* appveyor
+* Attach error code to Not Found error
+* Make tests pass on Windows
+
+## v1.2.4
+
+* Fix typo
+
+## v1.2.3
+
+* update isexe, fix regression in pathExt handling
+
+## v1.2.2
+
+* update deps, use isexe module, test windows
+
+## v1.2.1
+
+* Sometimes windows PATH entries are quoted
+* Fixed a bug in the check for group and user mode bits. This bug was introduced during refactoring for supporting strict mode.
+* doc cli
+
+## v1.2.0
+
+* Add support for opt.all and -as cli flags
+* test the bin
+* update travis
+* Allow checking for multiple programs in bin/which
+* tap 2
+
+## v1.1.2
+
+* travis
+* Refactored and fixed undefined error on Windows
+* Support strict mode
+
+## v1.1.1
+
+* test +g exes against secondary groups, if available
+* Use windows exe semantics on cygwin & msys
+* cwd should be first in path on win32, not last
+* Handle lower-case 'env.Path' on Windows
+* Update docs
+* use single-quotes
+
+## v1.1.0
+
+* Add tests, depend on is-absolute
+
+## v1.0.9
+
+* which.js: root is allowed to execute files owned by anyone
+
+## v1.0.8
+
+* don't use graceful-fs
+
+## v1.0.7
+
+* add license to package.json
+
+## v1.0.6
+
+* isc license
+
+## 1.0.5
+
+* Awful typo
+
+## 1.0.4
+
+* Test for path absoluteness properly
+* win: Allow '' as a pathext if cmd has a . in it
+
+## 1.0.3
+
+* Remove references to execPath
+* Make `which.sync()` work on Windows by honoring the PATHEXT variable.
+* Make `isExe()` always return true on Windows.
+* MIT
+
+## 1.0.2
+
+* Only files can be exes
+
+## 1.0.1
+
+* Respect the PATHEXT env for win32 support
+* should 0755 the bin
+* binary
+* guts
+* package
+* 1st

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emmaneugene/pi-cursor-sdk",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "pi provider extension backed by @cursor/sdk local agents",
   "publishConfig": {
     "access": "public"

package/scripts/lib/cursor-visual-render.mjs

@@ -112,7 +112,17 @@ export async function writeTerminalScreenshot(htmlPath, pngPath, width, height)
 	let browser;
 	try {
 		const { chromium } = await import("playwright");
-		browser = await chromium.launch();
+		try {
+			browser = await chromium.launch();
+		} catch (bundledBrowserError) {
+			try {
+				browser = await chromium.launch({ channel: "chrome" });
+			} catch (systemBrowserError) {
+				const bundledMessage = bundledBrowserError instanceof Error ? bundledBrowserError.message : String(bundledBrowserError);
+				const systemMessage = systemBrowserError instanceof Error ? systemBrowserError.message : String(systemBrowserError);
+				throw new Error(`bundled Chromium: ${bundledMessage}\nsystem Chrome: ${systemMessage}`);
+			}
+		}
 		const page = await browser.newPage({
 			viewport: {
 				width: Math.max(1_200, width * 10),
@@ -125,7 +135,7 @@ export async function writeTerminalScreenshot(htmlPath, pngPath, width, height)
 		await page.locator("#terminal").screenshot({ path: pngPath });
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
-		throw new Error(`failed to capture PNG with Playwright: ${message}\nInstall Chromium with: npx playwright install chromium\nOr rerun with --no-screenshot and capture ${htmlPath} with agent_browser.`);
+		throw new Error(`failed to capture PNG with Playwright: ${message}\nInstall system Chrome or Chromium with: npx playwright install chromium\nOr rerun with --no-screenshot and capture ${htmlPath} with agent_browser.`);
 	} finally {
 		if (browser) await browser.close();
 	}

package/scripts/visual-tui-smoke-self-test.mjs

@@ -24,7 +24,7 @@ function parseEnvCapture(path) {
 }
 
 export function runVisualSmokeSelfTest(deps) {
-	const { ROOT, DEFAULT_MODE, DEFAULT_MODEL, DEFAULT_SETTING_SOURCES, DEBUG_ENV_NAMES, shellQuote, parseArgs, snapshotJsonlMtimes, findLatestJsonl, sealedNodePath, resolveCommand, requireNode, requireCommand, buildLaunchPlan, run, runVisualSmoke } = deps;
+	const { ROOT, DEFAULT_MODE, DEFAULT_MODEL, DEFAULT_SETTING_SOURCES, DEBUG_ENV_NAMES, shellQuote, parseArgs, snapshotJsonlMtimes, findLatestJsonl, jsonlContainsUserPrompt, waitForCursorTui, sealedNodePath, resolveCommand, requireNode, requireCommand, buildLaunchPlan, run, runVisualSmoke } = deps;
 	const tempDir = mkdtempSync(join(tmpdir(), "pi-cursor-sdk-visual-self-test-"));
 	try {
 		const binDir = join(tempDir, "bin");
@@ -59,6 +59,9 @@ export function runVisualSmokeSelfTest(deps) {
 		utimesSync(freshJsonl, new Date(3_000), new Date(3_000));
 		assertSelfTest(findLatestJsonl(jsonlDir, { sinceMs: 2_000, previousMtimes: previousJsonlMtimes }) === freshJsonl, "JSONL discovery should ignore unchanged stale files before run start");
 		assertSelfTest(findLatestJsonl(jsonlDir, { sinceMs: 4_000, previousMtimes: snapshotJsonlMtimes(jsonlDir) }) === undefined, "JSONL discovery should not return stale evidence when current run has no changed JSONL");
+		writeFileSync(freshJsonl, `${JSON.stringify({ type: "message", message: { role: "user", content: "submitted prompt" } })}\n`, "utf8");
+		assertSelfTest(jsonlContainsUserPrompt(freshJsonl, "submitted prompt"), "JSONL prompt check should find the submitted user message");
+		assertSelfTest(!jsonlContainsUserPrompt(freshJsonl, "different prompt"), "JSONL prompt check should reject a different user message");
 
 		assertSelfTest(!sealedNodePath(process.execPath, "").includes(delimiter), "empty inherited PATH must not leave an empty PATH segment");
 		const hostilePath = `${binDir}${delimiter}${process.env.PATH ?? ""}`;
@@ -73,6 +76,7 @@ export function runVisualSmokeSelfTest(deps) {
 			cwd: ROOT,
 			mode: DEFAULT_MODE,
 			model: DEFAULT_MODEL,
+			prompt: "self-test prompt",
 			outDir: tempDir,
 			safeLabel: "self-test",
 			sessionDir: join(tempDir, "session"),
@@ -96,6 +100,7 @@ export function runVisualSmokeSelfTest(deps) {
 			assertSelfTest(plan.clearEnvNames.includes(name), `${name} must be cleared by default`);
 		}
 		assertSelfTest(plan.script.includes(shellQuote(fakePi)), "launch script must use resolved pi path");
+		assertSelfTest(!plan.script.includes(baseOptions.prompt), "launch script must keep the prompt out of the process command line");
 		assertSelfTest(!plan.script.includes(" exec pi "), "launch script must not use bare pi");
 		const hostileEnv = {
 			...process.env,
@@ -144,48 +149,18 @@ export function runVisualSmokeSelfTest(deps) {
 		assertSelfTest(!capturedEventDebugEnv.has("PI_CURSOR_SDK_EVENT_DEBUG_STDERR"), "stale event debug stderr flag should be cleared");
 
 		const fakeTmux = join(binDir, "tmux");
-		const deleteBufferMarker = join(tempDir, "delete-buffer-called");
-		writeFileSync(
-			fakeTmux,
-			`#!/bin/sh\ncase "$1" in\n  -V) echo 'tmux fake'; exit 0 ;;\n  new-session) exit 0 ;;\n  load-buffer) cat >/dev/null; exit 0 ;;\n  paste-buffer) exit 77 ;;\n  delete-buffer) echo deleted > ${shellQuote(deleteBufferMarker)}; exit 0 ;;\n  kill-session) exit 0 ;;\n  *) echo "unexpected tmux command: $*" >&2; exit 64 ;;\nesac\n`,
-			"utf8",
-		);
-		chmodSync(fakeTmux, 0o755);
-		const originalPath = process.env.PATH;
-		try {
-			process.env.PATH = hostilePath;
-			let pasteFailed = false;
-			try {
-				runVisualSmoke({
-					...baseOptions,
-					prompt: "buffer cleanup prompt",
-					startupMs: 1,
-					waitMs: 1,
-					width: 80,
-					height: 24,
-					historyLines: 100,
-				});
-			} catch (error) {
-				pasteFailed = /paste-buffer failed/.test(error instanceof Error ? error.message : String(error));
-			}
-			assertSelfTest(pasteFailed, "fake tmux paste failure should exercise prompt-buffer cleanup path");
-			assertSelfTest(existsSync(deleteBufferMarker), "prompt tmux buffer should be deleted when paste/send fails");
-		} finally {
-			if (originalPath === undefined) delete process.env.PATH;
-			else process.env.PATH = originalPath;
-		}
-
 		writeFileSync(
 			fakeTmux,
 			`#!/bin/sh
 case "$1" in
   -V) echo 'tmux fake'; exit 0 ;;
   new-session) exit 0 ;;
+  set-option) exit 0 ;;
   load-buffer) cat >/dev/null; exit 0 ;;
   paste-buffer) exit 0 ;;
   send-keys) exit 0 ;;
   delete-buffer) exit 0 ;;
-  capture-pane) echo 'captured visual smoke output'; exit 0 ;;
+  capture-pane) printf 'captured visual smoke output\ncursor · fast:off\n'; exit 0 ;;
   kill-session) exit 0 ;;
   *) echo "unexpected tmux command: $*" >&2; exit 64 ;;
 esac
@@ -194,6 +169,7 @@ esac
 		);
 		chmodSync(fakeTmux, 0o755);
 		const noJsonlManifest = join(tempDir, "self-test-jsonl-missing.manifest.json");
+		const originalPath = process.env.PATH;
 		try {
 			process.env.PATH = hostilePath;
 			let missingJsonlFailed = false;

package/scripts/visual-tui-smoke.mjs

@@ -14,7 +14,7 @@ const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 const DEFAULT_WIDTH = 150;
 const DEFAULT_HEIGHT = 45;
 const DEFAULT_WAIT_MS = 60_000;
-const DEFAULT_STARTUP_MS = 5_000;
+const DEFAULT_STARTUP_MS = 15_000;
 const DEFAULT_HISTORY_LINES = 3_000;
 const DEFAULT_MODEL = "cursor/grok-4.6";
 const DEFAULT_MODE = "plan";
@@ -33,15 +33,15 @@ Usage:
 
 Required:
   --label LABEL                 Artifact filename prefix. Sanitized for paths.
-  --prompt PROMPT               Prompt to paste into the interactive pi TUI.
+  --prompt PROMPT               Prompt to submit in the interactive pi TUI.
                                 Use --prompt-file PATH for multi-line prompts.
 
 Common options:
   --ext PATH                    Extension repo to load with pi -e. Default: repo root.
   --cwd PATH                    Working directory for the pi session. Default: current directory.
   --out-dir PATH                Artifact directory. Default: /tmp/pi-cursor-sdk-visual-smoke-<timestamp>.
-  --wait-ms N                   Milliseconds to wait after sending the prompt. Default: ${DEFAULT_WAIT_MS}.
-  --startup-ms N                Milliseconds to wait before pasting the prompt. Default: ${DEFAULT_STARTUP_MS}.
+  --wait-ms N                   Milliseconds to wait for the response before capture. Default: ${DEFAULT_WAIT_MS}.
+  --startup-ms N                Maximum milliseconds to wait for TUI readiness. Default: ${DEFAULT_STARTUP_MS}.
   --model MODEL                 Cursor model. Default: ${DEFAULT_MODEL}.
   --mode agent|plan             Cursor SDK mode. Default: ${DEFAULT_MODE}.
   --session-dir PATH            pi session directory. Default: <out-dir>/<label>.session.
@@ -82,8 +82,8 @@ Artifacts written:
 Prerequisites:
   - pi, node, tmux, and npm-installed dev dependencies on PATH / in node_modules.
   - The runner resolves pi/tmux from the parent PATH, uses process.execPath for node, and seals pi-shim PATH for prereq checks and tmux.
-  - For automatic PNG capture, install a Playwright browser once when needed:
-      npx playwright install chromium
+  - Automatic PNG capture uses Playwright's Chromium or a system Chrome installation.
+    If neither is available, install Chromium once: npx playwright install chromium
   - In the pi agent harness, --no-screenshot plus agent_browser on the generated HTML is also acceptable.
 
 Examples:
@@ -340,6 +340,41 @@ function findLatestJsonl(root, { sinceMs = 0, previousMtimes = new Map() } = {})
 	return matches[0]?.path;
 }
 
+function jsonlContainsUserPrompt(path, prompt) {
+	for (const line of readFileSync(path, "utf8").split("\n")) {
+		if (!line.trim()) continue;
+		let entry;
+		try {
+			entry = JSON.parse(line);
+		} catch {
+			continue;
+		}
+		if (entry?.type !== "message" || entry.message?.role !== "user") continue;
+		const content = entry.message.content;
+		const text = typeof content === "string"
+			? content
+			: Array.isArray(content)
+				? content.filter((part) => part?.type === "text" && typeof part.text === "string").map((part) => part.text).join("")
+				: "";
+		if (text === prompt) return true;
+	}
+	return false;
+}
+
+function waitForCursorTui(commands, sessionName, timeoutMs) {
+	const deadline = Date.now() + timeoutMs;
+	do {
+		try {
+			const pane = capturePane(commands.tmux, sessionName, ["-p", "-S", "-100"]);
+			if (pane.includes("cursor ·")) return;
+		} catch {
+			// The pane can be unavailable briefly while tmux starts the shell.
+		}
+		sleep(100);
+	} while (Date.now() < deadline);
+	throw new Error(`Cursor TUI did not become ready within ${timeoutMs}ms`);
+}
+
 function checkLeftovers(patterns) {
 	if (patterns.length === 0) return;
 	const result = run("ps", ["-axo", "pid,etime,command"]);
@@ -465,18 +500,19 @@ function runVisualSmoke(options) {
 		]);
 		if (start.status !== 0) throw new Error(`tmux new-session failed: ${start.stderr?.toString().trim() || start.status}`);
 		sessionStarted = true;
+		const remainOnExit = run(commands.tmux, ["set-option", "-t", sessionName, "remain-on-exit", "on"]);
+		if (remainOnExit.status !== 0) throw new Error(`tmux remain-on-exit setup failed: ${remainOnExit.stderr?.toString().trim() || remainOnExit.status}`);
 
-		sleep(options.startupMs);
+		waitForCursorTui(commands, sessionName, options.startupMs);
 		const load = run(commands.tmux, ["load-buffer", "-b", bufferName, "-"], { input: Buffer.from(options.prompt, "utf8") });
 		if (load.status !== 0) throw new Error(`tmux load-buffer failed: ${load.stderr?.toString().trim() || load.status}`);
 		bufferLoaded = true;
 		try {
-			const paste = run(commands.tmux, ["paste-buffer", "-b", bufferName, "-t", sessionName]);
+			const paste = run(commands.tmux, ["paste-buffer", "-p", "-S", "-b", bufferName, "-t", sessionName]);
 			if (paste.status !== 0) throw new Error(`tmux paste-buffer failed: ${paste.stderr?.toString().trim() || paste.status}`);
-			// Give bracketed paste handling a moment to finish before submitting.
 			sleep(250);
-			const enter = run(commands.tmux, ["send-keys", "-t", sessionName, "Enter"]);
-			if (enter.status !== 0) throw new Error(`tmux send-keys failed: ${enter.stderr?.toString().trim() || enter.status}`);
+			const submit = run(commands.tmux, ["send-keys", "-t", sessionName, "-H", "0d"]);
+			if (submit.status !== 0) throw new Error(`tmux prompt submit failed: ${submit.stderr?.toString().trim() || submit.status}`);
 		} finally {
 			run(commands.tmux, ["delete-buffer", "-b", bufferName]);
 			bufferLoaded = false;
@@ -507,6 +543,11 @@ function runVisualSmoke(options) {
 			writeVisualManifest(manifestPath, options, partialArtifacts, { message, writtenAt: new Date().toISOString() });
 			throw new Error(message);
 		}
+		if (!jsonlContainsUserPrompt(jsonlPath, options.prompt)) {
+			const message = "current-run JSONL does not contain the submitted prompt";
+			writeVisualManifest(manifestPath, options, { ...partialArtifacts, jsonlPath }, { message, writtenAt: new Date().toISOString() });
+			throw new Error(message);
+		}
 		writeUtf8(jsonlPathFile, `${jsonlPath}\n`);
 
 		return { ...partialArtifacts, jsonlPath };
@@ -531,6 +572,8 @@ try {
 			parseArgs,
 			snapshotJsonlMtimes,
 			findLatestJsonl,
+			jsonlContainsUserPrompt,
+			waitForCursorTui,
 			sealedNodePath,
 			resolveCommand,
 			requireNode,

package/src/cursor-extension-factory-guard.ts

@@ -0,0 +1,57 @@
+import type { ExtensionHandler, SessionShutdownEvent } from "@earendil-works/pi-coding-agent";
+
+/**
+ * First factory invocation in this process owns Cursor's process-global
+ * registrars (bridge, session scope, pooled SDK agent). Pi child sessions call
+ * `createAgentSession` + `bindExtensions` in the same process, which re-invokes
+ * this factory against a new ExtensionAPI while the parent Cursor run is still
+ * live. A nested factory must not re-register.
+ *
+ * Ownership ends after the owner's shutdown handlers finish. Pi then reloads
+ * the extension for `new`, `resume`, `fork`, and explicit reload operations.
+ */
+export type CursorExtensionFactoryClaim =
+	| { kind: "owner"; token: symbol }
+	| { kind: "nested" };
+
+export interface CursorExtensionFactoryGuardApi {
+	on(event: "session_shutdown", handler: ExtensionHandler<SessionShutdownEvent>): void;
+}
+
+let factoryOwnerToken: symbol | undefined;
+
+export function claimCursorExtensionFactory(): CursorExtensionFactoryClaim {
+	if (factoryOwnerToken) return { kind: "nested" };
+	const token = Symbol("cursor-extension-factory-owner");
+	factoryOwnerToken = token;
+	return { kind: "owner", token };
+}
+
+export function releaseCursorExtensionFactory(token: symbol): void {
+	if (factoryOwnerToken === token) {
+		factoryOwnerToken = undefined;
+	}
+}
+
+/**
+ * Install the owner's release handler after all other factory registration
+ * succeeds. The final handler keeps ownership until earlier shutdown cleanup
+ * has finished.
+ */
+export function registerCursorExtensionFactoryRelease(
+	pi: CursorExtensionFactoryGuardApi,
+	claim: Extract<CursorExtensionFactoryClaim, { kind: "owner" }>,
+): void {
+	pi.on("session_shutdown", () => {
+		releaseCursorExtensionFactory(claim.token);
+	});
+}
+
+export const __testUtils = {
+	isInstalled(): boolean {
+		return factoryOwnerToken !== undefined;
+	},
+	reset(): void {
+		factoryOwnerToken = undefined;
+	},
+};

package/src/cursor-pi-tool-bridge-server.ts

@@ -64,6 +64,10 @@ export class CursorPiToolBridgeRegistry implements CursorPiToolBridge {
 		return run;
 	}
 
+	hasLiveRuns(): boolean {
+		return this.runs.size > 0;
+	}
+
 	async disposeAll(reason = "Cursor pi tool bridge disposed"): Promise<void> {
 		await Promise.all([...this.runs].map(async (run) => {
 			run.cancel(reason);

package/src/cursor-pi-tool-bridge.ts

@@ -88,13 +88,13 @@ Get-CimInstance Win32_Process -Filter "Name = 'bash.exe' OR Name = 'sh.exe'" |
 	});
 }
 
-export function registerCursorPiToolBridge(pi: CursorPiToolBridgeExtensionApi): CursorPiToolBridge {
-	bridgeToolExecutionAbortTracker.abortAll("Cursor pi tool bridge extension reloaded");
-	void registeredCursorPiToolBridge?.disposeAll("Cursor pi tool bridge extension reloaded");
-	const bridge = new CursorPiToolBridgeRegistry(pi);
-	registeredCursorPiToolBridge = bridge;
+function attachCursorPiToolBridgeHandlers(
+	pi: CursorPiToolBridgeExtensionApi,
+	bridge: CursorPiToolBridgeRegistry,
+	options: { abortAllOnShutdown: boolean; isActive: () => boolean },
+): void {
 	pi.on("tool_call", (event, ctx) => {
-		if (registeredCursorPiToolBridge !== bridge) return undefined;
+		if (!options.isActive()) return undefined;
 		if (!bridge.hasPendingPiToolCallId(event.toolCallId)) {
 			return isCursorPiBridgeToolCallId(event.toolCallId)
 				? { block: true, reason: "Cursor pi bridge tool call is no longer pending" }
@@ -119,9 +119,35 @@ export function registerCursorPiToolBridge(pi: CursorPiToolBridgeExtensionApi):
 	});
 	pi.on("session_shutdown", async (event) => {
 		const reason = `Cursor pi tool bridge session shutdown: ${event.reason}`;
-		bridgeToolExecutionAbortTracker.abortAll(reason);
+		if (options.abortAllOnShutdown) bridgeToolExecutionAbortTracker.abortAll(reason);
 		await bridge.disposeAll(reason);
 	});
+}
+
+export function registerCursorPiToolBridge(pi: CursorPiToolBridgeExtensionApi): CursorPiToolBridge {
+	// Replacing a bridge during a live MCP run cancels its pending pi tool
+	// calls. Keep the active registry as a final safety belt.
+	if (registeredCursorPiToolBridge?.hasLiveRuns()) {
+		return registeredCursorPiToolBridge;
+	}
+	bridgeToolExecutionAbortTracker.abortAll("Cursor pi tool bridge extension reloaded");
+	void registeredCursorPiToolBridge?.disposeAll("Cursor pi tool bridge extension reloaded");
+	const bridge = new CursorPiToolBridgeRegistry(pi);
+	registeredCursorPiToolBridge = bridge;
+	attachCursorPiToolBridgeHandlers(pi, bridge, {
+		abortAllOnShutdown: true,
+		isActive: () => registeredCursorPiToolBridge === bridge,
+	});
+	return bridge;
+}
+
+/** Register a bridge owned only by one nested in-process child session. */
+export function registerNestedCursorPiToolBridge(pi: CursorPiToolBridgeExtensionApi): CursorPiToolBridge {
+	const bridge = new CursorPiToolBridgeRegistry(pi);
+	attachCursorPiToolBridgeHandlers(pi, bridge, {
+		abortAllOnShutdown: false,
+		isActive: () => true,
+	});
 	return bridge;
 }
 

package/src/cursor-provider-lazy.ts

@@ -9,6 +9,7 @@ import {
 } from "@earendil-works/pi-ai";
 import { streamCursor } from "./cursor-provider.js";
 import { sanitizeCursorProviderError } from "./cursor-provider-errors.js";
+import type { CursorProviderRuntimeContext } from "./cursor-provider-runtime-context.js";
 
 function makeProviderRuntimeErrorMessage(model: Model<Api>, error: unknown, apiKey?: string): AssistantMessage {
 	return {
@@ -35,11 +36,12 @@ export function streamCursorLazy(
 	model: Model<Api>,
 	context: Context,
 	options?: SimpleStreamOptions,
+	runtimeContext?: CursorProviderRuntimeContext,
 ): AssistantMessageEventStream {
 	const outer = createAssistantMessageEventStream();
 	queueMicrotask(async () => {
 		try {
-			for await (const event of streamCursor(model, context, options)) {
+			for await (const event of streamCursor(model, context, options, runtimeContext)) {
 				outer.push(event);
 			}
 		} catch (error) {

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

@@ -67,8 +67,8 @@ export function getPendingCursorLiveRun(context: Context): CursorLiveRun | undef
 	return cursorLiveRuns.getPendingFromContext(context, getCursorNativeReplayIdFromToolCallId);
 }
 
-export function getActiveCursorLiveRunForCurrentScope(): CursorLiveRun | undefined {
-	return cursorLiveRuns.getActiveForScope();
+export function getActiveCursorLiveRunForScope(scopeKey?: string): CursorLiveRun | undefined {
+	return cursorLiveRuns.getActiveForScope(scopeKey);
 }
 
 function splitTextIntoReplayDeltas(text: string): string[] {
@@ -427,10 +427,11 @@ export async function drainExistingCursorLiveRunBeforeSend(
 	context: Context,
 	signal?: AbortSignal,
 	turnDebugRecorder?: CursorSdkEventDebugRecorder,
+	scopeKey?: string,
 ): Promise<LiveRunPreSendOutcome> {
 	turnDebugRecorder?.recordDrainEvent("pre_send_start", {});
 	while (true) {
-		const run = getPendingCursorLiveRun(context) ?? getActiveCursorLiveRunForCurrentScope();
+		const run = getPendingCursorLiveRun(context) ?? getActiveCursorLiveRunForScope(scopeKey);
 		if (!run || run.disposed) {
 			turnDebugRecorder?.recordDrainEvent("pre_send_end", { outcome: "continue_send", reason: "no_pending_run" });
 			return "continue_send";

package/src/cursor-provider-run-finalizer.ts

@@ -147,6 +147,7 @@ export class CursorRunFinalizer {
 		if (liveCompletion) {
 			void liveCompletion.waitCompletion
 				.finally(async () => {
+					await prepared?.lifecycle.dispose().catch(() => {});
 					await this.finalizeSdkEventDebugBestEffort();
 					this.safeCleanup(() => this.params.sdkProcessErrorGuard.dispose());
 				})

package/src/cursor-provider-runtime-context.ts

@@ -0,0 +1,13 @@
+import type { CursorPiToolBridge } from "./cursor-pi-tool-bridge-types.js";
+
+/** Runtime state captured by one nested in-process Cursor provider registration. */
+export interface CursorProviderRuntimeContext {
+	readonly scopeKey: string;
+	readonly cwd: string;
+	readonly sessionFile: string | undefined;
+	readonly projectTrusted: boolean;
+	readonly bridge: CursorPiToolBridge;
+	readonly localResume: false;
+	readonly nativeToolReplay: false;
+	readonly disposeAgentAfterTurn: true;
+}