pi-cursor-sdk 0.1.33 → 0.1.35

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## Unreleased
 
+## 0.1.35 - 2026-06-05
+
+### Changed
+
+- Share the Cursor SDK startup-output filter through one published `shared/` helper while preserving the existing provider and maintainer-script import paths.
+- Add prompt snippets for the Cursor bridge question and skill activation tools so their pi-native prompt metadata matches their existing schemas and guidelines.
+
+### Fixed
+
+- Scope fileless/in-memory Cursor session agents by pi session ID instead of the process-wide anonymous fallback, so terminal shutdown of one ephemeral session does not poison later no-session replacements.
+
+## 0.1.34 - 2026-06-04
+
+### Changed
+
+- Update the local pi validation baseline to `@earendil-works/pi-ai`, `@earendil-works/pi-coding-agent`, and `@earendil-works/pi-tui` `0.78.1` after reviewing the Pi 0.78.1 changelog and extension/provider docs. Pi core peer dependency ranges now follow current pi package guidance with `"*"` ranges, and docs call pi 0.78.1 the recommended validated baseline rather than a hard pin.
+- Gate Cursor native replay tool registration on Pi 0.78.1's precise `ctx.mode === "tui"` instead of treating all dialog-capable UI modes as safe for terminal replay rendering; RPC/JSON/print modes keep bridge/question tools without TUI-only replay wrappers.
+
+### Fixed
+
+- Align `cursor_ask_question` and `cursor_activate_skill` failure paths with Pi's current custom-tool contract by throwing on invalid input, unavailable UI, missing skills, and skill load failures instead of returning successful tool results with ignored `isError` fields.
+
 ## 0.1.33 - 2026-06-04
 
 ### 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.76.0 or newer
+- pi 0.78.1 or newer recommended; pi core peer metadata is intentionally unpinned so newer pi releases are not blocked
 - 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.17`, so normal package installation brings in the SDK version this extension was built and tested against. The Cursor SDK currently depends on `sqlite3@^5.1.7`, whose install path can print deprecated transitive `node-gyp@8` dependency warnings such as `inflight`, `rimraf`, `glob`, `npmlog`, `gauge`, `are-we-there-yet`, and `tar@6`. Those warnings are non-fatal and come from the closed-source Cursor SDK dependency boundary; this package cannot force npm overrides into consumer projects. If you install from a root `package.json` you control, you may choose a root-level override such as `"overrides": { "sqlite3": "6.0.1" }`; pi package installs will still follow npm's normal transitive dependency rules. This package declares a pi **minimum** of 0.76.0 with no maximum peer version, so users who update pi before this extension is republished are not blocked from trying the existing extension. The current validation baseline is pi 0.78.0 plus Cursor SDK 1.0.17; older pi or Cursor SDK compatibility paths are not maintained.
+No global `@cursor/sdk` install is required. This package depends on exact `@cursor/sdk@1.0.17`, so normal package installation brings in the SDK version this extension was built and tested against. The Cursor SDK currently depends on `sqlite3@^5.1.7`, whose install path can print deprecated transitive `node-gyp@8` dependency warnings such as `inflight`, `rimraf`, `glob`, `npmlog`, `gauge`, `are-we-there-yet`, and `tar@6`. Those warnings are non-fatal and come from the closed-source Cursor SDK dependency boundary; this package cannot force npm overrides into consumer projects. If you install from a root `package.json` you control, you may choose a root-level override such as `"overrides": { "sqlite3": "6.0.1" }`; pi package installs will still follow npm's normal transitive dependency rules. This package follows pi package guidance by declaring pi core package peers with `"*"` ranges, so users who update pi before this extension is republished are not blocked by peer metadata. The current recommended and validated pi baseline is 0.78.1 plus Cursor SDK 1.0.17; older pi compatibility paths are best-effort and older Cursor SDK compatibility paths are not maintained.
 
 ## Install
 

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

@@ -67,8 +67,8 @@ The replay scan flags only error `toolResult` / error assistant messages with `T
 
 Pass criteria:
 
-- `pi --version` reports pi 0.78.0 for this cutover baseline.
-- `npm ls` shows `@cursor/sdk@1.0.17` and local `@earendil-works/*@0.78.0` packages.
+- `pi --version` reports pi 0.78.1 for this cutover baseline.
+- `npm ls` shows `@cursor/sdk@1.0.17` and local `@earendil-works/*@0.78.1` packages.
 - `cursor/composer-2-5` appears in the model list.
 - No Cursor key or auth token is printed.
 - If neither `~/.pi/agent/auth.json` cursor auth nor `CURSOR_API_KEY` is available, stop and report the live smoke as blocked.
@@ -125,7 +125,7 @@ Observe with `tmux capture-pane -pt "$SESSION"` or attach manually.
 Pass criteria:
 
 - Footer shows `(cursor) composer-2-5`. With `--cursor-no-fast`, Cursor fast mode is off and the Cursor extension status should not show `cursor fast`; ignore unrelated status text from other extensions.
-- The run uses pi 0.78.0 `--session-id` successfully.
+- The run uses pi 0.78.1 `--session-id` successfully.
 - Assistant answer appears correctly.
 - `/session` shows one user and one assistant message for the simple run.
 - Persisted JSONL has one assistant message. If the screen appears duplicated, inspect JSONL before deciding whether it is a rendering bug.
@@ -133,7 +133,7 @@ Pass criteria:
 
 ## 4. Focused visual card/color rendering check
 
-This is the canonical inner-loop visual debug path for Cursor provider/runtime changes. It requires offscreen TUI visual inspection, not only JSONL or code review. Use pi 0.78.0, `@cursor/sdk@1.0.17`, a fresh temporary session dir, Cursor SDK `plan` mode, native replay enabled, and the checked-in visual runner. The runner resolves `pi` by directly walking the parent `PATH`, uses `process.execPath` for Node, and prepends that Node directory for both prereq checks and tmux launches so `#!/usr/bin/env node` shims use the validated Node. The default matrix is native replay only: native replay registration is forced on, settings sources are `none`, the pi bridge is off, overlapping built-in pi tools are not exposed, and inherited Cursor SDK event-debug artifact env is cleared. With `--event-debug`, debug capture writes to a deterministic directory under `VISUAL_DIR`.
+This is the canonical inner-loop visual debug path for Cursor provider/runtime changes. It requires offscreen TUI visual inspection, not only JSONL or code review. Use pi 0.78.1, `@cursor/sdk@1.0.17`, a fresh temporary session dir, Cursor SDK `plan` mode, native replay enabled, and the checked-in visual runner. The runner resolves `pi` by directly walking the parent `PATH`, uses `process.execPath` for Node, and prepends that Node directory for both prereq checks and tmux launches so `#!/usr/bin/env node` shims use the validated Node. The default matrix is native replay only: native replay registration is forced on, settings sources are `none`, the pi bridge is off, overlapping built-in pi tools are not exposed, and inherited Cursor SDK event-debug artifact env is cleared. With `--event-debug`, debug capture writes to a deterministic directory under `VISUAL_DIR`.
 
 ```bash
 VISUAL_DIR="$(mktemp -d /tmp/pi-cursor-sdk-1016-visual.XXXXXX)"

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

@@ -15,7 +15,7 @@ Current implementation notes:
 - Cursor status uses one coordinated `ctx.ui.setStatus("cursor", ...)` value for fast and non-default plan mode; the default pi footer remains intact.
 - Installed `@cursor/sdk` user messages accept images, and Cursor models are treated as image-capable; registered input metadata is `text` plus `image`.
 - Image payload forwarding sends images only from the latest user message. If the latest user turn is plain text after an earlier image turn, the transcript keeps an `[image omitted from transcript]` placeholder but no image bytes are sent to Cursor. The prompt explicitly tells Cursor that prior image bytes are unavailable and to ask the user to reattach or describe a prior image when needed. Carrying images forward across turns remains a future product decision because it affects token cost, privacy, stale visual context, and expected multimodal follow-up behavior.
-- Exact `@cursor/sdk@1.0.17` is a package dependency of this extension; users should not need a global SDK install. pi 0.78.0 is the current validation baseline, while published pi peer dependencies are minimum-only `>=0.76.0` ranges with no upper bound. Newer pi versions are allowed to attempt loading this extension before a matching extension release exists; compatibility is best-effort until validated.
+- Exact `@cursor/sdk@1.0.17` is a package dependency of this extension; users should not need a global SDK install. pi 0.78.1 is the current recommended validation baseline, while published pi core peer dependencies use `"*"` ranges per current pi package guidance. Newer pi versions are allowed to attempt loading this extension before a matching extension release exists; compatibility is best-effort until validated.
 - Cursor auth uses pi-native API-key resolution for provider `cursor`: CLI `--api-key`, stored `~/.pi/agent/auth.json` API key from `/login`, then `CURSOR_API_KEY`. The extension config file stores only non-secret Cursor-only state such as fast defaults.
 - Local agents pass `settingSources: ["all"]` by default so Cursor MCP servers, plugin tools, project/user settings, and related Cursor-native capabilities are available. Users can narrow loading with a comma-separated list such as `PI_CURSOR_SETTING_SOURCES=project,user,plugins`, or disable ambient setting sources with `PI_CURSOR_SETTING_SOURCES=none`. The provider suppresses direct Cursor SDK bootstrap stdout/stderr/console noise (including late first-send workspace loading such as hook compatibility warnings) so it does not pollute pi's TUI.
 - On `cursor/*` models, pi-cursor-sdk removes only pi-generated `<project_instructions>` blocks that overlap the effective Cursor `settingSources`: `user` for `~/.pi/agent/AGENTS.md`; `project` for discovered repo/parent `AGENTS.md` and `CLAUDE.md` (verified Cursor behavior: local agents load project `AGENTS.md` and `CLAUDE.md`). `~/.pi/agent/CLAUDE.md` is not removed (Cursor user layer uses `~/.claude/CLAUDE.md`). Blocks are removed by exact pi serialization match from structured `contextFiles` via the `before_agent_start` hook, not in `buildCursorPrompt` sanitization. Suppression is skipped with `-nc`, `PI_CURSOR_SETTING_SOURCES=none`, narrowed sources such as `plugins` that omit the matching layer, or `PI_CURSOR_PRESERVE_PI_AGENTS_MD=1`. Switching away from a Cursor model restores pi's full context block on the next user message.

package/docs/cursor-native-tool-visual-audit.md

@@ -6,16 +6,16 @@ This workflow is the canonical repo path for verifying Cursor SDK tool replay th
 
 Use it before accepting replay-card commits or PRs, and for every Cursor provider/runtime release where TUI card/color behavior could regress. Text logs and JSONL are necessary, but they are not enough when the claim is visual parity: always keep PNGs for the exact prompt, and keep before/after PNGs when reviewing a rendering change.
 
-Current validation baseline: pi 0.78.0, exact `@cursor/sdk@1.0.17`, local validation packages `@earendil-works/pi-ai`, `@earendil-works/pi-coding-agent`, and `@earendil-works/pi-tui` at 0.78.0. Published peer dependencies remain minimum-only at pi 0.76.0+ with no upper bound, so newer pi installs can try the extension before a matching validation release exists.
+Current validation baseline: pi 0.78.1, exact `@cursor/sdk@1.0.17`, local validation packages `@earendil-works/pi-ai`, `@earendil-works/pi-coding-agent`, and `@earendil-works/pi-tui` at 0.78.1. Published pi core peer dependencies use `"*"` ranges per current pi package guidance, so newer pi installs can try the extension before a matching validation release exists.
 
-## Cursor SDK 1.0.17 / pi 0.78.0 cutover visual record
+## Cursor SDK 1.0.17 / pi 0.78.1 cutover visual record
 
 Record the required cutover validation here or in the final release handoff. The default matrix is native replay only: the runner forces native replay registration on, forces Cursor setting sources off, disables the pi bridge, disables overlapping built-in pi tool exposure, and clears inherited Cursor SDK event-debug artifact env. With `--event-debug`, debug capture writes to a deterministic directory under the visual output directory. Do not commit raw ANSI logs, screenshots, terminal recordings, debug artifacts, or `.debug/visual-smoke` scratch files.
 
 | Field | Required value / evidence |
 | --- | --- |
 | Command/session used | `npm run smoke:visual -- --ext "$PWD" --cwd "$PWD" --mode plan --out-dir <fresh /tmp dir> --label <matrix label> --prompt <matrix prompt>` with default native-replay isolation |
-| Baseline versions | `pi --version` = 0.78.0; `npm ls` = `@cursor/sdk@1.0.17` and local `@earendil-works/*@0.78.0` |
+| Baseline versions | `pi --version` = 0.78.1; `npm ls` = `@cursor/sdk@1.0.17` and local `@earendil-works/*@0.78.1` |
 | Card categories checked | Claim only categories proven by both PNG and JSONL. Required cutover categories are read, grep/search, find/glob, shell success, write, edit/diff, and true read failure. Direct `ls`/list is tracked as excluded from the current one-prompt platform matrix because composer-2-5 does not route it through native `ls` reliably; source-enumeration coverage is gated through find/glob. Neutral Cursor plan/todo/task/mode activity is optional/opportunistic and only counts when JSONL contains a completed Cursor workflow event. |
 | Observed status/card colors | Confirm native-looking cards use native pi styling; neutral Cursor activity is not red; true errors are distinct; diff previews show red/green; plan status is readable |
 | Screenshot/ANSI evidence location | External path only, for example `/tmp/pi-cursor-sdk-1016-visual.*/read-package.{ansi,txt,html,png,jsonl.path}` |

package/docs/cursor-testing-lessons.md

@@ -243,7 +243,7 @@ The script writes timestamped artifacts under `--out` (default `/tmp/pi-cursor-s
 
 Stdout prints artifact paths and summary counts only. Raw payloads stay on disk and may contain local paths, project text, tool args/results, or secrets — do not commit or share them.
 
-Hard repo rule: Cursor SDK behavior claims must come from the installed `@cursor/sdk` package and/or https://cursor.com/docs/sdk/typescript, not from memory or ad-hoc probes alone. Current cutover validation targets exact `@cursor/sdk@1.0.17` and pi 0.78.0 local packages.
+Hard repo rule: Cursor SDK behavior claims must come from the installed `@cursor/sdk` package and/or https://cursor.com/docs/sdk/typescript, not from memory or ad-hoc probes alone. Current cutover validation targets exact `@cursor/sdk@1.0.17` and pi 0.78.1 local packages.
 
 ## Pi provider SDK event capture
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cursor-sdk",
-	"version": "0.1.33",
+	"version": "0.1.35",
 	"description": "pi provider extension backed by @cursor/sdk local agents",
 	"author": "Mitch Fultz (https://github.com/fitchmultz)",
 	"license": "MIT",
@@ -110,15 +110,15 @@
 		"@modelcontextprotocol/sdk": "^1.29.0"
 	},
 	"peerDependencies": {
-		"@earendil-works/pi-ai": ">=0.76.0",
-		"@earendil-works/pi-coding-agent": ">=0.76.0",
-		"@earendil-works/pi-tui": ">=0.76.0",
+		"@earendil-works/pi-ai": "*",
+		"@earendil-works/pi-coding-agent": "*",
+		"@earendil-works/pi-tui": "*",
 		"typebox": "*"
 	},
 	"devDependencies": {
-		"@earendil-works/pi-ai": "0.78.0",
-		"@earendil-works/pi-coding-agent": "0.78.0",
-		"@earendil-works/pi-tui": "0.78.0",
+		"@earendil-works/pi-ai": "0.78.1",
+		"@earendil-works/pi-coding-agent": "0.78.1",
+		"@earendil-works/pi-tui": "0.78.1",
 		"@xterm/xterm": "^6.0.0",
 		"node-pty": "^1.1.0",
 		"playwright": "^1.60.0",

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

@@ -1,5 +1,7 @@
-export declare const CURSOR_SDK_STARTUP_NOISE_PATTERNS: readonly string[];
-export declare function isCursorSdkOutputSuppressed(): boolean;
-export declare function suppressCursorSdkOutput<T>(operation: () => T): T;
-export declare function isCursorSdkStartupNoise(text: string): boolean;
-export declare function installCursorSdkOutputFilter(): () => void;
+export {
+	CURSOR_SDK_STARTUP_NOISE_PATTERNS,
+	installCursorSdkOutputFilter,
+	isCursorSdkOutputSuppressed,
+	isCursorSdkStartupNoise,
+	suppressCursorSdkOutput,
+} from "../../shared/cursor-sdk-output-filter.mjs";

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

@@ -1,86 +1,7 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-
-export const CURSOR_SDK_STARTUP_NOISE_PATTERNS = [
-	"[hooks]",
-	"managed_skills.",
-	"CursorPluginsAgentSkillsService load completed",
-	"LocalCursorRulesService load completed",
-	"AgentSkillsCursorRulesService load completed",
-	"Error initializing ignore mapping for",
-	"Ripgrep path not configured. Call configureRipgrepPath() at startup.",
-];
-
-const cursorSdkOutputSuppression = new AsyncLocalStorage();
-
-export function isCursorSdkOutputSuppressed() {
-	return cursorSdkOutputSuppression.getStore() === true;
-}
-
-export function suppressCursorSdkOutput(operation) {
-	return cursorSdkOutputSuppression.run(true, operation);
-}
-
-export function isCursorSdkStartupNoise(text) {
-	return CURSOR_SDK_STARTUP_NOISE_PATTERNS.some((pattern) => text.includes(pattern));
-}
-
-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;
-		}
-		return write.call(stream, chunk, encodingOrCallback, callback);
-	};
-}
-
-function createFilteredConsoleMethod(method) {
-	return (...args) => {
-		const text = args.map((arg) => (typeof arg === "string" ? arg : String(arg))).join(" ");
-		if (isCursorSdkOutputSuppressed() || isCursorSdkStartupNoise(text)) return;
-		method(...args);
-	};
-}
-
-let activeOutputFilterInstalls = 0;
-let outputFilterOriginals;
-
-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);
-	}
-	activeOutputFilterInstalls += 1;
-
-	let restored = false;
-	return () => {
-		if (restored) return;
-		restored = true;
-		activeOutputFilterInstalls = Math.max(activeOutputFilterInstalls - 1, 0);
-		if (activeOutputFilterInstalls > 0 || !outputFilterOriginals) 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;
-	};
-}
+export {
+	CURSOR_SDK_STARTUP_NOISE_PATTERNS,
+	installCursorSdkOutputFilter,
+	isCursorSdkOutputSuppressed,
+	isCursorSdkStartupNoise,
+	suppressCursorSdkOutput,
+} from "../../shared/cursor-sdk-output-filter.mjs";

package/scripts/platform-smoke/scenarios.mjs

@@ -48,12 +48,12 @@ Steps:
 1. read ./package.json and remember the package name.
 2. grep ./README.md for "pi-cursor-sdk".
 3. find README.md from repo root.
-4. find src/cursor-provider.ts from repo root.
+4. find src/cursor-provider.ts from repo root; this is the list=<yes/no> evidence.
 5. run shell: {{shellSmoke}}
 6. write .debug/platform-smoke/native.txt with alpha and beta.
 7. edit beta to gamma in that file.
 8. run shell and preserve the failure: {{shellFailure}}
-9. answer exactly:
+9. stop using tools and answer exactly:
 NATIVE_MATRIX_OK package=<name> grep=<yes/no> find=<yes/no> list=<yes/no> shell=<yes/no> shell_fail=<yes/no> write=<yes/no> edit=<yes/no>`,
 		finalMarker: "NATIVE_MATRIX_OK package=pi-cursor-sdk",
 		requiredCards: [

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

@@ -0,0 +1,5 @@
+export declare const CURSOR_SDK_STARTUP_NOISE_PATTERNS: readonly string[];
+export declare function isCursorSdkOutputSuppressed(): boolean;
+export declare function suppressCursorSdkOutput<T>(operation: () => T): T;
+export declare function isCursorSdkStartupNoise(text: string): boolean;
+export declare function installCursorSdkOutputFilter(): () => void;

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

@@ -0,0 +1,86 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+
+const cursorSdkOutputSuppression = new AsyncLocalStorage();
+
+export const CURSOR_SDK_STARTUP_NOISE_PATTERNS = [
+	"[hooks]",
+	"managed_skills.",
+	"CursorPluginsAgentSkillsService load completed",
+	"LocalCursorRulesService load completed",
+	"AgentSkillsCursorRulesService load completed",
+	"Error initializing ignore mapping for",
+	"Ripgrep path not configured. Call configureRipgrepPath() at startup.",
+];
+
+export function isCursorSdkOutputSuppressed() {
+	return cursorSdkOutputSuppression.getStore() === true;
+}
+
+export function suppressCursorSdkOutput(operation) {
+	return cursorSdkOutputSuppression.run(true, operation);
+}
+
+export function isCursorSdkStartupNoise(text) {
+	return CURSOR_SDK_STARTUP_NOISE_PATTERNS.some((pattern) => text.includes(pattern));
+}
+
+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;
+		}
+		return write.call(stream, chunk, encodingOrCallback, callback);
+	};
+}
+
+function createFilteredConsoleMethod(method) {
+	return (...args) => {
+		const text = args.map((arg) => (typeof arg === "string" ? arg : String(arg))).join(" ");
+		if (isCursorSdkOutputSuppressed() || isCursorSdkStartupNoise(text)) return;
+		method(...args);
+	};
+}
+
+let activeOutputFilterInstalls = 0;
+let outputFilterOriginals;
+
+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);
+	}
+	activeOutputFilterInstalls += 1;
+
+	let restored = false;
+	return () => {
+		if (restored) return;
+		restored = true;
+		activeOutputFilterInstalls = Math.max(activeOutputFilterInstalls - 1, 0);
+		if (activeOutputFilterInstalls > 0 || !outputFilterOriginals) 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;
+	};
+}

package/src/cursor-native-tool-display-registration.ts

@@ -39,7 +39,9 @@ function hasNonBuiltinTool(pi: Pick<ExtensionAPI, "getAllTools">, toolName: Nati
 	return existingTool !== undefined && existingTool.sourceInfo.source !== "builtin";
 }
 
-type NativeRegistrationContext = { hasUI: boolean; ui: Pick<ExtensionContext["ui"], "notify">; model?: ExtensionContext["model"] };
+type NativeRegistrationContext = Pick<ExtensionContext, "mode" | "model"> & {
+	ui: Pick<ExtensionContext["ui"], "notify">;
+};
 
 function registerNativeCursorToolsFromSet(
 	pi: CursorNativeToolRegistryApi,
@@ -60,7 +62,7 @@ function registerNativeCursorToolsFromSet(
 }
 
 function notifySkippedNativeCursorToolsIfNeeded(ctx: NativeRegistrationContext, skippedToolNames: readonly NativeCursorToolName[]): void {
-	if (skippedToolNames.length === 0 || readBooleanEnv(NATIVE_CURSOR_TOOL_DISPLAY_ENV) !== true || !ctx.hasUI) return;
+	if (skippedToolNames.length === 0 || readBooleanEnv(NATIVE_CURSOR_TOOL_DISPLAY_ENV) !== true || ctx.mode !== "tui") return;
 	ctx.ui.notify(
 		`Cursor native tool replay skipped for ${skippedToolNames.join(", ")} because another extension already provides ${skippedToolNames.length === 1 ? "that tool" : "those tools"}. Cursor will use scrubbed activity transcripts for skipped tools.`,
 		"warning",
@@ -101,7 +103,7 @@ function ensureNativeCursorToolsRegisteredForModel(pi: CursorNativeToolRegistryA
 		skippedNativeToolNames.clear();
 		return;
 	}
-	if (!isCursorModel(ctx.model) || hasAttemptedNativeCursorToolRegistration()) return;
+	if (ctx.mode !== "tui" || !isCursorModel(ctx.model) || hasAttemptedNativeCursorToolRegistration()) return;
 
 	const nonCoreToolNames = NATIVE_CURSOR_TOOL_NAMES.filter((toolName) => !isCursorCorePiReplayToolName(toolName));
 	const skippedToolNames = [

package/src/cursor-question-tool.ts

@@ -196,6 +196,7 @@ export function registerCursorQuestionTool(pi: CursorQuestionToolExtensionApi):
 		label: "Cursor question",
 		description:
 			"Ask the user a clarifying question from Cursor. Use when user preferences materially affect the next step; provide options when possible.",
+		promptSnippet: "Ask the user a clarifying question through pi UI when material choices affect Cursor's next step",
 		parameters: CursorAskQuestionParamsSchema,
 		promptGuidelines: [
 			"Use cursor_ask_question only when running a Cursor model and user input would materially change the plan, scope, platform, or implementation path.",
@@ -204,23 +205,12 @@ export function registerCursorQuestionTool(pi: CursorQuestionToolExtensionApi):
 		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
 			const questions = normalizeQuestions(params as CursorAskQuestionParams);
 			if (questions.length === 0) {
-				return {
-					content: [{ type: "text" as const, text: "No valid question was provided." }],
-					details: buildDetails([], [], ctx.hasUI),
-					isError: true,
-				};
+				throw new Error("No valid question was provided.");
 			}
 			if (!ctx.hasUI) {
-				return {
-					content: [
-						{
-							type: "text" as const,
-							text: "Cannot ask the user because pi UI is unavailable. Make a reasonable default choice and state the assumption before proceeding.",
-						},
-					],
-					details: buildDetails(questions, [], false),
-					isError: true,
-				};
+				throw new Error(
+					"Cannot ask the user because pi UI is unavailable. Make a reasonable default choice and state the assumption before proceeding.",
+				);
 			}
 
 			const answers: CursorQuestionAnswer[] = [];

package/src/cursor-sdk-output-filter.ts

@@ -1,100 +1,7 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-
-const cursorSdkOutputSuppression = new AsyncLocalStorage<boolean>();
-
-export const CURSOR_SDK_STARTUP_NOISE_PATTERNS = [
-	"[hooks]",
-	"managed_skills.",
-	"CursorPluginsAgentSkillsService load completed",
-	"LocalCursorRulesService load completed",
-	"AgentSkillsCursorRulesService load completed",
-	"Error initializing ignore mapping for",
-	"Ripgrep path not configured. Call configureRipgrepPath() at startup.",
-] as const;
-
-export function isCursorSdkOutputSuppressed(): boolean {
-	return cursorSdkOutputSuppression.getStore() === true;
-}
-
-export function suppressCursorSdkOutput<T>(operation: () => Promise<T>): Promise<T> {
-	return cursorSdkOutputSuppression.run(true, operation);
-}
-
-export function isCursorSdkStartupNoise(text: string): boolean {
-	return CURSOR_SDK_STARTUP_NOISE_PATTERNS.some((pattern) => text.includes(pattern));
-}
-
-function createFilteredProcessWrite<TWrite extends typeof process.stdout.write>(write: TWrite, stream: NodeJS.WriteStream): TWrite {
-	return ((
-		chunk: string | Uint8Array,
-		encodingOrCallback?: BufferEncoding | ((error?: Error | null) => void),
-		callback?: (error?: Error | null) => void,
-	): boolean => {
-		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;
-		}
-		return write.call(stream, chunk as string, encodingOrCallback as BufferEncoding, callback);
-	}) as TWrite;
-}
-
-function createFilteredConsoleMethod<TMethod extends typeof console.log>(method: TMethod): TMethod {
-	return ((...args: Parameters<TMethod>): void => {
-		const text = args.map((arg) => (typeof arg === "string" ? arg : String(arg))).join(" ");
-		if (isCursorSdkOutputSuppressed() || isCursorSdkStartupNoise(text)) return;
-		method(...args);
-	}) as TMethod;
-}
-
-interface CursorSdkOutputFilterOriginals {
-	stdoutWrite: typeof process.stdout.write;
-	stderrWrite: typeof process.stderr.write;
-	consoleLog: typeof console.log;
-	consoleInfo: typeof console.info;
-	consoleWarn: typeof console.warn;
-	consoleError: typeof console.error;
-	consoleDebug: typeof console.debug;
-}
-
-let activeOutputFilterInstalls = 0;
-let outputFilterOriginals: CursorSdkOutputFilterOriginals | undefined;
-
-export function installCursorSdkOutputFilter(): () => void {
-	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) as typeof process.stderr.write;
-		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);
-	}
-	activeOutputFilterInstalls += 1;
-
-	let restored = false;
-	return () => {
-		if (restored) return;
-		restored = true;
-		activeOutputFilterInstalls = Math.max(activeOutputFilterInstalls - 1, 0);
-		if (activeOutputFilterInstalls > 0 || !outputFilterOriginals) 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;
-	};
-}
+export {
+	CURSOR_SDK_STARTUP_NOISE_PATTERNS,
+	installCursorSdkOutputFilter,
+	isCursorSdkOutputSuppressed,
+	isCursorSdkStartupNoise,
+	suppressCursorSdkOutput,
+} from "../shared/cursor-sdk-output-filter.mjs";

package/src/cursor-session-scope.ts

@@ -5,12 +5,14 @@ interface CursorSessionScopeExtensionApi {
 }
 
 const ANONYMOUS_SESSION_SCOPE_KEY = "__anonymous__";
+const EPHEMERAL_SESSION_SCOPE_PREFIX = "__ephemeral__:";
 
 type CursorSessionScopeChangeHandler = (previousScopeKey: string) => void;
 
 const state = {
 	sessionCwd: process.cwd(),
 	sessionFile: undefined as string | undefined,
+	sessionId: undefined as string | undefined,
 };
 
 let scopeChangeHandler: CursorSessionScopeChangeHandler | undefined;
@@ -27,21 +29,25 @@ export function getCursorSessionFile(): string | undefined {
  * before the first session_start (tests and early startup).
  */
 export function getCursorSessionScopeKey(): string {
-	return state.sessionFile ?? ANONYMOUS_SESSION_SCOPE_KEY;
+	if (state.sessionFile) return state.sessionFile;
+	if (state.sessionId) return `${EPHEMERAL_SESSION_SCOPE_PREFIX}${state.sessionId}`;
+	return ANONYMOUS_SESSION_SCOPE_KEY;
 }
 
 export function getCursorSessionCwdFromScope(): string {
 	return state.sessionCwd;
 }
 
-function setCursorSessionScope(cwd: string, sessionFile: string | undefined): void {
+function setCursorSessionScope(cwd: string, sessionFile: string | undefined, sessionId?: string): void {
 	state.sessionCwd = cwd;
 	state.sessionFile = sessionFile;
+	state.sessionId = sessionId;
 }
 
 function resetCursorSessionScope(): void {
 	state.sessionCwd = process.cwd();
 	state.sessionFile = undefined;
+	state.sessionId = undefined;
 }
 
 export function onCursorSessionScopeKeyChange(handler: CursorSessionScopeChangeHandler): void {
@@ -51,7 +57,11 @@ export function onCursorSessionScopeKeyChange(handler: CursorSessionScopeChangeH
 export function registerCursorSessionScope(pi: CursorSessionScopeExtensionApi): void {
 	pi.on("session_start", (_event, ctx) => {
 		const previousScopeKey = getCursorSessionScopeKey();
-		setCursorSessionScope(ctx.cwd, ctx.sessionManager?.getSessionFile?.() ?? undefined);
+		setCursorSessionScope(
+			ctx.cwd,
+			ctx.sessionManager?.getSessionFile?.() ?? undefined,
+			ctx.sessionManager?.getSessionId?.() ?? undefined,
+		);
 		if (previousScopeKey !== getCursorSessionScopeKey()) {
 			scopeChangeHandler?.(previousScopeKey);
 		}
@@ -60,6 +70,7 @@ export function registerCursorSessionScope(pi: CursorSessionScopeExtensionApi):
 
 export const __testUtils = {
 	ANONYMOUS_SESSION_SCOPE_KEY,
+	EPHEMERAL_SESSION_SCOPE_PREFIX,
 	set: setCursorSessionScope,
 	reset: resetCursorSessionScope,
 };

package/src/cursor-skill-tool.ts

@@ -187,6 +187,7 @@ export function registerCursorSkillTool(pi: CursorSkillToolExtensionApi): void {
 		name: CURSOR_ACTIVATE_SKILL_TOOL_NAME,
 		label: "Cursor skill",
 		description: "Load full pi Agent Skill instructions for Cursor. Use with a skill name from the current <available_skills> catalog before applying that skill.",
+		promptSnippet: "Load full pi Agent Skill instructions for a listed skill before Cursor applies that skill",
 		parameters: Type.Object({
 			name: Type.String({ description: "Skill name from the current <available_skills> catalog" }),
 		}),
@@ -197,19 +198,13 @@ export function registerCursorSkillTool(pi: CursorSkillToolExtensionApi): void {
 		async execute(_toolCallId, params) {
 			const requestedName = (params as CursorActivateSkillParams).name?.trim();
 			if (!requestedName) {
-				return {
-					content: [{ type: "text" as const, text: "No skill name was provided." }],
-					details: buildActivationDetails(undefined),
-					isError: true,
-				};
+				throw new Error("No skill name was provided.");
 			}
 			const skill = currentSkillsByName.get(requestedName);
 			if (!skill) {
-				return {
-					content: [{ type: "text" as const, text: `Skill not available: ${requestedName}. Available skills: ${getAvailableSkillNames().join(", ") || "none"}.` }],
-					details: buildActivationDetails(undefined),
-					isError: true,
-				};
+				throw new Error(
+					`Skill not available: ${requestedName}. Available skills: ${getAvailableSkillNames().join(", ") || "none"}.`,
+				);
 			}
 
 			try {
@@ -222,16 +217,9 @@ export function registerCursorSkillTool(pi: CursorSkillToolExtensionApi): void {
 					details: buildActivationDetails(skill, resources),
 				};
 			} catch (error) {
-				return {
-					content: [
-						{
-							type: "text" as const,
-							text: `Failed to load skill ${requestedName} from ${skill.filePath}: ${error instanceof Error ? error.message : String(error)}`,
-						},
-					],
-					details: buildActivationDetails(skill),
-					isError: true,
-				};
+				throw new Error(
+					`Failed to load skill ${requestedName} from ${skill.filePath}: ${error instanceof Error ? error.message : String(error)}`,
+				);
 			}
 		},
 	});

package/src/cursor-state.ts

@@ -255,7 +255,7 @@ function persistCursorModePreference(pi: Pick<ExtensionAPI, "appendEntry">, mode
 	}
 }
 
-function restoreCliCursorMode(raw: boolean | string | undefined, hasUI: boolean, notify: ExtensionContext["ui"]["notify"]): void {
+function restoreCliCursorMode(raw: boolean | string | undefined, mode: ExtensionContext["mode"], notify: ExtensionContext["ui"]["notify"]): void {
 	cliCursorModeState = { kind: "unset" };
 	if (raw === undefined || raw === "" || raw === false) return;
 	const parsed = parseCursorAgentMode(raw);
@@ -266,7 +266,7 @@ function restoreCliCursorMode(raw: boolean | string | undefined, hasUI: boolean,
 	const rawText = String(raw);
 	const message = formatInvalidCursorMode(rawText);
 	cliCursorModeState = { kind: "invalid", raw: rawText, message };
-	if (hasUI) {
+	if (mode === "tui") {
 		notify(message, "error");
 		return;
 	}
@@ -435,7 +435,7 @@ export function registerCursorRuntimeControls(pi: CursorRuntimeControlsExtension
 		cliForceNoFast = pi.getFlag("cursor-no-fast") === true;
 		restoreSessionFastPreferences(ctx);
 		restoreSessionCursorMode(ctx);
-		restoreCliCursorMode(pi.getFlag("cursor-mode"), ctx.hasUI, ctx.ui.notify.bind(ctx.ui));
+		restoreCliCursorMode(pi.getFlag("cursor-mode"), ctx.mode, ctx.ui.notify.bind(ctx.ui));
 		updateCursorStatus(ctx);
 	});