diff --git a/packages/coding-agent/docs/providers.md b/packages/coding-agent/docs/providers.md
index 0f64ceb5db..0f45624073 100644
--- a/packages/coding-agent/docs/providers.md
+++ b/packages/coding-agent/docs/providers.md
@@ -188,7 +188,9 @@ curl https://cursor.com/install -fsS | bash
 
 **Multi-account behavior.** Each account gets its own durable credential home under `<agent dir>/cursor-cli-oauth/accounts/<name>/home` (directory mode 0700, `.cursor/auth.json` mode 0600, file credential store), which also holds that account's CLI chat history and is never deleted between turns. One senpi session sticks to one account (rendezvous hashing), and a rate-limited or auth-failing account is blocked with a cooldown while the turn fails over to the next account before any visible output; once output has started, the error surfaces instead of replaying.
 
-**Model switching on resume.** Each turn resumes the same CLI chat id (`--resume`). Switching the model mid-session keeps that chat, and the first post-switch turn carries a short recap block built from senpi's own recent exchanges so the new model re-orients (`contextRecapOnModelSwitch`, default on). A CLI-side context overflow restarts a fresh chat with the same recap instead of wedging the session.
+**Model switching on resume.** Each turn resumes the same CLI chat id (`--resume`). Switching the model mid-session keeps that chat, and the first post-switch turn carries a short recap block built from senpi's own recent exchanges so the new model re-orients (`contextRecapOnModelSwitch` or `SENPI_CURSOR_CLI_OAUTH_RECAP`, default on). A CLI-side context overflow restarts a fresh chat with the same recap instead of wedging the session.
+
+**Provider switching.** Entering `cursor-cli-oauth` after another provider also prepends the bounded recent-exchange recap so Cursor receives the intervening Senpi context. This behavior is controlled independently by `contextRecapOnProviderSwitch` (or `SENPI_CURSOR_CLI_OAUTH_PROVIDER_RECAP`, default on). Setting `resumeMode: "off"` remains context-free between consecutive Cursor turns.
 
 **No-approval acknowledgement.** This lane is the one case where a senpi provider runs tools senpi cannot gate: with force execution, the Cursor CLI executes its own tools autonomously - there is no senpi approval, no senpi sandboxing, and no tool-level audit for what it runs. The first force execution therefore refuses with the exact acknowledgement step: `/cursor-account acknowledge` (or set `cursorCliOauthProvider.noApprovalAcknowledgedAt` to the current ISO-8601 timestamp in senpi settings, once). With force execution disabled instead, the lane still answers but the Cursor CLI auto-rejects every tool call (one warning per session).
 
diff --git a/packages/coding-agent/docs/settings.md b/packages/coding-agent/docs/settings.md
index e211f00dbd..019a42427d 100644
--- a/packages/coding-agent/docs/settings.md
+++ b/packages/coding-agent/docs/settings.md
@@ -325,6 +325,8 @@ When unset, senpi leaves provider payloads unchanged. This setting currently app
 |---------|------|---------|-------------|
 | `claudeSdkOauthProvider.enabled` | boolean | `false` | Enable the ambient (host-CLI-derived) lane of `claude-sdk-oauth`. Env override: `SENPI_CLAUDE_SDK_OAUTH_ENABLED`. Explicit senpi-side logins (stored OAuth accounts in `auth.json`, `CLAUDE_CODE_OAUTH_TOKEN` / `CLAUDE_CODE_OAUTH_TOKEN_<n>` env accounts) keep the provider available with this unset |
 | `cursorCliOauthProvider.enabled` | boolean | `false` | Enable the `cursor-cli-oauth` fallback lane and automatic native credential bootstrap. Env override: `SENPI_CURSOR_CLI_OAUTH_ENABLED` |
+| `cursorCliOauthProvider.contextRecapOnModelSwitch` | boolean | `true` | Prepend a bounded recent-context recap when a resumed Cursor chat changes models. Env override: `SENPI_CURSOR_CLI_OAUTH_RECAP` |
+| `cursorCliOauthProvider.contextRecapOnProviderSwitch` | boolean | `true` | Prepend a bounded recent-context recap when entering `cursor-cli-oauth` after another provider. Env override: `SENPI_CURSOR_CLI_OAUTH_PROVIDER_RECAP` |
 
 Both ambient-auth providers are explicit opt-in: a vendor CLI being logged in on the machine is not consent to spend that subscription. Before these gates existed, a logged-in Claude Code or `cursor-agent` CLI made the lane available with no senpi-side action, so subscription usage could flow through a provider you never configured. Env overrides follow the usual precedence (`env > project settings > global settings > default`). See [providers.md](providers.md) for the full lane documentation.
 
diff --git a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/AGENTS.md b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/AGENTS.md
index 8df7e795f4..8c8c15479f 100644
--- a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/AGENTS.md
+++ b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/AGENTS.md
@@ -9,7 +9,7 @@ Generated: 2026-08-17
 | File | Role |
 |---|---|
 | `index.ts` | Extension entry: registers the `cursor-cli-oauth` provider unconditionally with the offline model catalog (swapping in the probe-backed catalog when it resolves), wires `/cursor-account`, installs the default native-bootstrap credential reader, and delegates every turn to `streamSimple` with settings, accounts, and the executable re-resolved per turn |
-| `settings.ts` | `cursorCliOauthProvider` settings parsing: fixed defaults (`enabled: false`, `forceExecution: true`, `executionMode: "agent"`, `resumeMode: "auto"`, `contextRecapOnModelSwitch: true`, `modelCatalogTtlHours: 24`), `SENPI_CURSOR_CLI_OAUTH_*` env overrides winning over disk, invalid values silently ignored; exports the sandbox-allowlist validator factory |
+| `settings.ts` | `cursorCliOauthProvider` settings parsing: fixed defaults (`enabled: false`, `forceExecution: true`, `executionMode: "agent"`, `resumeMode: "auto"`, `contextRecapOnModelSwitch: true`, `contextRecapOnProviderSwitch: true`, `modelCatalogTtlHours: 24`), `SENPI_CURSOR_CLI_OAUTH_*` env overrides winning over disk, invalid values silently ignored; exports the sandbox-allowlist validator factory |
 | `accounts.ts` | Multi-account slot model: `CursorCliAccountSlot` and the credential shape with sentinel top-level fields, `addAccount`/`removeAccount`/`pinAccount`/`listAccounts`, name validation `^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$`, `assertSentinelInvariant`, `refreshSlot` through `store.modify` |
 | `native-bootstrap.ts` | Default credential reader: when enabled, the executable resolves, and managed accounts are empty, copies the native Senpi `cursor` OAuth credential into one canonical `native` slot; re-checks the target under the auth lock, deduplicates concurrent reads, never overwrites incompatible/existing credentials, and degrades non-throwingly |
 | `affinity.ts` | HRW (rendezvous) account selection keyed by senpi session id (sha256 `BigUInt64BE` score), pinned account wins unless blocked, expired `rate_limit` blocks cleared while `auth_error` blocks persist, `AllCursorAccountsBlockedError` carrying the soonest unblock time |
@@ -20,7 +20,7 @@ Generated: 2026-08-17
 | `transport.ts` | Spawns the resolved executable detached in its own process group with an explicit env allowlist (`HOME` = the account home, `AGENT_CLI_CREDENTIAL_STORE=file`, `PATH`/`TERM`/`LANG`/`LC_ALL`/`FORCE_COLOR`); rejects prompts over 130 KB pre-spawn; abort sends SIGTERM to the group then SIGKILL after 5 s; exposes the pid, parsed events, bounded stderr, and a settled outcome |
 | `home-store.ts` | Durable per-account HOMEs under `<agentDir>/cursor-cli-oauth/accounts/<slot>/home`: rewrites `.cursor/auth.json` (`accessToken`/`refreshToken`/`apiKey: null`/`bedrockCredentials: null`) at mode 0600 inside 0700 directories immediately before each run, reads back rotated refresh tokens after; logs byte lengths only; traversal-checked paths; never deletes a HOME |
 | `oauth-login.ts` | Provider OAuth config (`check`/`login`/`refreshToken`/`getApiKey`) reusing the `packages/ai` Cursor PKCE flow, first slot named `default`; one `configuredFor` predicate backs both `check` and turn-time lane resolution (`file-store` only, no ambient branch exists); local desktop/keychain import remains explicit, while `importNativeCursorCredential` is shared by explicit and automatic Senpi-native credential copies |
-| `session-router.ts` | Sticky chat routing: per-senpi-session `{accountName, chatId, lastModel}` captured from `system/init`; same- or different-model turns resume via `--resume`, a model switch prepends a one-turn 8 KB context recap, and resume failure or `context_overflow` restarts a fresh chat with the recap plus a notice; prompt and recap are shrunk to the transport ceiling before spawning |
+| `session-router.ts` | Sticky chat routing: per-senpi-session `{accountName, chatId, lastModel}` captured from `system/init`; same- or different-model turns resume via `--resume`, transitions from another provider and later Cursor model switches independently opt into a one-turn 8 KB context recap, and resume failure or `context_overflow` restarts a fresh chat with the recap plus a notice; prompt and recap are shrunk to the transport ceiling before spawning |
 | `failover.ts` | Account rotation around one attempt: `rate_limit` blocks the slot (server hint else 60 s, max 48 h), `auth_error` blocks until re-login; retries only before any visible assistant delta; a replacement account always starts a fresh chat with a user-visible notice and never inherits chat context |
 | `models.ts` | Model catalog: cached `cursor-agent models` probe (15 s deadline, full-stdout file capture, ANSI strip, `<id> - <label>` parsing, TTL cache at `<agentDir>/cursor-cli-oauth/models.json`) degrading to the exact 15-entry static fallback; zero cost, text-only input, 64 K max tokens |
 | `guardrails.ts` | Execution policy: `--force` only in agent mode with `noApprovalAcknowledgedAt` set (typed `CursorCliExecutionRefusalError` naming the acknowledgement step otherwise); plan mode never forces; force-disabled agent mode and unproven sandbox modes warn once per session; deny lists sanitized to exact full commands and written per-spawn as `permissions.deny` `Shell(...)` entries in the account HOME's `cli-config.json` |
diff --git a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/changes.md b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/changes.md
index ed2b5b755b..2c9d33ca1f 100644
--- a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/changes.md
+++ b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/changes.md
@@ -1,5 +1,25 @@
 # cursor-cli-oauth extension changes
 
+## 2026-09-01 - Preserve Senpi context on first Cursor CLI turn
+
+### What changed
+
+- `settings.ts`, `stream.ts`, and `session-router.ts`: the turn boundary now detects when the immediately preceding assistant response came from another provider and requests a bounded Senpi context recap, covering both first-time Cursor use and returns to an existing Cursor chat. Provider-switch recap has its own `contextRecapOnProviderSwitch` setting and `SENPI_CURSOR_CLI_OAUTH_PROVIDER_RECAP` environment override (default on), independent from the existing model-switch recap option, and its recap header identifies the provider transition instead of claiming the model changed. Provider transitions still receive a recap when resume mode is disabled; only consecutive Cursor turns remain context-free. The current user prompt is removed from recap composition so it is sent exactly once. Successful Cursor turns persist their account ownership in an assistant diagnostic, so a process restart can restore the ownership proof without persisting transcript text; legacy or missing ownership fails closed. Same-turn failover and cross-turn account reselection both suppress the recap, and replacement accounts are forced off any older sticky chat, preserving the cross-account context-isolation contract.
+- `session-router.test.ts`, `stream.test.ts`, and `settings.test.ts`: add regressions for first-time and returning provider switches, independent provider/model recap opt-outs (including resume-fallback and end-to-end provider opt-out), single-copy current prompts on resume fallback, transition-specific recap headers, process-restart ownership recovery, same-turn/cross-turn account isolation, and replacement accounts with stale bindings under auto resume.
+- `docs/providers.md` and `docs/settings.md`: document both recap controls and their independent environment overrides.
+
+### Why
+
+- The router previously built recaps only for model switches inside an already-bound Cursor chat. Switching from another provider either had no Cursor routing record or resumed an older Cursor chat, so the CLI received only the latest user message and missed the intervening Senpi conversation.
+
+### Why an extension could not handle it
+
+- This is the builtin extension's private prompt-composition boundary. External hooks cannot access its in-memory Cursor chat binding or alter the subprocess prompt after routing.
+
+### Expected merge conflict zones
+
+- LOW: `settings.ts` around recap toggles, `stream.ts` around turn-input/failover composition, and `session-router.ts` around recap planning, plus their focused test suites.
+
 ## 2026-08-24 - Keep provider tool protocol out of assistant text
 
 ### What changed
diff --git a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/session-router.ts b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/session-router.ts
index c0a94b2e12..4d9407293a 100644
--- a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/session-router.ts
+++ b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/session-router.ts
@@ -5,6 +5,7 @@ import { CursorCliAbortError, CursorCliPromptTooLargeError, MAX_CURSOR_CLI_PROMP
 export const CURSOR_CLI_CONTEXT_RECAP_MAX_BYTES = 8 * 1024;
 export const CURSOR_CLI_CONTEXT_RECAP_BEGIN = "===== senpi context recap =====";
 export const CURSOR_CLI_CONTEXT_RECAP_END = "===== end senpi context recap =====";
+export type CursorCliContextRecapReason = "model-switch" | "provider-switch" | "chat-restart";
 
 export type CursorCliSessionRecord = {
 	readonly accountName: string;
@@ -18,6 +19,11 @@ export type CursorCliRecapExchange = {
 	readonly text: string;
 };
 
+export type CursorCliContextOwnership =
+	| { readonly kind: "new" }
+	| { readonly kind: "known"; readonly accountName: string }
+	| { readonly kind: "unknown" };
+
 export type CursorCliSessionTurnContext = {
 	readonly senpiSessionId: string;
 	readonly accountName: string;
@@ -27,11 +33,20 @@ export type CursorCliSessionTurnInput = {
 	readonly prompt: string;
 	readonly model: string | undefined;
 	readonly recentExchanges?: readonly CursorCliRecapExchange[];
+	/** The immediately preceding assistant turn came from another provider. */
+	readonly contextRecapRequested?: boolean;
+	/** Durable account ownership recovered from prior Cursor assistant diagnostics. */
+	readonly contextOwnership?: CursorCliContextOwnership;
+	/** A replacement account must never receive transcript context from the failed account. */
+	readonly contextRecapSuppressed?: boolean;
+	/** Cross-account failover promises a fresh chat even when this account has an older binding. */
+	readonly forceFreshChat?: boolean;
 };
 
 export type CursorCliSessionPolicy = {
 	readonly resumeMode?: CursorCliOauthResumeMode;
 	readonly contextRecapOnModelSwitch?: boolean;
+	readonly contextRecapOnProviderSwitch?: boolean;
 	readonly maxRecapBytes?: number;
 	readonly promptCeilingBytes?: number;
 };
@@ -44,6 +59,7 @@ export type CursorCliTurnPlan = {
 	readonly contextRecap: string | undefined;
 	readonly modelSwitch: boolean;
 	readonly recapDroppedForCeiling: boolean;
+	readonly freshChatRecapAllowed: boolean;
 };
 
 export type CursorCliSessionAttempt = {
@@ -107,12 +123,17 @@ export function buildCursorCliContextRecap(
 	model: string | undefined,
 	exchanges: readonly CursorCliRecapExchange[] | undefined,
 	maxRecapBytes: number = CURSOR_CLI_CONTEXT_RECAP_MAX_BYTES,
+	reason: CursorCliContextRecapReason = model === undefined ? "chat-restart" : "model-switch",
 ): string | undefined {
 	const usable = (exchanges ?? []).filter((exchange) => exchange.text.length > 0);
 	if (usable.length === 0) return undefined;
-	const header = `${CURSOR_CLI_CONTEXT_RECAP_BEGIN}\n(${
-		model === undefined ? "chat restarted" : `model switched to '${model}'`
-	}; recent conversation from senpi's own records follows)`;
+	const transition =
+		reason === "provider-switch"
+			? `provider switched to cursor-cli-oauth${model === undefined ? "" : ` using '${model}'`}`
+			: reason === "chat-restart"
+				? "chat restarted"
+				: `model switched to '${model}'`;
+	const header = `${CURSOR_CLI_CONTEXT_RECAP_BEGIN}\n(${transition}; recent conversation from senpi's own records follows)`;
 	const overheadBytes = byteLength(header) + 1 + byteLength(CURSOR_CLI_CONTEXT_RECAP_END) + 1;
 	if (overheadBytes >= maxRecapBytes) return undefined;
 	const budget = maxRecapBytes - overheadBytes;
@@ -141,6 +162,12 @@ function composePrompt(recap: string | undefined, prompt: string): string {
 	return recap === undefined ? prompt : `${recap}\n\n${prompt}`;
 }
 
+function priorRecapExchanges(input: CursorCliSessionTurnInput): readonly CursorCliRecapExchange[] | undefined {
+	return input.recentExchanges?.at(-1)?.role === "user" && input.recentExchanges.at(-1)?.text === input.prompt
+		? input.recentExchanges.slice(0, -1)
+		: input.recentExchanges;
+}
+
 function shrinkToCeiling(
 	recap: string | undefined,
 	rawPrompt: string,
@@ -267,13 +294,32 @@ export class CursorCliSessionRouter {
 		const bound = this.records.get(context.senpiSessionId);
 		// Chats live inside each account's HOME, so a record bound to another
 		// account can never be resumed here.
-		const resumable = bound !== undefined && bound.accountName === context.accountName && resumeEnabled;
+		const resumable =
+			input.forceFreshChat !== true &&
+			bound !== undefined &&
+			bound.accountName === context.accountName &&
+			resumeEnabled;
 		const resumeChatId = resumable && bound !== undefined ? bound.chatId : undefined;
 		const modelSwitch = resumable && bound !== undefined && bound.lastModel !== input.model;
-		const recap =
-			modelSwitch && policy.contextRecapOnModelSwitch !== false
-				? buildCursorCliContextRecap(input.model, input.recentExchanges, policy.maxRecapBytes)
-				: undefined;
+		const ownership = input.contextOwnership ?? { kind: "new" };
+		const sameAccount =
+			bound !== undefined
+				? bound.accountName === context.accountName
+				: ownership.kind === "new" || (ownership.kind === "known" && ownership.accountName === context.accountName);
+		const providerSwitchRecap =
+			sameAccount && input.contextRecapRequested === true && policy.contextRecapOnProviderSwitch !== false;
+		const modelSwitchRecap = modelSwitch && policy.contextRecapOnModelSwitch !== false;
+		const needsRecap = input.contextRecapSuppressed !== true && (providerSwitchRecap || modelSwitchRecap);
+		const freshChatRecapAllowed =
+			input.contextRecapSuppressed !== true && (input.contextRecapRequested !== true || providerSwitchRecap);
+		const recap = needsRecap
+			? buildCursorCliContextRecap(
+					input.model,
+					priorRecapExchanges(input),
+					policy.maxRecapBytes,
+					providerSwitchRecap ? "provider-switch" : "model-switch",
+				)
+			: undefined;
 		const shrunk = shrinkToCeiling(recap, input.prompt, ceilingBytes);
 		return {
 			resumeChatId,
@@ -281,6 +327,7 @@ export class CursorCliSessionRouter {
 			contextRecap: shrunk.recapDropped ? undefined : recap,
 			modelSwitch,
 			recapDroppedForCeiling: shrunk.recapDropped,
+			freshChatRecapAllowed,
 		};
 	}
 
@@ -315,6 +362,7 @@ export class CursorCliSessionRouter {
 		const plan = this.planTurn(context, input, {
 			resumeMode: options.resumeMode,
 			contextRecapOnModelSwitch: options.contextRecapOnModelSwitch,
+			contextRecapOnProviderSwitch: options.contextRecapOnProviderSwitch,
 			maxRecapBytes: options.maxRecapBytes,
 			promptCeilingBytes: options.promptCeilingBytes,
 		});
@@ -348,7 +396,10 @@ export class CursorCliSessionRouter {
 				const reason: CursorCliSessionRestartReason =
 					classification.kind === "context_overflow" ? "context_overflow" : "resume_failed";
 				const recap =
-					plan.contextRecap ?? buildCursorCliContextRecap(undefined, input.recentExchanges, options.maxRecapBytes);
+					plan.contextRecap ??
+					(plan.freshChatRecapAllowed
+						? buildCursorCliContextRecap(undefined, priorRecapExchanges(input), options.maxRecapBytes)
+						: undefined);
 				const shrunk = shrinkToCeiling(recap, input.prompt, ceilingBytes);
 				yield restartNotice(previousChatId, reason, recap !== undefined && !shrunk.recapDropped);
 				attempt = { prompt: shrunk.prompt, resumeChatId: undefined };
diff --git a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/settings.ts b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/settings.ts
index 39a4fec1b5..2e812e9a7d 100644
--- a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/settings.ts
+++ b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/settings.ts
@@ -31,6 +31,7 @@ export interface CursorCliOauthProviderSettings {
 	readonly resumeMode: CursorCliOauthResumeMode;
 	readonly pinnedAccount: string | undefined;
 	readonly contextRecapOnModelSwitch: boolean;
+	readonly contextRecapOnProviderSwitch: boolean;
 	readonly modelCatalogTtlHours: number;
 	readonly sandboxMode: string | undefined;
 	/** Exact full commands the spawned CLI must refuse; globs are not supported. */
@@ -54,6 +55,7 @@ const DEFAULT_SETTINGS: CursorCliOauthProviderSettings = {
 	resumeMode: "auto",
 	pinnedAccount: undefined,
 	contextRecapOnModelSwitch: true,
+	contextRecapOnProviderSwitch: true,
 	modelCatalogTtlHours: 24,
 	sandboxMode: undefined,
 	denyCommands: [],
@@ -138,6 +140,7 @@ function parseProviderSettings(value: unknown): ParsedSettings {
 	const resumeMode = parseResumeMode(value.resumeMode);
 	const pinnedAccount = parseNonEmptyString(value.pinnedAccount);
 	const contextRecapOnModelSwitch = parseBoolean(value.contextRecapOnModelSwitch);
+	const contextRecapOnProviderSwitch = parseBoolean(value.contextRecapOnProviderSwitch);
 	const modelCatalogTtlHours = parsePositiveFiniteNumber(value.modelCatalogTtlHours);
 	const sandboxMode = parseNonEmptyString(value.sandboxMode);
 	const denyCommands = parseDenyCommands(value.denyCommands);
@@ -150,6 +153,7 @@ function parseProviderSettings(value: unknown): ParsedSettings {
 		...(resumeMode !== undefined ? { resumeMode } : {}),
 		...(pinnedAccount !== undefined ? { pinnedAccount } : {}),
 		...(contextRecapOnModelSwitch !== undefined ? { contextRecapOnModelSwitch } : {}),
+		...(contextRecapOnProviderSwitch !== undefined ? { contextRecapOnProviderSwitch } : {}),
 		...(modelCatalogTtlHours !== undefined ? { modelCatalogTtlHours } : {}),
 		...(sandboxMode !== undefined ? { sandboxMode } : {}),
 		...(denyCommands !== undefined ? { denyCommands } : {}),
@@ -166,6 +170,7 @@ function parseEnvironmentSettings(environment: Environment): ParsedSettings {
 	const resumeMode = parseResumeMode(environment.SENPI_CURSOR_CLI_OAUTH_RESUME);
 	const pinnedAccount = parseNonEmptyString(environment.SENPI_CURSOR_CLI_OAUTH_PINNED_ACCOUNT);
 	const contextRecapOnModelSwitch = parseEnvironmentBoolean(environment.SENPI_CURSOR_CLI_OAUTH_RECAP);
+	const contextRecapOnProviderSwitch = parseEnvironmentBoolean(environment.SENPI_CURSOR_CLI_OAUTH_PROVIDER_RECAP);
 	const modelCatalogTtlHours = parseEnvironmentPositiveFiniteNumber(
 		environment.SENPI_CURSOR_CLI_OAUTH_MODEL_CATALOG_TTL_HOURS,
 	);
@@ -179,6 +184,7 @@ function parseEnvironmentSettings(environment: Environment): ParsedSettings {
 		...(resumeMode !== undefined ? { resumeMode } : {}),
 		...(pinnedAccount !== undefined ? { pinnedAccount } : {}),
 		...(contextRecapOnModelSwitch !== undefined ? { contextRecapOnModelSwitch } : {}),
+		...(contextRecapOnProviderSwitch !== undefined ? { contextRecapOnProviderSwitch } : {}),
 		...(modelCatalogTtlHours !== undefined ? { modelCatalogTtlHours } : {}),
 		...(sandboxMode !== undefined ? { sandboxMode } : {}),
 		...(denyCommands !== undefined ? { denyCommands } : {}),
diff --git a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/stream.ts b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/stream.ts
index 482c7856a9..72d70999ac 100644
--- a/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/stream.ts
+++ b/packages/coding-agent/src/core/extensions/builtin/cursor-cli-oauth/stream.ts
@@ -37,6 +37,7 @@ import {
 	isCursorCliOauthLaneEnabled,
 } from "./oauth-login.ts";
 import {
+	type CursorCliContextOwnership,
 	type CursorCliRecapExchange,
 	type CursorCliSessionRestartNotice,
 	type CursorCliSessionRouter,
@@ -53,6 +54,7 @@ export { CURSOR_CLI_OAUTH_PROVIDER_ID } from "./oauth-login.ts";
 const DISABLED_MESSAGE = "disabled by settings";
 const NO_ACCOUNTS_MESSAGE = "no accounts: run /login cursor-cli-oauth";
 const RECENT_EXCHANGE_LIMIT = 12;
+const ACCOUNT_OWNERSHIP_DIAGNOSTIC = "cursor_cli_oauth_account_ownership";
 
 /** Injectable seams so tests stay hermetic; every default is re-resolved per turn. */
 export type CursorCliStreamDeps = {
@@ -355,6 +357,27 @@ function recapExchanges(context: Context): CursorCliRecapExchange[] {
 	return exchanges.slice(-RECENT_EXCHANGE_LIMIT);
 }
 
+function enteringFromAnotherProvider(context: Context): boolean {
+	for (let index = context.messages.length - 1; index >= 0; index -= 1) {
+		const message = context.messages[index];
+		if (message?.role === "assistant") return message.provider !== CURSOR_CLI_OAUTH_PROVIDER_ID;
+	}
+	return false;
+}
+
+function cursorContextOwnership(context: Context): CursorCliContextOwnership {
+	for (let index = context.messages.length - 1; index >= 0; index -= 1) {
+		const message = context.messages[index];
+		if (message?.role !== "assistant" || message.provider !== CURSOR_CLI_OAUTH_PROVIDER_ID) continue;
+		const diagnostic = message.diagnostics?.find((entry) => entry.type === ACCOUNT_OWNERSHIP_DIAGNOSTIC);
+		const accountName = diagnostic?.details?.accountName;
+		return typeof accountName === "string" && accountName.length > 0
+			? { kind: "known", accountName }
+			: { kind: "unknown" };
+	}
+	return { kind: "new" };
+}
+
 function isFailoverNotice(event: unknown): event is CursorCliFailoverNotice {
 	return (event as { type?: unknown }).type === "cursor_account_changed";
 }
@@ -409,6 +432,7 @@ export function streamCursorCliOauth(
 		const signal = options?.signal;
 		let wasAborted = signal?.aborted === true;
 		let sentPromptTokens = 0;
+		let activeAccountName: string | undefined;
 		let runningHandle: CursorCliTransportHandle | undefined;
 		let handleRunning = false;
 		const onAbort = (): void => {
@@ -465,6 +489,8 @@ export function streamCursorCliOauth(
 				prompt,
 				model: spawnModel,
 				recentExchanges: recapExchanges(context),
+				contextRecapRequested: enteringFromAnotherProvider(context),
+				contextOwnership: cursorContextOwnership(context),
 			};
 
 			const spawnAndStream = (
@@ -551,7 +577,7 @@ export function streamCursorCliOauth(
 					now: now(),
 				},
 				now: () => now(),
-				runAttempt: async (selected, _options: CursorCliAttemptOptions) => {
+				runAttempt: async (selected, attemptOptions: CursorCliAttemptOptions) => {
 					let slot = selected;
 					const current = await store.read(CURSOR_CLI_OAUTH_PROVIDER_ID);
 					if (current?.type === "oauth") {
@@ -594,6 +620,7 @@ export function streamCursorCliOauth(
 					}
 					// Cross-account chats live in each account's HOME, so a fresh-chat
 					// failover needs no flag here: the router resumes only its own account's chat.
+					activeAccountName = slot.name;
 					return router.runTurn(
 						{
 							senpiSessionId,
@@ -601,9 +628,15 @@ export function streamCursorCliOauth(
 							runAttempt: (attempt) => spawnAndStream(attempt, slot),
 							resumeMode: settings.resumeMode,
 							contextRecapOnModelSwitch: settings.contextRecapOnModelSwitch,
+							contextRecapOnProviderSwitch: settings.contextRecapOnProviderSwitch,
 							now: () => now(),
 						},
-						turnInput,
+						{
+							...turnInput,
+							contextRecapRequested: turnInput.contextRecapRequested && !attemptOptions.freshChat,
+							contextRecapSuppressed: attemptOptions.freshChat,
+							forceFreshChat: attemptOptions.freshChat,
+						},
 					);
 				},
 			});
@@ -654,6 +687,16 @@ export function streamCursorCliOauth(
 			}
 
 			closeOpen(mapper);
+			if (activeAccountName !== undefined) {
+				mapper.output.diagnostics = [
+					...(mapper.output.diagnostics ?? []),
+					{
+						type: ACCOUNT_OWNERSHIP_DIAGNOSTIC,
+						timestamp: now(),
+						details: { accountName: activeAccountName },
+					},
+				];
+			}
 			stream.push({ type: "done", reason: "stop", message: mapper.output });
 		} catch (error) {
 			closeOpen(mapper);
diff --git a/packages/coding-agent/test/cursor-cli-oauth/account-command.test.ts b/packages/coding-agent/test/cursor-cli-oauth/account-command.test.ts
index 27cba35558..aebe0d134d 100644
--- a/packages/coding-agent/test/cursor-cli-oauth/account-command.test.ts
+++ b/packages/coding-agent/test/cursor-cli-oauth/account-command.test.ts
@@ -59,6 +59,7 @@ function defaultSettings(overrides: Partial<CursorCliOauthProviderSettings> = {}
 		resumeMode: "auto",
 		pinnedAccount: undefined,
 		contextRecapOnModelSwitch: true,
+		contextRecapOnProviderSwitch: true,
 		modelCatalogTtlHours: 24,
 		sandboxMode: undefined,
 		...overrides,
diff --git a/packages/coding-agent/test/cursor-cli-oauth/context-ownership.test.ts b/packages/coding-agent/test/cursor-cli-oauth/context-ownership.test.ts
index dd7e5d90e7..0c6c6ce245 100644
--- a/packages/coding-agent/test/cursor-cli-oauth/context-ownership.test.ts
+++ b/packages/coding-agent/test/cursor-cli-oauth/context-ownership.test.ts
@@ -115,6 +115,7 @@ function enabledSettings(): CursorCliOauthProviderSettings {
 		resumeMode: "auto",
 		pinnedAccount: undefined,
 		contextRecapOnModelSwitch: true,
+		contextRecapOnProviderSwitch: true,
 		modelCatalogTtlHours: 24,
 		sandboxMode: undefined,
 	};
diff --git a/packages/coding-agent/test/cursor-cli-oauth/fallback-eligibility.test.ts b/packages/coding-agent/test/cursor-cli-oauth/fallback-eligibility.test.ts
index a40e2aa719..a10a2093c1 100644
--- a/packages/coding-agent/test/cursor-cli-oauth/fallback-eligibility.test.ts
+++ b/packages/coding-agent/test/cursor-cli-oauth/fallback-eligibility.test.ts
@@ -16,6 +16,7 @@ function settings(overrides: Partial<CursorCliOauthProviderSettings> = {}): Curs
 		resumeMode: "auto",
 		pinnedAccount: undefined,
 		contextRecapOnModelSwitch: true,
+		contextRecapOnProviderSwitch: true,
 		modelCatalogTtlHours: 24,
 		sandboxMode: undefined,
 		...overrides,
diff --git a/packages/coding-agent/test/cursor-cli-oauth/registration.test.ts b/packages/coding-agent/test/cursor-cli-oauth/registration.test.ts
index 46d48168bb..c7962c3dc1 100644
--- a/packages/coding-agent/test/cursor-cli-oauth/registration.test.ts
+++ b/packages/coding-agent/test/cursor-cli-oauth/registration.test.ts
@@ -58,6 +58,7 @@ function enabledSettings(): CursorCliOauthProviderSettings {
 		resumeMode: "auto",
 		pinnedAccount: undefined,
 		contextRecapOnModelSwitch: true,
+		contextRecapOnProviderSwitch: true,
 		modelCatalogTtlHours: 24,
 		sandboxMode: undefined,
 	};
diff --git a/packages/coding-agent/test/cursor-cli-oauth/session-router.test.ts b/packages/coding-agent/test/cursor-cli-oauth/session-router.test.ts
index 4e41fa2728..9d23e13203 100644
--- a/packages/coding-agent/test/cursor-cli-oauth/session-router.test.ts
+++ b/packages/coding-agent/test/cursor-cli-oauth/session-router.test.ts
@@ -98,6 +98,109 @@ describe("Cursor CLI OAuth session router", () => {
 		});
 	});
 
+	it("reinjects prior senpi context when switching into Cursor from another provider", async () => {
+		const router = makeRouter();
+		const prompt = "What was the codename?";
+		const recentExchanges: CursorCliRecapExchange[] = [
+			{ role: "user", text: "The codename is ORCHID." },
+			{ role: "assistant", text: "Understood." },
+			{ role: "user", text: prompt },
+		];
+		const { attempts, runAttempt } = scriptedRunner([[initEvent("chat-1", "model-a"), assistantEvent("ORCHID")]]);
+
+		await collect(
+			router.runTurn(
+				{ ...alphaContext, runAttempt, contextRecapOnModelSwitch: false },
+				{ prompt, model: "model-a", recentExchanges, contextRecapRequested: true },
+			),
+		);
+
+		const freshPrompt = attempts[0]?.prompt ?? "";
+		expect(attempts[0]?.resumeChatId).toBeUndefined();
+		expect(freshPrompt.startsWith(CURSOR_CLI_CONTEXT_RECAP_BEGIN)).toBe(true);
+		expect(freshPrompt).toContain("provider switched to cursor-cli-oauth");
+		expect(freshPrompt).toContain("The codename is ORCHID.");
+		expect(occurrences(freshPrompt, prompt)).toBe(1);
+		expect(freshPrompt.endsWith(prompt)).toBe(true);
+	});
+
+	it("honors the recap opt-out when switching into Cursor from another provider", async () => {
+		const router = makeRouter();
+		const { attempts, runAttempt } = scriptedRunner([[initEvent("chat-1", "model-a"), assistantEvent("answer")]]);
+
+		await collect(
+			router.runTurn(
+				{ ...alphaContext, runAttempt, contextRecapOnProviderSwitch: false },
+				{
+					prompt: "current question",
+					model: "model-a",
+					contextRecapRequested: true,
+					recentExchanges: [
+						{ role: "user", text: "private earlier context" },
+						{ role: "user", text: "current question" },
+					],
+				},
+			),
+		);
+
+		expect(attempts).toEqual([{ prompt: "current question", resumeChatId: undefined }]);
+	});
+
+	it("keeps the provider recap opt-out after a resumed chat falls back", async () => {
+		const router = makeRouter();
+		await primeChat(router, "chat-1", "model-a");
+		const { attempts, runAttempt } = scriptedRunner([
+			{ failure: { stderr: "Error: session chat-1 not found" } },
+			[initEvent("chat-2", "model-a"), assistantEvent("answer")],
+		]);
+
+		const events = await collect(
+			router.runTurn(
+				{ ...alphaContext, runAttempt, contextRecapOnProviderSwitch: false },
+				{
+					prompt: "current question",
+					model: "model-a",
+					contextRecapRequested: true,
+					recentExchanges: [
+						{ role: "assistant", text: "PRIVATE-OTHER-PROVIDER-CONTEXT" },
+						{ role: "user", text: "current question" },
+					],
+				},
+			),
+		);
+
+		expect(attempts).toEqual([
+			{ prompt: "current question", resumeChatId: "chat-1" },
+			{ prompt: "current question", resumeChatId: undefined },
+		]);
+		expect(restartNotice(events)?.message).not.toContain("re-injected");
+	});
+
+	it("reinjects intervening context when returning to an existing Cursor chat", async () => {
+		const router = makeRouter();
+		await primeChat(router, "chat-1", "model-a");
+		const { attempts, runAttempt } = scriptedRunner([[initEvent("chat-1", "model-a"), assistantEvent("ORCHID")]]);
+
+		await collect(
+			router.runTurn(
+				{ ...alphaContext, runAttempt },
+				{
+					prompt: "What changed?",
+					model: "model-a",
+					contextRecapRequested: true,
+					recentExchanges: [
+						{ role: "assistant", text: "The other provider established ORCHID." },
+						{ role: "user", text: "What changed?" },
+					],
+				},
+			),
+		);
+
+		expect(attempts[0]?.resumeChatId).toBe("chat-1");
+		expect(attempts[0]?.prompt).toContain("The other provider established ORCHID.");
+		expect(occurrences(attempts[0]?.prompt ?? "", "What changed?")).toBe(1);
+	});
+
 	it("resumes the recorded chat on same-model turns without a recap", async () => {
 		const router = makeRouter();
 		await primeChat(router, "chat-1", "model-a");
@@ -122,7 +225,7 @@ describe("Cursor CLI OAuth session router", () => {
 		const switchTurn = scriptedRunner([[initEvent("chat-1", "model-b"), assistantEvent("switched")]]);
 		await collect(
 			router.runTurn(
-				{ ...alphaContext, runAttempt: switchTurn.runAttempt },
+				{ ...alphaContext, runAttempt: switchTurn.runAttempt, contextRecapOnProviderSwitch: false },
 				{ prompt: "switch turn", model: "model-b", recentExchanges: recent },
 			),
 		);
@@ -177,6 +280,7 @@ describe("Cursor CLI OAuth session router", () => {
 		expect(attempts[1]?.resumeChatId).toBeUndefined();
 		expect(attempts[1]?.prompt.startsWith(CURSOR_CLI_CONTEXT_RECAP_BEGIN)).toBe(true);
 		expect(attempts[1]?.prompt.endsWith("second turn")).toBe(true);
+		expect(occurrences(attempts[1]?.prompt ?? "", "second turn")).toBe(1);
 
 		const notice = restartNotice(events);
 		expect(notice).toMatchObject({
@@ -318,11 +422,21 @@ describe("Cursor CLI OAuth session router", () => {
 		await collect(
 			router.runTurn(
 				{ senpiSessionId: alphaContext.senpiSessionId, accountName: "bravo", runAttempt },
-				{ prompt: "new account", model: "model-a" },
+				{
+					prompt: "new account",
+					model: "model-a",
+					contextRecapRequested: true,
+					recentExchanges: [
+						{ role: "assistant", text: "PRIVATE-ALPHA-CONTEXT" },
+						{ role: "user", text: "new account" },
+					],
+				},
 			),
 		);
 
 		expect(attempts[0]?.resumeChatId).toBeUndefined();
+		expect(attempts[0]?.prompt).toBe("new account");
+		expect(attempts[0]?.prompt).not.toContain("PRIVATE-ALPHA-CONTEXT");
 		expect(router.getRecord(alphaContext.senpiSessionId)).toEqual({
 			accountName: "bravo",
 			chatId: "chat-8",
@@ -331,6 +445,33 @@ describe("Cursor CLI OAuth session router", () => {
 		});
 	});
 
+	it("keeps replacement-account attempts fresh and context-free with auto resume", async () => {
+		const router = makeRouter();
+		await primeChat(router, "replacement-old-chat", "model-a");
+		const { attempts, runAttempt } = scriptedRunner([
+			[initEvent("replacement-new-chat", "model-a"), assistantEvent("ok")],
+		]);
+
+		await collect(
+			router.runTurn(
+				{ ...alphaContext, runAttempt },
+				{
+					prompt: "replacement prompt",
+					model: "model-a",
+					contextRecapRequested: true,
+					contextRecapSuppressed: true,
+					forceFreshChat: true,
+					recentExchanges: [
+						{ role: "assistant", text: "PRIVATE-FAILED-ACCOUNT-CONTEXT" },
+						{ role: "user", text: "replacement prompt" },
+					],
+				},
+			),
+		);
+
+		expect(attempts).toEqual([{ prompt: "replacement prompt", resumeChatId: undefined }]);
+	});
+
 	it("never resumes when resumeMode is off", async () => {
 		const router = makeRouter();
 		const first = scriptedRunner([[initEvent("chat-1", "model-a"), assistantEvent("one")]]);
diff --git a/packages/coding-agent/test/cursor-cli-oauth/settings.test.ts b/packages/coding-agent/test/cursor-cli-oauth/settings.test.ts
index 95282bf659..792b70023a 100644
--- a/packages/coding-agent/test/cursor-cli-oauth/settings.test.ts
+++ b/packages/coding-agent/test/cursor-cli-oauth/settings.test.ts
@@ -39,6 +39,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 			resumeMode: "auto",
 			pinnedAccount: undefined,
 			contextRecapOnModelSwitch: true,
+			contextRecapOnProviderSwitch: true,
 			modelCatalogTtlHours: 24,
 			sandboxMode: undefined,
 			denyCommands: [],
@@ -57,6 +58,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 					resumeMode: "off",
 					pinnedAccount: "work",
 					contextRecapOnModelSwitch: false,
+					contextRecapOnProviderSwitch: true,
 					modelCatalogTtlHours: 6,
 					sandboxMode: "probe-proven-mode",
 					denyCommands: ["rm -rf /"],
@@ -74,6 +76,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 			resumeMode: "off",
 			pinnedAccount: "work",
 			contextRecapOnModelSwitch: false,
+			contextRecapOnProviderSwitch: true,
 			modelCatalogTtlHours: 6,
 			sandboxMode: "probe-proven-mode",
 			denyCommands: ["rm -rf /"],
@@ -91,6 +94,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 					resumeMode: "auto",
 					pinnedAccount: "settings-account",
 					contextRecapOnModelSwitch: true,
+					contextRecapOnProviderSwitch: false,
 					modelCatalogTtlHours: 24,
 					sandboxMode: "settings-sandbox",
 				},
@@ -102,6 +106,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 					SENPI_CURSOR_CLI_OAUTH_RESUME: "off",
 					SENPI_CURSOR_CLI_OAUTH_PINNED_ACCOUNT: "env-account",
 					SENPI_CURSOR_CLI_OAUTH_RECAP: "false",
+					SENPI_CURSOR_CLI_OAUTH_PROVIDER_RECAP: "true",
 					SENPI_CURSOR_CLI_OAUTH_MODEL_CATALOG_TTL_HOURS: "12.5",
 					SENPI_CURSOR_CLI_OAUTH_SANDBOX_MODE: "env-sandbox",
 				},
@@ -114,6 +119,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 			resumeMode: "off",
 			pinnedAccount: "env-account",
 			contextRecapOnModelSwitch: false,
+			contextRecapOnProviderSwitch: true,
 			modelCatalogTtlHours: 12.5,
 			sandboxMode: "env-sandbox",
 		});
@@ -139,6 +145,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 					executionMode: "plan",
 					resumeMode: "off",
 					contextRecapOnModelSwitch: false,
+					contextRecapOnProviderSwitch: false,
 					modelCatalogTtlHours: 8,
 				},
 				{
@@ -147,6 +154,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 					SENPI_CURSOR_CLI_OAUTH_EXECUTION_MODE: "ask",
 					SENPI_CURSOR_CLI_OAUTH_RESUME: "yes",
 					SENPI_CURSOR_CLI_OAUTH_RECAP: "on",
+					SENPI_CURSOR_CLI_OAUTH_PROVIDER_RECAP: "on",
 					SENPI_CURSOR_CLI_OAUTH_MODEL_CATALOG_TTL_HOURS: "NaN",
 				},
 			),
@@ -156,6 +164,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 			executionMode: "plan",
 			resumeMode: "off",
 			contextRecapOnModelSwitch: false,
+			contextRecapOnProviderSwitch: false,
 			modelCatalogTtlHours: 8,
 		});
 	});
@@ -172,6 +181,7 @@ describe("Cursor CLI OAuth provider settings", () => {
 				executionMode: "agent",
 				resumeMode: "auto",
 				contextRecapOnModelSwitch: true,
+				contextRecapOnProviderSwitch: true,
 				modelCatalogTtlHours: 24,
 			});
 		},
diff --git a/packages/coding-agent/test/cursor-cli-oauth/stream.test.ts b/packages/coding-agent/test/cursor-cli-oauth/stream.test.ts
index 42a3d0fd79..449f9111ce 100644
--- a/packages/coding-agent/test/cursor-cli-oauth/stream.test.ts
+++ b/packages/coding-agent/test/cursor-cli-oauth/stream.test.ts
@@ -21,6 +21,7 @@ import {
 	emptyCredential,
 } from "../../src/core/extensions/builtin/cursor-cli-oauth/accounts.ts";
 import { rendezvousOrder } from "../../src/core/extensions/builtin/cursor-cli-oauth/affinity.ts";
+import { CursorCliSessionRouter } from "../../src/core/extensions/builtin/cursor-cli-oauth/session-router.ts";
 import type { CursorCliOauthProviderSettings } from "../../src/core/extensions/builtin/cursor-cli-oauth/settings.ts";
 import {
 	CURSOR_CLI_OAUTH_PROVIDER_ID,
@@ -68,6 +69,7 @@ function enabledSettings(overrides: Partial<CursorCliOauthProviderSettings> = {}
 		resumeMode: "auto",
 		pinnedAccount: undefined,
 		contextRecapOnModelSwitch: true,
+		contextRecapOnProviderSwitch: true,
 		modelCatalogTtlHours: 24,
 		sandboxMode: undefined,
 		denyCommands: [],
@@ -92,6 +94,31 @@ function context(prompt: string): Context {
 	return { messages: [{ role: "user", content: prompt, timestamp: NOW }] };
 }
 
+function providerSwitchContext(prompt: string, priorText: string): Context {
+	return {
+		messages: [
+			{
+				role: "assistant",
+				content: [{ type: "text", text: priorText }],
+				api: "openai-responses",
+				provider: "openai",
+				model: "gpt-test",
+				usage: {
+					input: 1,
+					output: 1,
+					cacheRead: 0,
+					cacheWrite: 0,
+					totalTokens: 2,
+					cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+				},
+				stopReason: "stop",
+				timestamp: NOW - 1,
+			},
+			{ role: "user", content: prompt, timestamp: NOW },
+		],
+	};
+}
+
 function fixtureExecutable(directory: string, scenario: string): { executable: string; dump: string } {
 	const copiedFixture = join(directory, "fake-cursor-agent.mjs");
 	const executable = join(directory, "cursor-agent");
@@ -199,6 +226,14 @@ function runTurn(deps: CursorCliStreamDeps, prompt: string, sessionId: string):
 	return streamCursorCliOauth(model, context(prompt), { sessionId }, deps);
 }
 
+function runContextTurn(
+	deps: CursorCliStreamDeps,
+	turnContext: Context,
+	sessionId: string,
+): AssistantMessageEventStream {
+	return streamCursorCliOauth(model, turnContext, { sessionId }, deps);
+}
+
 async function collect(stream: AssistantMessageEventStream): Promise<AssistantMessageEvent[]> {
 	const events: AssistantMessageEvent[] = [];
 	for await (const event of stream) events.push(event);
@@ -282,6 +317,106 @@ describe("cursor-cli-oauth stream mapping", () => {
 		expect(sentPrompt.includes("--resume")).toBe(false);
 	});
 
+	it("reinjects prior context on the first turn after another provider", async () => {
+		const directory = temporaryDirectory();
+		const fixture = fixtureExecutable(directory, "happy");
+		const deps: CursorCliStreamDeps = {
+			cwd: directory,
+			agentDir: join(directory, "agent"),
+			store: await makeStore([account("alpha")]),
+			settings: enabledSettings(),
+			now: () => NOW,
+		};
+		process.env.SENPI_CURSOR_CLI_OAUTH_EXECUTABLE = fixture.executable;
+
+		const events = await collect(
+			runContextTurn(
+				deps,
+				providerSwitchContext("What was the codename?", "The codename is ORCHID."),
+				"stream-provider-switch",
+			),
+		);
+
+		expect(events.at(-1)?.type).toBe("done");
+		const sentPrompt = invocation(fixture.dump).argv[1] ?? "";
+		expect(sentPrompt).toContain("The codename is ORCHID.");
+		expect(sentPrompt.split("What was the codename?")).toHaveLength(2);
+	});
+
+	it("honors the provider-switch recap opt-out end to end", async () => {
+		const directory = temporaryDirectory();
+		const fixture = fixtureExecutable(directory, "happy");
+		const deps: CursorCliStreamDeps = {
+			cwd: directory,
+			agentDir: join(directory, "agent"),
+			store: await makeStore([account("alpha")]),
+			settings: enabledSettings({ contextRecapOnProviderSwitch: false }),
+			now: () => NOW,
+		};
+		process.env.SENPI_CURSOR_CLI_OAUTH_EXECUTABLE = fixture.executable;
+
+		const events = await collect(
+			runContextTurn(
+				deps,
+				providerSwitchContext("current question", "PRIVATE-PROVIDER-CONTEXT"),
+				"stream-provider-switch-opt-out",
+			),
+		);
+
+		expect(events.at(-1)?.type).toBe("done");
+		expect(invocation(fixture.dump).argv[1]).toBe("current question");
+	});
+
+	it("fails closed after restart when prior Cursor account ownership is unknown", async () => {
+		const directory = temporaryDirectory();
+		const fixture = fixtureExecutable(directory, "happy");
+		const deps: CursorCliStreamDeps = {
+			cwd: directory,
+			agentDir: join(directory, "agent"),
+			store: await makeStore([account("bravo")]),
+			settings: enabledSettings(),
+			now: () => NOW,
+			router: new CursorCliSessionRouter(),
+		};
+		process.env.SENPI_CURSOR_CLI_OAUTH_EXECUTABLE = fixture.executable;
+		const beforeRestart: CursorCliStreamDeps = {
+			...deps,
+			store: await makeStore([account("alpha")]),
+			router: new CursorCliSessionRouter(),
+		};
+		const priorCursor = doneMessage(
+			await collect(
+				runContextTurn(
+					beforeRestart,
+					providerSwitchContext("first Cursor turn", "PRIVATE-BEFORE-CURSOR"),
+					"stream-restart-owner",
+				),
+			),
+		);
+		const turnContext: Context = {
+			messages: [
+				priorCursor,
+				{
+					...priorCursor,
+					api: "openai-responses",
+					provider: "openai",
+					model: "gpt-test",
+					content: [{ type: "text", text: "PRIVATE-AFTER-CURSOR" }],
+					diagnostics: undefined,
+				},
+				{ role: "user", content: "current question", timestamp: NOW },
+			],
+		};
+
+		const events = await collect(runContextTurn(deps, turnContext, "stream-restart-owner"));
+
+		expect(events.at(-1)?.type).toBe("done");
+		const sent = invocation(fixture.dump);
+		expect(sent.argv[1]).toBe("current question");
+		expect(sent.argv).not.toContain("--resume");
+		expect(sent.env.HOME).toContain(join("accounts", "bravo", "home"));
+	});
+
 	it("isolates CLI usage numbers from AssistantMessage.usage and carries them only in a diagnostic", async () => {
 		const directory = temporaryDirectory();
 		const fixture = fixtureExecutable(directory, "happy");
@@ -396,6 +531,46 @@ describe("cursor-cli-oauth stream mapping", () => {
 		});
 	});
 
+	it("does not carry a provider-switch recap into a replacement account", async () => {
+		const directory = temporaryDirectory();
+		const accounts = [account("alpha"), account("bravo")];
+		const sessionId = "stream-failover-private";
+		const ordered = rendezvousOrder(sessionId, accounts);
+		const first = ordered[0];
+		const replacement = ordered[1];
+		const fixture = accountAwareFixture(directory, first.name);
+		const router = new CursorCliSessionRouter();
+		router.observeInit(
+			{ senpiSessionId: sessionId, accountName: replacement.name },
+			{ chatId: "replacement-old-chat", model: model.id },
+		);
+		const deps: CursorCliStreamDeps = {
+			cwd: directory,
+			agentDir: join(directory, "agent"),
+			store: await makeStore(accounts),
+			settings: enabledSettings(),
+			now: () => NOW,
+			router,
+		};
+		process.env.SENPI_CURSOR_CLI_OAUTH_EXECUTABLE = fixture.executable;
+
+		const events = await collect(
+			runContextTurn(
+				deps,
+				providerSwitchContext("answer without history", "PRIVATE-CROSS-ACCOUNT-CONTEXT"),
+				sessionId,
+			),
+		);
+
+		expect(events.at(-1)?.type).toBe("done");
+		const replacementInvocation = invocation(fixture.dump);
+		const replacementPrompt = replacementInvocation.argv[1] ?? "";
+		expect(replacementPrompt).toBe("answer without history");
+		expect(replacementPrompt).not.toContain("PRIVATE-CROSS-ACCOUNT-CONTEXT");
+		expect(replacementInvocation.argv).not.toContain("--resume");
+		expect(replacementInvocation.env.HOME).toContain(join("accounts", replacement.name, "home"));
+	});
+
 	it("re-selects settings and accounts freshly across back-to-back turns", async () => {
 		const directory = temporaryDirectory();
 		const fixture = fixtureExecutable(directory, "happy");
@@ -427,13 +602,17 @@ describe("cursor-cli-oauth stream mapping", () => {
 			};
 		});
 
-		const secondTurn = await collect(runTurn(deps, "second turn", "stream-stale"));
+		const secondTurn = await collect(
+			runContextTurn(deps, providerSwitchContext("second turn", "PRIVATE-PRIOR-ACCOUNT-CONTEXT"), "stream-stale"),
+		);
 		expect(secondTurn.at(-1)?.type).toBe("done");
 
 		const second = invocation(fixture.dump);
 		expect(second.env.HOME).toContain(join("accounts", "bravo", "home"));
 		// The new account owns no chat, so the turn must not resume the old one.
 		expect(second.argv).not.toContain("--resume");
+		expect(second.argv[1]).toBe("second turn");
+		expect(second.argv[1]).not.toContain("PRIVATE-PRIOR-ACCOUNT-CONTEXT");
 		expect(existsSync(join(agentDir, "cursor-cli-oauth", "accounts", "bravo", "home", ".cursor", "auth.json"))).toBe(
 			true,
 		);