@emmaneugene/pi-cursor-sdk 0.3.7 → 0.4.1

package/src/cursor-agents-context.ts

@@ -11,7 +11,6 @@ import {
 	resolveCursorSettingSources,
 } from "./cursor-setting-sources.js";
 import type { SettingSource } from "@cursor/sdk";
-import type { CursorRuntime } from "./cursor-config.js";
 export const CURSOR_PRESERVE_PI_AGENTS_MD_ENV = "PI_CURSOR_PRESERVE_PI_AGENTS_MD";
 
 /** Opening tag prefix pi `buildSystemPrompt()` uses for each context file (path attribute only). */
@@ -152,9 +151,8 @@ export function resolveCursorFacingSystemPrompt(
 	systemPromptOptions?: BuildSystemPromptOptions,
 	settingSourcesRaw?: string,
 	agentDir?: string,
-	runtime: CursorRuntime = "local",
 ): string {
-	if (runtime === "cloud" || !systemPromptOptions) return systemPrompt;
+	if (!systemPromptOptions) return systemPrompt;
 	const contextFiles = systemPromptOptions.contextFiles ?? [];
 	const settingSources =
 		settingSourcesRaw === undefined

package/src/cursor-config.ts

@@ -18,19 +18,6 @@ import { asRecord } from "./cursor-record-utils.js";
 
 export const CURSOR_SDK_CONFIG_FILE = "cursor-sdk.json";
 
-export const CURSOR_RUNTIME_ENV = "PI_CURSOR_RUNTIME";
-export const CURSOR_CLOUD_REPO_ENV = "PI_CURSOR_CLOUD_REPO";
-export const CURSOR_CLOUD_BRANCH_ENV = "PI_CURSOR_CLOUD_BRANCH";
-export const CURSOR_CLOUD_CONTEXT_ENV = "PI_CURSOR_CLOUD_CONTEXT";
-export const CURSOR_CLOUD_DIRECT_PUSH_ENV = "PI_CURSOR_CLOUD_DIRECT_PUSH";
-export const CURSOR_CLOUD_AUTO_CREATE_PR_ENV = "PI_CURSOR_CLOUD_AUTO_CREATE_PR";
-export const CURSOR_CLOUD_SKIP_REVIEWER_REQUEST_ENV = "PI_CURSOR_CLOUD_SKIP_REVIEWER_REQUEST";
-export const CURSOR_CLOUD_ALLOW_LOCAL_STATE_ENV = "PI_CURSOR_CLOUD_ALLOW_LOCAL_STATE";
-export const CURSOR_CLOUD_ENV_ENV = "PI_CURSOR_CLOUD_ENV";
-export const CURSOR_CLOUD_ENV_FROM_FILES_ENV = "PI_CURSOR_CLOUD_ENV_FROM_FILES";
-export const CURSOR_CLOUD_ENV_TYPE_ENV = "PI_CURSOR_CLOUD_ENV_TYPE";
-export const CURSOR_CLOUD_ENV_NAME_ENV = "PI_CURSOR_CLOUD_ENV_NAME";
-export const CURSOR_CLOUD_ACK_ENV = "PI_CURSOR_CLOUD_ACK";
 export const CURSOR_AUTO_REVIEW_ENV = "PI_CURSOR_AUTO_REVIEW";
 export const CURSOR_SANDBOX_ENV = "PI_CURSOR_SANDBOX";
 export const CURSOR_LOCAL_FORCE_ENV = "PI_CURSOR_LOCAL_FORCE";
@@ -39,31 +26,9 @@ export const CURSOR_HTTP1_ENV = "PI_CURSOR_HTTP_1_1";
 
 export type CursorConfigSource = "cli" | "environment" | "project" | "user" | "session" | "model-alias" | "builtin";
 export type CursorConfigTrustLevel = "one-shot" | "environment" | "trusted-project" | "user" | "session" | "model-catalog" | "builtin";
-export type CursorRuntime = "local" | "cloud";
-export type CursorCloudContextHandoff = "never" | "fresh" | "bootstrap";
-export type CursorCloudEnvironmentType = "cloud" | "pool" | "machine";
-
-export interface CursorCloudEnvironmentConfig {
-	type?: CursorCloudEnvironmentType | string;
-	name?: string;
-}
 
 export interface CursorSdkConfig {
 	fastDefaults?: Record<string, boolean>;
-	runtime?: CursorRuntime;
-	cloud?: {
-		repo?: string;
-		branch?: string;
-		contextHandoff?: CursorCloudContextHandoff;
-		directPush?: boolean;
-		autoCreatePR?: boolean;
-		skipReviewerRequest?: boolean;
-		allowLocalState?: boolean;
-		envNames?: string[];
-		envFromFiles?: boolean;
-		environment?: CursorCloudEnvironmentConfig;
-		acknowledged?: boolean;
-	};
 	local?: {
 		autoReview?: boolean;
 		sandbox?: boolean;
@@ -80,37 +45,13 @@ export interface CursorSdkConfig {
 	};
 }
 
-export interface CursorSafetyCap<T> {
-	source: CursorConfigSource;
-	trustLevel: CursorConfigTrustLevel;
-	value: T;
-	cappedSource: CursorConfigSource;
-	cappedValue: T;
-	reason: "safer-source";
-}
-
 export interface CursorResolvedSetting<T> {
 	value: T;
 	source: CursorConfigSource;
 	trustLevel: CursorConfigTrustLevel;
-	cappedBy?: CursorSafetyCap<T>;
 }
 
 export interface CursorResolvedSdkConfig {
-	runtime: CursorResolvedSetting<CursorRuntime>;
-	cloud: {
-		repo: CursorResolvedSetting<string | undefined>;
-		branch: CursorResolvedSetting<string | undefined>;
-		contextHandoff: CursorResolvedSetting<CursorCloudContextHandoff>;
-		directPush: CursorResolvedSetting<boolean>;
-		autoCreatePR: CursorResolvedSetting<boolean>;
-		skipReviewerRequest: CursorResolvedSetting<boolean>;
-		allowLocalState: CursorResolvedSetting<boolean>;
-		envNames: CursorResolvedSetting<string[]>;
-		envFromFiles: CursorResolvedSetting<boolean>;
-		environment: CursorResolvedSetting<CursorCloudEnvironmentConfig | undefined>;
-		acknowledged: CursorResolvedSetting<boolean>;
-	};
 	local: {
 		autoReview: CursorResolvedSetting<boolean>;
 		sandboxEnabled: CursorResolvedSetting<boolean>;
@@ -123,9 +64,9 @@ export interface CursorResolvedSdkConfig {
 	};
 }
 
-// Widens string-literal-union fields (e.g. runtime, contextHandoff) to raw `string` so CLI callers can
-// pass unvalidated input through to validateExplicitValue, while keeping every other field's shape linked
-// to CursorSdkConfig so new fields don't need a manually maintained parallel type.
+// Widens string-literal-union fields to raw `string` so CLI callers can pass unvalidated input through to
+// validateExplicitValue, while keeping every other field's shape linked to CursorSdkConfig so new fields
+// don't need a manually maintained parallel type.
 type WidenLiterals<T> = T extends string
 	? string
 	: T extends readonly (infer U)[]
@@ -142,7 +83,6 @@ export interface ResolveCursorSdkConfigOptions {
 	session?: CursorSdkConfig;
 	project?: CursorSdkConfig;
 	user?: CursorSdkConfig;
-	builtIn?: CursorSdkConfig;
 }
 
 export interface LoadCursorSdkConfigOptions {
@@ -161,33 +101,6 @@ const TRUST_LEVELS: Record<CursorConfigSource, CursorConfigTrustLevel> = {
 	builtin: "builtin",
 };
 
-const BUILT_IN_CURSOR_CONFIG: Required<Pick<CursorSdkConfig, "runtime">> & {
-	cloud: Required<NonNullable<CursorSdkConfig["cloud"]>>;
-} = {
-	runtime: "local",
-	cloud: {
-		repo: "",
-		branch: "",
-		contextHandoff: "fresh",
-		directPush: false,
-		autoCreatePR: false,
-		skipReviewerRequest: false,
-		allowLocalState: false,
-		envNames: [],
-		envFromFiles: false,
-		environment: {},
-		acknowledged: false,
-	},
-};
-
-export function isCursorRuntime(value: unknown): value is CursorRuntime {
-	return value === "local" || value === "cloud";
-}
-
-export function isCursorCloudContextHandoff(value: unknown): value is CursorCloudContextHandoff {
-	return value === "never" || value === "fresh" || value === "bootstrap";
-}
-
 function validateExplicitValue<T extends string>(
 	raw: string | undefined,
 	name: string,
@@ -200,62 +113,23 @@ function validateExplicitValue<T extends string>(
 	return value;
 }
 
-export function isCursorCloudEnvironmentType(value: unknown): value is CursorCloudEnvironmentType {
-	return value === "cloud" || value === "pool" || value === "machine";
-}
-
 function parseNonEmptyString(value: unknown): string | undefined {
 	if (typeof value !== "string") return undefined;
 	const trimmed = value.trim();
 	return trimmed ? trimmed : undefined;
 }
 
-function isAllowedEnvName(value: unknown): value is string {
-	return typeof value === "string" && /^[A-Za-z_][A-Za-z0-9_]*$/.test(value) && !value.startsWith("CURSOR_");
-}
-
 function parseToolNames(value: unknown): string[] | undefined {
 	if (!Array.isArray(value)) return undefined;
 	const parsed = [...new Set(value.map((name) => (typeof name === "string" ? name.trim() : "")).filter((name) => name.length > 0))];
 	return parsed.length > 0 ? parsed : undefined;
 }
-function parseEnvNames(value: unknown): string[] | undefined {
-	const names = Array.isArray(value)
-		? value
-		: typeof value === "string"
-			? value.split(",")
-			: undefined;
-	if (!names) return undefined;
-	const parsed = [...new Set(names.map((name) => (typeof name === "string" ? name.trim() : "")).filter(isAllowedEnvName))];
-	return parsed.length > 0 || (Array.isArray(value) && value.length === 0) ? parsed : undefined;
-}
-
-export function parseExplicitCursorCloudEnvNames(value: string | undefined, name: string): string[] | undefined {
-	const request = parseNonEmptyString(value);
-	if (!request) return undefined;
-	const parsed = parseEnvNames(request);
-	if (!parsed?.length) throw new Error(`Invalid ${name}: no valid environment variable names were requested.`);
-	return parsed;
-}
-
-function parseCloudEnvironment(value: unknown): CursorCloudEnvironmentConfig | undefined {
-	const environment = asRecord(value);
-	if (!environment) return undefined;
-	const parsed: CursorCloudEnvironmentConfig = {};
-	const rawType = parseNonEmptyString(environment.type);
-	const name = parseNonEmptyString(environment.name);
-	if (rawType) parsed.type = rawType;
-	if (name) parsed.name = name;
-	return Object.keys(parsed).length > 0 ? parsed : undefined;
-}
 
 export function parseCursorSdkConfig(value: unknown): CursorSdkConfig | undefined {
 	const record = asRecord(value);
 	if (!record) return undefined;
 	const config: CursorSdkConfig = {};
 
-	if (isCursorRuntime(record.runtime)) config.runtime = record.runtime;
-
 	const fastDefaults = asRecord(record.fastDefaults);
 	if (fastDefaults) {
 		config.fastDefaults = Object.fromEntries(
@@ -263,27 +137,6 @@ export function parseCursorSdkConfig(value: unknown): CursorSdkConfig | undefine
 		);
 	}
 
-	const cloud = asRecord(record.cloud);
-	if (cloud) {
-		const parsedCloud: NonNullable<CursorSdkConfig["cloud"]> = {};
-		const repo = parseNonEmptyString(cloud.repo);
-		const branch = parseNonEmptyString(cloud.branch);
-		const envNames = parseEnvNames(cloud.envNames);
-		const environment = parseCloudEnvironment(cloud.environment);
-		if (repo) parsedCloud.repo = repo;
-		if (branch) parsedCloud.branch = branch;
-		if (isCursorCloudContextHandoff(cloud.contextHandoff)) parsedCloud.contextHandoff = cloud.contextHandoff;
-		if (typeof cloud.directPush === "boolean") parsedCloud.directPush = cloud.directPush;
-		if (typeof cloud.autoCreatePR === "boolean") parsedCloud.autoCreatePR = cloud.autoCreatePR;
-		if (typeof cloud.skipReviewerRequest === "boolean") parsedCloud.skipReviewerRequest = cloud.skipReviewerRequest;
-		if (typeof cloud.allowLocalState === "boolean") parsedCloud.allowLocalState = cloud.allowLocalState;
-		if (envNames) parsedCloud.envNames = envNames;
-		if (typeof cloud.envFromFiles === "boolean") parsedCloud.envFromFiles = cloud.envFromFiles;
-		if (environment) parsedCloud.environment = environment;
-		if (typeof cloud.acknowledged === "boolean") parsedCloud.acknowledged = cloud.acknowledged;
-		if (Object.keys(parsedCloud).length > 0) config.cloud = parsedCloud;
-	}
-
 	const local = asRecord(record.local);
 	if (local) {
 		const parsedLocal: NonNullable<CursorSdkConfig["local"]> = {};
@@ -453,15 +306,11 @@ export function mergeCursorSdkConfigForUpdate(
 	base: Record<string, unknown>,
 	patch: CursorSdkConfig,
 ): Record<string, unknown> {
-	const baseCloud = asRecord(base.cloud);
 	const baseLocal = asRecord(base.local);
 	const baseSandboxOptions = asRecord(baseLocal?.sandboxOptions);
 	return {
 		...base,
 		...patch,
-		...(baseCloud || patch.cloud
-			? { cloud: { ...baseCloud, ...patch.cloud } }
-			: {}),
 		...(baseLocal || patch.local
 			? {
 					local: {
@@ -490,8 +339,8 @@ export function withCursorFastDefaults<T extends object>(
 	};
 }
 
-function resolved<T>(source: CursorConfigSource, value: T, cappedBy?: CursorSafetyCap<T>): CursorResolvedSetting<T> {
-	return { value, source, trustLevel: TRUST_LEVELS[source], ...(cappedBy ? { cappedBy } : {}) };
+function resolved<T>(source: CursorConfigSource, value: T): CursorResolvedSetting<T> {
+	return { value, source, trustLevel: TRUST_LEVELS[source] };
 }
 
 function valueFrom<T>(source: CursorConfigSource, value: T | undefined): CursorResolvedSetting<T> | undefined {
@@ -504,50 +353,13 @@ function resolveOrdinary<T>(layers: Array<CursorResolvedSetting<T> | undefined>)
 	return match;
 }
 
-// One cap engine for every safety-capped field. `cap` receives the candidate cap layer's raw value and the
-// resolved base setting; it returns the value to use once capped, or undefined to mean "don't cap". CLI is
-// always uncapped (one-shot, explicit operator intent).
-function resolveWithCap<T>(
-	baseLayers: Array<CursorResolvedSetting<T> | undefined>,
-	capLayer: CursorResolvedSetting<T> | undefined,
-	cap: (candidate: T, base: CursorResolvedSetting<T>) => T | undefined,
-): CursorResolvedSetting<T> {
-	const cli = baseLayers[0];
-	if (cli) return cli;
-	const base = resolveOrdinary(baseLayers.slice(1));
-	if (!capLayer) return base;
-	const cappedValue = cap(capLayer.value, base);
-	if (cappedValue === undefined) return base;
-	return resolved(capLayer.source, cappedValue, {
-		source: capLayer.source,
-		trustLevel: capLayer.trustLevel,
-		value: cappedValue,
-		cappedSource: base.source,
-		cappedValue: base.value,
-		reason: "safer-source",
-	});
-}
-
-function scalarRiskCap<T>(risk: (value: T) => number): (candidate: T, base: CursorResolvedSetting<T>) => T | undefined {
-	return (candidate, base) => (risk(candidate) < risk(base.value) ? candidate : undefined);
-}
-
-function envNamesCap(candidate: string[], base: CursorResolvedSetting<string[]>): string[] | undefined {
-	if (base.source === "user") return undefined;
-	const allowed = new Set(candidate);
-	const filtered = base.value.filter((name) => allowed.has(name));
-	return filtered.length === base.value.length ? undefined : filtered;
-}
-
 // Field/layer resolver table: each field declares the ordered list of sources it participates in (its
-// precedence), plus its per-layer values. Sources omitted from a field's order (e.g. cloud fields skip
-// "project", local fields skip "session", force skips both) are the field-specific omissions the review
-// asked to keep explicit; test/cursor-config.test.ts asserts each one.
+// precedence), plus its per-layer values. Sources omitted from a field's order (e.g. local fields skip
+// "session", force skips project/user/session) are the field-specific omissions the review asked to keep
+// explicit; test/cursor-config.test.ts asserts each one.
 type CursorFieldSource = Exclude<CursorConfigSource, "model-alias">;
 type CursorFieldValues<T> = Partial<Record<CursorFieldSource, T>>;
 
-const RUNTIME_ORDER: CursorFieldSource[] = ["cli", "environment", "session", "project", "user", "builtin"];
-const CLOUD_ORDER: CursorFieldSource[] = ["cli", "environment", "session", "user", "builtin"];
 const LOCAL_ORDER: CursorFieldSource[] = ["cli", "environment", "project", "user", "builtin"];
 const LOCAL_FORCE_ORDER: CursorFieldSource[] = ["cli", "environment", "builtin"];
 const HTTP1_ORDER: CursorFieldSource[] = ["session", "environment", "user", "builtin"];
@@ -561,64 +373,8 @@ function resolveOrdinaryField<T>(order: CursorFieldSource[], values: CursorField
 	return resolveOrdinary(buildFieldLayers(order, values));
 }
 
-function resolveSafetyField<T>(order: CursorFieldSource[], values: CursorFieldValues<T>, risk: (value: T) => number): CursorResolvedSetting<T> {
-	return resolveWithCap(buildFieldLayers(order, values), valueFrom("user", values.user), scalarRiskCap(risk));
-}
-
-function resolveEnvNamesSafetyField(order: CursorFieldSource[], values: CursorFieldValues<string[]>): CursorResolvedSetting<string[]> {
-	return resolveWithCap(buildFieldLayers(order, values), valueFrom("user", values.user), envNamesCap);
-}
-
 export function cursorSdkConfigFromEnv(env: Record<string, string | undefined> = process.env): CursorSdkConfig {
 	const config: CursorSdkConfig = {};
-	const runtime = validateExplicitValue(env[CURSOR_RUNTIME_ENV], CURSOR_RUNTIME_ENV, isCursorRuntime, '"local" or "cloud"');
-	if (runtime) config.runtime = runtime;
-	const repo = parseNonEmptyString(env[CURSOR_CLOUD_REPO_ENV]);
-	const branch = parseNonEmptyString(env[CURSOR_CLOUD_BRANCH_ENV]);
-	const contextHandoff = validateExplicitValue(
-		env[CURSOR_CLOUD_CONTEXT_ENV],
-		CURSOR_CLOUD_CONTEXT_ENV,
-		isCursorCloudContextHandoff,
-		'"never", "fresh", or "bootstrap"',
-	);
-	const directPush = parseOptionalEnvBoolean(env[CURSOR_CLOUD_DIRECT_PUSH_ENV]);
-	const autoCreatePR = parseOptionalEnvBoolean(env[CURSOR_CLOUD_AUTO_CREATE_PR_ENV]);
-	const skipReviewerRequest = parseOptionalEnvBoolean(env[CURSOR_CLOUD_SKIP_REVIEWER_REQUEST_ENV]);
-	const allowLocalState = parseOptionalEnvBoolean(env[CURSOR_CLOUD_ALLOW_LOCAL_STATE_ENV]);
-	const envNames = parseExplicitCursorCloudEnvNames(env[CURSOR_CLOUD_ENV_ENV], CURSOR_CLOUD_ENV_ENV);
-	const envFromFiles = parseOptionalEnvBoolean(env[CURSOR_CLOUD_ENV_FROM_FILES_ENV]);
-	const environment = parseCloudEnvironment({
-		type: env[CURSOR_CLOUD_ENV_TYPE_ENV],
-		name: env[CURSOR_CLOUD_ENV_NAME_ENV],
-	});
-	const acknowledged = parseOptionalEnvBoolean(env[CURSOR_CLOUD_ACK_ENV]);
-	if (
-		repo !== undefined ||
-		branch !== undefined ||
-		isCursorCloudContextHandoff(contextHandoff) ||
-		directPush !== undefined ||
-		autoCreatePR !== undefined ||
-		skipReviewerRequest !== undefined ||
-		allowLocalState !== undefined ||
-		envNames !== undefined ||
-		envFromFiles !== undefined ||
-		environment !== undefined ||
-		acknowledged !== undefined
-	) {
-		config.cloud = {
-			...(repo !== undefined ? { repo } : {}),
-			...(branch !== undefined ? { branch } : {}),
-			...(isCursorCloudContextHandoff(contextHandoff) ? { contextHandoff } : {}),
-			...(directPush !== undefined ? { directPush } : {}),
-			...(autoCreatePR !== undefined ? { autoCreatePR } : {}),
-			...(skipReviewerRequest !== undefined ? { skipReviewerRequest } : {}),
-			...(allowLocalState !== undefined ? { allowLocalState } : {}),
-			...(envNames !== undefined ? { envNames } : {}),
-			...(envFromFiles !== undefined ? { envFromFiles } : {}),
-			...(environment !== undefined ? { environment } : {}),
-			...(acknowledged !== undefined ? { acknowledged } : {}),
-		};
-	}
 	const autoReview = parseOptionalEnvBoolean(env[CURSOR_AUTO_REVIEW_ENV]);
 	const sandbox = parseOptionalEnvBoolean(env[CURSOR_SANDBOX_ENV]);
 	const force = parseOptionalEnvBoolean(env[CURSOR_LOCAL_FORCE_ENV]);
@@ -637,139 +393,12 @@ export function cursorSdkConfigFromEnv(env: Record<string, string | undefined> =
 }
 
 export function resolveCursorSdkConfig(options: ResolveCursorSdkConfigOptions = {}): CursorResolvedSdkConfig {
-	const cliRuntime = validateExplicitValue(options.cli?.runtime, "--cursor-runtime", isCursorRuntime, '"local" or "cloud"');
-	const cliContextHandoff = validateExplicitValue(
-		options.cli?.cloud?.contextHandoff,
-		"--cursor-cloud-context",
-		isCursorCloudContextHandoff,
-		'"never", "fresh", or "bootstrap"',
-	);
 	const env = cursorSdkConfigFromEnv(options.env);
-	const builtIn = {
-		...BUILT_IN_CURSOR_CONFIG,
-		...options.builtIn,
-		cloud: { ...BUILT_IN_CURSOR_CONFIG.cloud, ...options.builtIn?.cloud },
-	};
 	const cli = options.cli;
 	const session = options.session;
 	const project = options.project;
 	const user = options.user;
 	return {
-		runtime: resolveSafetyField(
-			RUNTIME_ORDER,
-			{
-				cli: cliRuntime,
-				environment: env.runtime,
-				session: session?.runtime,
-				project: project?.runtime,
-				user: user?.runtime,
-				builtin: builtIn.runtime,
-			},
-			(value) => (value === "cloud" ? 1 : 0),
-		),
-		cloud: {
-			repo: resolveOrdinaryField(CLOUD_ORDER, {
-				cli: cli?.cloud?.repo,
-				environment: env.cloud?.repo,
-				session: session?.cloud?.repo,
-				user: user?.cloud?.repo,
-				builtin: undefined,
-			}),
-			branch: resolveOrdinaryField(CLOUD_ORDER, {
-				cli: cli?.cloud?.branch,
-				environment: env.cloud?.branch,
-				session: session?.cloud?.branch,
-				user: user?.cloud?.branch,
-				builtin: undefined,
-			}),
-			contextHandoff: resolveSafetyField(
-				CLOUD_ORDER,
-				{
-					cli: cliContextHandoff,
-					environment: env.cloud?.contextHandoff,
-					session: session?.cloud?.contextHandoff,
-					user: user?.cloud?.contextHandoff,
-					builtin: builtIn.cloud.contextHandoff,
-				},
-				(value) => ({ never: 0, fresh: 1, bootstrap: 2 })[value],
-			),
-			directPush: resolveSafetyField(
-				CLOUD_ORDER,
-				{
-					cli: cli?.cloud?.directPush,
-					environment: env.cloud?.directPush,
-					session: session?.cloud?.directPush,
-					user: user?.cloud?.directPush,
-					builtin: builtIn.cloud.directPush,
-				},
-				(value) => (value ? 1 : 0),
-			),
-			autoCreatePR: resolveSafetyField(
-				CLOUD_ORDER,
-				{
-					cli: cli?.cloud?.autoCreatePR,
-					environment: env.cloud?.autoCreatePR,
-					session: session?.cloud?.autoCreatePR,
-					user: user?.cloud?.autoCreatePR,
-					builtin: builtIn.cloud.autoCreatePR,
-				},
-				(value) => (value ? 1 : 0),
-			),
-			skipReviewerRequest: resolveSafetyField(
-				CLOUD_ORDER,
-				{
-					cli: cli?.cloud?.skipReviewerRequest,
-					environment: env.cloud?.skipReviewerRequest,
-					session: session?.cloud?.skipReviewerRequest,
-					user: user?.cloud?.skipReviewerRequest,
-					builtin: builtIn.cloud.skipReviewerRequest,
-				},
-				(value) => (value ? 1 : 0),
-			),
-			allowLocalState: resolveSafetyField(
-				CLOUD_ORDER,
-				{
-					cli: cli?.cloud?.allowLocalState,
-					environment: env.cloud?.allowLocalState,
-					session: session?.cloud?.allowLocalState,
-					user: user?.cloud?.allowLocalState,
-					builtin: builtIn.cloud.allowLocalState,
-				},
-				(value) => (value ? 1 : 0),
-			),
-			envNames: resolveEnvNamesSafetyField(CLOUD_ORDER, {
-				cli: cli?.cloud?.envNames,
-				environment: env.cloud?.envNames,
-				session: session?.cloud?.envNames,
-				user: user?.cloud?.envNames,
-				builtin: builtIn.cloud.envNames,
-			}),
-			envFromFiles: resolveSafetyField(
-				CLOUD_ORDER,
-				{
-					cli: cli?.cloud?.envFromFiles,
-					environment: env.cloud?.envFromFiles,
-					session: session?.cloud?.envFromFiles,
-					user: user?.cloud?.envFromFiles,
-					builtin: builtIn.cloud.envFromFiles,
-				},
-				(value) => (value ? 1 : 0),
-			),
-			environment: resolveOrdinaryField(CLOUD_ORDER, {
-				cli: cli?.cloud?.environment,
-				environment: env.cloud?.environment,
-				session: session?.cloud?.environment,
-				user: user?.cloud?.environment,
-				builtin: undefined,
-			}),
-			acknowledged: resolveOrdinaryField(CLOUD_ORDER, {
-				cli: cli?.cloud?.acknowledged,
-				environment: env.cloud?.acknowledged,
-				session: session?.cloud?.acknowledged,
-				user: user?.cloud?.acknowledged,
-				builtin: builtIn.cloud.acknowledged,
-			}),
-		},
 		local: {
 			autoReview: resolveOrdinaryField(LOCAL_ORDER, {
 				cli: cli?.local?.autoReview,

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

@@ -89,6 +89,11 @@ Get-CimInstance Win32_Process -Filter "Name = 'bash.exe' OR Name = 'sh.exe'" |
 }
 
 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);