pi-profile-switch 0.2.0 → 0.3.1

package/README.md

@@ -6,7 +6,7 @@ Named profiles for [Pi](https://github.com/badlogic/pi-mono). A profile selects
 
 A shipped `read-only` preset covers the read-and-report workflow; other workflows you write yourself — a profile can narrow the tool set, hide skills, pin a model, or add instructions.
 
-`pi-profile-switch` is a plain Pi package (ADR-0007). It installs like any other extension, leaves Pi's configuration directory untouched, and keeps sessions, packages, project trust, and every other installed extension native.
+`pi-profile-switch` is a plain Pi package (ADR-0007). It installs like any other extension, keeps Pi's configuration directory as the single source of truth, and keeps sessions, packages, project trust, and every other installed extension native. The only file it adds is the default catalog below.
 
 ## Install
 
@@ -16,6 +16,8 @@ pi install npm:pi-profile-switch
 
 Requires [Pi](https://www.npmjs.com/package/@earendil-works/pi-coding-agent) (installed automatically as a peer dependency).
 
+Pi packages have no install hook, so the default catalog is written the first time the extension loads (in any mode, including `--mode rpc`): if `~/.pi/agent/profiles.json` does not exist, it is created from the shipped `read-only` profile. An existing file is never read, rewritten, or backed up — delete it to get the default back.
+
 ## Quick start
 
 ```bash
@@ -29,30 +31,13 @@ pi --profile read-only
 pi --profile default
 ```
 
-Create profiles with `/profile create`, which writes `~/.pi/agent/profiles.json` (global) or `<project>/.pi/profiles.json` (project, trusted projects only). The wizard offers the shipped `read-only` preset — Pi's built-in tools only, no skills, MCP servers, or model assumed — or a blank definition:
-
-```json
-{
-  "schemaVersion": 1,
-  "profiles": {
-    "read-only": {
-      "label": "Read-only",
-      "description": "Read-only session; no skills or MCP servers assumed — add your own.",
-      "tools": [
-        "read",
-        "grep",
-        "find",
-        "ls"
-      ],
-      "instructions": "Read-only session: inspect and report; never create, edit, rename, or delete files.\nIf a change is needed, describe it in your reply instead of applying it.\nDo not run commands that modify state (installs, formatters, commits, pushes, network writes).\nPrefer an available skill or MCP tool when it fits the request; otherwise use the tools you have.\nGround claims in evidence: cite file:line and separate verified facts from inferences.\nReply in English."
-    }
-  }
-}
-```
+A fresh install already holds one profile, `read-only`; activate it with `pi --profile read-only` or `/profile use read-only`.
+
+Create more with `/profile create`, which writes `~/.pi/agent/profiles.json` (global) or `<project>/.pi/profiles.json` (project, trusted projects only). The wizard offers the shipped `read-only` preset — Pi's built-in tools only, no skills, MCP servers, or model assumed — or a blank definition.
 
-A preset is a one-time copy into your catalog: it is not tracked, so a package update never changes a profile you already created. Profiles **reference** resources by name — they never copy them. [`examples/profiles.json`](examples/profiles.json) is that same preset as a catalog; the field reference is [`schemas/profiles.schema.json`](schemas/profiles.schema.json).
+A preset is a one-time copy into your catalog: it is not tracked, so a package update never changes a profile you already created. Profiles **reference** resources by name — they never copy them. [`examples/profiles.example.json`](examples/profiles.example.json) is a complete catalog with several profiles covering every field; replace its resource names with ones you own.
 
-`schemaVersion` is 1. A profile cannot select extensions: they load natively in every profile, so manage them with `pi install`.
+`schemaVersion` is 1 and is the only accepted value. A profile cannot select extensions: they load natively in every profile, so manage them with `pi install`.
 
 ## What a profile controls
 
@@ -61,7 +46,7 @@ A preset is a one-time copy into your catalog: it is not tracked, so a package u
 | `instructions` | Text appended to the system prompt every turn |
 | `model` | Session-start model preset; an explicit `--model`/`--thinking` or a model recorded in the session wins |
 | `skills` | What the model sees in the prompt's skills list. Every installed skill stays loaded and callable by the user through `/skill:name` |
-| `mcp` | Runtime server allowlist published to `pi-mcp-adapter`; connection details stay in the adapter's own config |
+| `mcps` | Which MCP servers the session exposes: the profile's allowlist is written into the adapter's own config (`~/.pi/agent/mcp.json`), disabling every other server. Servers you keep in that file move to `mcp.user.json`; connection details stay in your config, never in the profile. The legacy key `mcp` is still read and becomes `mcps` the next time the profile is saved |
 | `tools` | Active tool set: declared names/globs become the active set; names that register later (MCP, extensions) are applied when they appear |
 
 Anything a profile does not declare keeps Pi's native behavior, and `default` declares nothing.
@@ -74,7 +59,7 @@ In the TUI, the `/profile` command family manages everything in-session:
 | --- | --- |
 | `/profile` | Interactive profile picker |
 | `/profile list` / `/profile status` | Show profiles / active profile details |
-| `/profile use <name>` | Switch instantly — same session, no reload |
+| `/profile use <name>` | Switch in place — same session; when the MCP selection changes, the runtime reloads automatically to re-apply it |
 | `/profile create\|edit\|delete\|duplicate` | Guided profile CRUD (TUI only) |
 | `/profile customize` / `/profile reset` | Narrow the active profile for this session only |
 | `/mcp enable\|disable <server>` | Toggle MCP servers in the active profile |
@@ -88,12 +73,11 @@ All commands work in non-interactive modes (`--mode rpc|print|json`); CRUD wizar
 - **Reference, never copy** — profiles point at resources you already own and maintain.
 - **Pi-native** — the configuration directory is Pi's own, so sessions, extension config, packages, context files, and trust behave exactly as they do in plain Pi.
 - **Fail safe** — untrusted project directories are never read; a failed activation applies nothing and reports the cause.
-- **No reload** — switching re-applies runtime state in place; the next turn's prompt carries the new selection.
+- **No manual reload** — switching re-applies runtime state in place and the next turn's prompt carries the new selection. Only a change to the MCP selection rebuilds the runtime, automatically, in the same session, and the switch survives that rebuild: the rebuild continues the selection you made, it does not fall back to the profile you started with.
 
 ## Docs
 
 - [Architecture](docs/architecture/overview.md) · [ADRs](docs/adr/) · [Glossary](CONTEXT.md) (Chinese)
-- JSON Schema: [`schemas/profiles.schema.json`](schemas/profiles.schema.json)
 
 ## License
 

package/README.zh-CN.md

@@ -6,7 +6,7 @@
 
 随包提供一个 `read-only` 预设覆盖「读代码 + 报告」的工作流；其余工作流由你自己定义——profile 可以收窄工具集、隐藏 skill、固定模型或附加指令。
 
-`pi-profile-switch` 是普通 Pi package（ADR-0007）：像其他扩展一样安装，不改动 Pi 的配置目录，session、packages、项目信任和其他扩展全部保持原生。
+`pi-profile-switch` 是普通 Pi package（ADR-0007）：像其他扩展一样安装，配置目录始终是 Pi 自己的那一份，session、packages、项目信任和其他扩展全部保持原生。它只在配置目录里新增一个文件，就是下面这个默认 catalog。
 
 ## 安装
 
@@ -16,6 +16,8 @@ pi install npm:pi-profile-switch
 
 依赖 [Pi](https://www.npmjs.com/package/@earendil-works/pi-coding-agent)（作为 peer dependency 自动安装）。
 
+Pi package 没有安装钩子，因此默认 catalog 在扩展首次加载时写入（任何模式都会执行，包括 `--mode rpc`）：`~/.pi/agent/profiles.json` 不存在时，用随包的 `read-only` profile 创建它。已存在的文件不会被读取、改写或备份——删掉它即可拿回默认值。
+
 ## 快速上手
 
 ```bash
@@ -29,30 +31,13 @@ pi --profile read-only
 pi --profile default
 ```
 
-用 `/profile create` 创建 profile，写入 `~/.pi/agent/profiles.json`（全局）或 `<项目>/.pi/profiles.json`（项目级，仅限已信任项目）。向导提供随包的 `read-only` 预设——只用 Pi 内建工具，不假设任何 skill、MCP server 或模型——也可以从空定义开始：
-
-```json
-{
-  "schemaVersion": 1,
-  "profiles": {
-    "read-only": {
-      "label": "Read-only",
-      "description": "Read-only session; no skills or MCP servers assumed — add your own.",
-      "tools": [
-        "read",
-        "grep",
-        "find",
-        "ls"
-      ],
-      "instructions": "Read-only session: inspect and report; never create, edit, rename, or delete files.\nIf a change is needed, describe it in your reply instead of applying it.\nDo not run commands that modify state (installs, formatters, commits, pushes, network writes).\nPrefer an available skill or MCP tool when it fits the request; otherwise use the tools you have.\nGround claims in evidence: cite file:line and separate verified facts from inferences.\nReply in English."
-    }
-  }
-}
-```
+新安装已经带有一个 `read-only` profile，用 `pi --profile read-only` 或 `/profile use read-only` 激活。
+
+用 `/profile create` 创建更多 profile，写入 `~/.pi/agent/profiles.json`（全局）或 `<项目>/.pi/profiles.json`（项目级，仅限已信任项目）。向导提供随包的 `read-only` 预设——只用 Pi 内建工具，不假设任何 skill、MCP server 或模型——也可以从空定义开始。
 
-预设只被复制一次：它不被跟踪，包升级不会改动你已经创建的 profile。Profile 只**引用**资源，从不复制资源。[`examples/profiles.json`](examples/profiles.json) 就是同一个预设构成的 catalog；字段参考见 [`schemas/profiles.schema.json`](schemas/profiles.schema.json)。
+预设只被复制一次：它不被跟踪，包升级不会改动你已经创建的 profile。Profile 只**引用**资源，从不复制资源。[`examples/profiles.example.json`](examples/profiles.example.json) 是覆盖全部字段的完整 catalog，示例中的资源名请替换成你本机已有的名字。
 
-`schemaVersion` 为 1。Profile 不选择 extension：extensions 在所有 profile 中原生加载，请用 `pi install` 管理。
+`schemaVersion` 为 1，也是唯一接受的值。Profile 不选择 extension：extensions 在所有 profile 中原生加载，请用 `pi install` 管理。
 
 ## Profile 控制的范围
 
@@ -61,7 +46,7 @@ pi --profile default
 | `instructions` | 每个 turn 追加到 system prompt 末尾 |
 | `model` | 会话启动的模型预设；显式 `--model`/`--thinking` 或 session 历史中记录的模型优先 |
 | `skills` | 模型在 prompt skills 列表中看到的内容；所有已安装 skill 仍保持加载，用户可用 `/skill:name` 手动调用 |
-| `mcp` | 发布给 `pi-mcp-adapter` 的运行时 server allowlist；连接参数仍由 adapter 自己管理 |
+| `mcps` | 本次会话暴露哪些 MCP server：白名单写入 adapter 自己的配置（`~/.pi/agent/mcp.json`），其余 server 一律标为 disabled。你原本放在该文件里的 server 会迁移到 `mcp.user.json`；连接参数只在你自己的配置里，从不进入 profile。旧键 `mcp` 仍可读取，下次保存 profile 时变为 `mcps` |
 | `tools` | 活动工具集：声明的名字/glob 成为活动集合；之后才注册的工具（MCP、扩展）在出现时补上 |
 
 未声明的字段保持 Pi 原生行为，`default` 什么都不声明。
@@ -74,7 +59,7 @@ pi --profile default
 | --- | --- |
 | `/profile` | 交互式选择 profile |
 | `/profile list` / `/profile status` | 列出 profile / 查看活动 profile 详情 |
-| `/profile use <name>` | 即时切换——同一 session，无 reload |
+| `/profile use <name>` | 原位切换——同一 session；当 MCP 选择发生变化时会自动 reload 以重新应用 |
 | `/profile create\|edit\|delete\|duplicate` | 向导式 profile 增删改（仅 TUI） |
 | `/profile customize` / `/profile reset` | 仅本次会话收窄活动 profile |
 | `/mcp enable\|disable <server>` | 在活动 profile 中开关 MCP server |
@@ -88,12 +73,11 @@ pi --profile default
 - **引用而非复制**——profile 指向你自己拥有和维护的资源。
 - **Pi 原生**——配置目录就是 Pi 自己的目录，session、扩展配置、packages、context 文件和信任行为与原生 Pi 完全一致。
 - **失败安全**——未信任的项目目录从不读取；激活失败时不应用任何设置并报出原因。
-- **无 reload**——切换在原位重新应用运行时状态；下一个 turn 的 prompt 直接带上新选择。
+- **无需手动 reload**——切换在原位重新应用运行时状态，下一个 turn 的 prompt 直接带上新选择；只有 MCP 选择变化时才会自动重建运行时（同一 session），且切换结果在重建后保持不变：重建沿用你刚做的选择，不会退回启动时的 profile
 
 ## 文档
 
 - [架构设计](docs/architecture/overview.md) · [ADR](docs/adr/) · [术语表](CONTEXT.md)
-- JSON Schema：[`schemas/profiles.schema.json`](schemas/profiles.schema.json)
 
 ## 许可证
 

package/examples/profiles.example.json

@@ -0,0 +1,74 @@
+{
+  "schemaVersion": 1,
+  "profiles": {
+    "read-only": {
+      "label": "Read-only",
+      "description": "Read-only session; no skills or MCP servers assumed — add your own.",
+      "tools": [
+        "read",
+        "grep",
+        "find",
+        "ls"
+      ],
+      "instructions": "Read-only session: inspect and report; never create, edit, rename, or delete files.\nIf a change is needed, describe it in your reply instead of applying it.\nDo not run commands that modify state (installs, formatters, commits, pushes, network writes).\nPrefer an available skill or MCP tool when it fits the request; otherwise use the tools you have.\nGround claims in evidence: cite file:line and separate verified facts from inferences.\nReply in English."
+    },
+    "review": {
+      "label": "Code review",
+      "description": "Review a diff or a branch: read the change, report findings, modify nothing.",
+      "skills": [
+        "code-review",
+        "git-*"
+      ],
+      "mcps": [
+        "github"
+      ],
+      "tools": [
+        "read",
+        "grep",
+        "find",
+        "ls",
+        "bash"
+      ],
+      "model": {
+        "provider": "anthropic",
+        "id": "claude-sonnet-4-5",
+        "thinkingLevel": "high"
+      },
+      "instructions": "Review only: read the change under review, then report findings with file:line evidence.\nNever edit tracked files, commit, or push; describe the required fix instead.\nSeparate verified behavior from suspected issues."
+    },
+    "plan": {
+      "label": "Plan",
+      "description": "Research a change and write the plan; no edits, no implementation.",
+      "skills": [],
+      "tools": [
+        "read",
+        "grep",
+        "find",
+        "ls",
+        "bash"
+      ],
+      "instructions": "Planning session: research the code first, then write the plan in your reply.\nDo not create, edit, rename, or delete files."
+    },
+    "implement": {
+      "label": "Implement",
+      "description": "Full tool access for implementing a change end to end.",
+      "skills": [
+        "git-commit",
+        "test-*"
+      ],
+      "mcps": [
+        "github"
+      ],
+      "tools": [
+        "read",
+        "grep",
+        "find",
+        "ls",
+        "bash",
+        "edit",
+        "write"
+      ],
+      "instructions": "Implement the requested change: read before writing, keep the diff minimal.\nRun the tests that cover your change and report the exact commands."
+    }
+  }
+}

package/extensions/pi-profile-switch/index.ts

@@ -6,11 +6,13 @@ import {
 	type ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 
+import { adapterPresent } from "../../src/adapter-presence.ts";
 import { discoverAdapterServerNames } from "../../src/mcp-config.ts";
 import { probeAdapterPresence } from "../../src/mcp-coordination.ts";
 import { readSessionChoices } from "../../src/model-selection.ts";
 import { buildProfileBadge, PROFILE_STATUS_KEY, renderProfileBadge } from "../../src/profile-badge.ts";
 import type { ProfileDefinition } from "../../src/profile-catalog.ts";
+import { seedDefaultProfilesSync } from "../../src/default-profiles.ts";
 import {
 	formatSelectionWarnings,
 	formatSkillWarnings,
@@ -25,11 +27,18 @@ import {
 	type SkillsFilterOutcome,
 } from "../../src/skill-selection.ts";
 import {
+	appliedProfile,
 	detectExplicitDeclarations,
 	readProfileFlag,
+	recordAppliedProfile,
 	registerProfileFlag,
 	resolveStartupProfile,
 } from "../../src/startup-selection.ts";
+import {
+	readFlagFromArgv,
+	syncMcpOverlayForSelection,
+	syncStartupMcpOverlay,
+} from "../../src/startup-mcp-scope.ts";
 import { retryPendingTools, type ApplySurface } from "../../src/switching/apply-profile.ts";
 import {
 	activateProfile,
@@ -63,10 +72,14 @@ import { buildStatusReport, formatStatusMarkdown } from "../../src/switching/sta
  * all native.
  *
  * Responsibilities:
+ * - load: seed `<agentDir>/profiles.json` from the shipped default catalog
+ *   when the file does not exist yet (Pi packages have no install hook), and
+ *   report a failure once at `session_start`.
  * - `session_start`: resolve the startup profile (`--profile <flag>`, else
- *   the saved selection, else `default`), then apply the runtime parts of
- *   the selection — model preset, active tools, MCP allowlist. A failed
- *   activation applies nothing and reports loudly.
+ *   the saved selection, else `default`; every start after the first
+ *   continues the selection this process already applied), then apply the
+ *   runtime parts of the selection — model preset, active tools, MCP
+ *   allowlist. A failed activation applies nothing and reports loudly.
  * - `before_agent_start`: rebuild the system prompt each turn — replace the
  *   skills section with the profile's visible set and append the profile's
  *   instructions. Unselected skills stay loaded and `/skill:`-invocable.
@@ -115,7 +128,41 @@ const PROFILE_USAGE = [
 
 export default function piProfileExtension(pi: ExtensionAPI): void {
 	registerProfileFlag(pi);
-	const explicit = detectExplicitDeclarations(process.argv.slice(2));
+	const argv = process.argv.slice(2);
+	const explicit = detectExplicitDeclarations(argv);
+	const loadAgentDir = getAgentDir();
+	// Install-time default: Pi packages have no install hook, so the first
+	// load seeds <agentDir>/profiles.json from the shipped catalog. The write
+	// is idempotent, never overwrites a user catalog, and a failure is
+	// reported at session_start instead of blocking the load.
+	let seedWarning: string | undefined;
+	try {
+		seedDefaultProfilesSync(loadAgentDir);
+	} catch (error) {
+		seedWarning = `pi-profile-switch: could not write the default profiles.json — ${error instanceof Error ? error.message : String(error)}`;
+	}
+	// pi-mcp-adapter reads its config before any session event fires (and, for
+	// eager servers, at its own load time), so the startup profile's overlay
+	// is generated here, synchronously. Pi applies CLI flag values only after
+	// extension loading, hence argv.
+	const adapterInstalled = adapterPresent({
+		agentDir: loadAgentDir,
+		argv,
+		probeAnswered: probeAdapterPresence(pi.events),
+	});
+	if (adapterInstalled) {
+		const requestedConfigPath = readFlagFromArgv(argv, "mcp-config");
+		// A reload's overlay belongs to the run's current selection: the same
+		// continuation `session_start` applies right after this pass.
+		const runProfile = appliedProfile();
+		syncStartupMcpOverlay({
+			agentDir: loadAgentDir,
+			cwd: process.cwd(),
+			argv,
+			...(requestedConfigPath === undefined ? {} : { overridePath: requestedConfigPath }),
+			...(runProfile === undefined ? {} : { continuation: runProfile }),
+		});
+	}
 	let current: Activation | undefined;
 	let filterWarningShown = false;
 	/** The last badge written to the footer, so a refresh only talks to Pi
@@ -217,6 +264,8 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 			overlay: options?.overlay ?? null,
 			persist: options?.persist ?? true,
 		});
+		// The run's current selection, for the reload continuation.
+		recordAppliedProfile(result.selection.name);
 		setCurrent(ctx, activationOf(result, deps.live.skills !== undefined));
 		reportWarnings(ctx, formatSelectionWarnings(result.selection));
 		return result;
@@ -239,6 +288,75 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 		});
 	}
 
+	/** `session_start` re-check. The load-time pass cannot know an interactive
+	 *  trust answer, and the adapter has already read its config by now — so a
+	 *  difference is written for the next reload and reported instead. */
+	function reportMcpOverlayState(
+		ctx: ExtensionContext,
+		profileName: string,
+		selection: ResolvedSelection,
+		input: { agentDir: string; cwd: string; projectTrusted: boolean },
+	): void {
+		const configOverride = readFlagFromArgv(argv, "mcp-config");
+		const sync = syncStartupMcpOverlay({
+			agentDir: input.agentDir,
+			cwd: input.cwd,
+			projectTrusted: input.projectTrusted,
+			profileName,
+			argv,
+			...(configOverride === undefined ? {} : { overridePath: configOverride }),
+		});
+		if (sync.error !== undefined) {
+			notify(ctx, `pi-profile-switch: MCP overlay unavailable — ${sync.error}`, "warning");
+			return;
+		}
+		if (!sync.managed) {
+			if (selection.mcp !== undefined) {
+				notify(
+					ctx,
+					`pi-profile-switch: --mcp-config points at another file — profile "${profileName}" cannot filter MCP servers`,
+					"warning",
+				);
+			}
+			return;
+		}
+		if (!sync.changed) return;
+		notify(ctx, `pi-profile-switch: MCP config updated for profile "${profileName}" — run /reload to apply`, "warning");
+	}
+
+	/** Repoints the adapter at the overlay for a just-activated selection and
+	 *  rebuilds the runtime when the MCP surface actually moved. Must be the
+	 *  caller's LAST use of `ctx`: `reload()` invalidates the old context. */
+	async function reloadForMcpOverlay(ctx: ExtensionCommandContext, selection: ResolvedSelection): Promise<void> {
+		if (!adapterInstalled) return;
+		const configOverride = readFlagFromArgv(argv, "mcp-config");
+		const sync = syncMcpOverlayForSelection({
+			agentDir: getAgentDir(),
+			cwd: ctx.cwd,
+			projectTrusted: ctx.isProjectTrusted(),
+			allowed: selection.mcp === undefined ? "all" : selection.mcp,
+			...(configOverride === undefined ? {} : { overridePath: configOverride }),
+		});
+		if (sync.error !== undefined) {
+			notify(ctx, `pi-profile-switch: MCP overlay not updated — ${sync.error}`, "warning");
+			return;
+		}
+		if (!sync.managed) {
+			if (selection.mcp !== undefined) {
+				notify(
+					ctx,
+					`pi-profile-switch: --mcp-config points at another file — profile "${selection.name}" cannot filter MCP servers`,
+					"warning",
+				);
+			}
+			return;
+		}
+		if (!sync.changed) return;
+		notify(ctx, `profile "${selection.name}": MCP servers updated — reloading runtime`, "info");
+		await ctx.waitForIdle();
+		await ctx.reload();
+	}
+
 	/** Bare `/profile`: the interactive picker, with a list fallback for
 	 *  modes without dialogs. */
 	async function runPicker(ctx: ExtensionCommandContext, entries: ProfileListEntry[]): Promise<void> {
@@ -258,6 +376,7 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 		if (chosen === undefined || chosen.name === current?.selection.name) return;
 		const result = await activate(ctx, chosen.name, { force: true, overlay: null, persist: true });
 		notify(ctx, `profile active: ${result.selection.name}`, "info");
+		await reloadForMcpOverlay(ctx, result.selection);
 	}
 
 	/** `/profile create|duplicate|edit|delete`: TUI-only catalog CRUD. */
@@ -319,8 +438,9 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 			if (wizard === undefined) return;
 			await editProfile(scopeInput, wizard.scope, wizard.name, wizard.definition);
 			if (current !== undefined && name === current.selection.name) {
-				await activate(ctx, name, { persist: true });
+				const reactivated = await activate(ctx, name, { persist: true });
 				notify(ctx, `saved and reactivated profile "${name}"`, "info");
+				await reloadForMcpOverlay(ctx, reactivated.selection);
 			} else {
 				notify(ctx, `saved profile "${name}" (inactive — runtime untouched)`, "info");
 			}
@@ -358,16 +478,26 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 		if (isActive) {
 			const result = await activate(ctx, replacement ?? name, { force: replacement !== undefined, persist: true });
 			notify(ctx, `deleted "${name}" (${scope}); profile active: ${result.selection.name}`, "info");
+			await reloadForMcpOverlay(ctx, result.selection);
 		} else {
 			notify(ctx, `deleted profile "${name}" (${scope})`, "info");
 		}
 	}
 
-	pi.on("session_start", async (_event, ctx) => {
+	pi.on("session_start", async (event, ctx) => {
 		setCurrent(ctx, undefined);
 		filterWarningShown = false;
+		if (seedWarning !== undefined) {
+			notify(ctx, seedWarning, "warning");
+			seedWarning = undefined;
+		}
 		const agentDir = getAgentDir();
 		const projectTrusted = ctx.isProjectTrusted();
+		// Every session start after the first (reload, new, resume, fork)
+		// continues the selection this process already applied. The `--profile`
+		// flag is a startup directive: re-reading it here would silently
+		// resurrect the profile the user just left.
+		const continuation = event.reason === "startup" ? undefined : appliedProfile();
 		const requested = readProfileFlag(pi);
 		let startup;
 		try {
@@ -376,6 +506,7 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 				cwd: ctx.cwd,
 				projectTrusted,
 				...(requested !== undefined ? { requested } : {}),
+				...(continuation !== undefined ? { continuation } : {}),
 			});
 		} catch (error) {
 			notify(ctx, error instanceof Error ? error.message : String(error), "error");
@@ -384,9 +515,17 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 		try {
 			// Startup activation never persists (a `--profile` selection is for
 			// this run only) and never applies a stored overlay.
-			await activate(ctx, startup.name, { persist: false, overlay: null });
+			const activated = await activate(ctx, startup.name, { persist: false, overlay: null });
 			reportWarnings(ctx, startup.warnings);
+			if (adapterInstalled) {
+				reportMcpOverlayState(ctx, startup.name, activated.selection, {
+					agentDir,
+					cwd: ctx.cwd,
+					projectTrusted,
+				});
+			}
 		} catch (error) {
+			recordAppliedProfile(undefined);
 			notify(ctx, error instanceof Error ? error.message : String(error), "error");
 			reportWarnings(ctx, startup.warnings);
 		}
@@ -498,6 +637,7 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 					case "use": {
 						const result = await activate(ctx, rest[0] as string, { force: true, overlay: null, persist: true });
 						notify(ctx, `profile active: ${result.selection.name}`, "info");
+						await reloadForMcpOverlay(ctx, result.selection);
 						return;
 					}
 					case "customize": {
@@ -578,12 +718,13 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 				// catalog; the stored overlay is preserved.
 				const overlay = (await new RuntimeStateStore(stateDirFor(profile.source, { agentDir, cwd: ctx.cwd })).read())
 					.overlay;
-				await activate(ctx, profile.name, { overlay: overlay ?? null, persist: true });
+				const reactivated = await activate(ctx, profile.name, { overlay: overlay ?? null, persist: true });
 				notify(
 					ctx,
-					`${action}d MCP server "${server}" in profile "${profile.name}" (mcp: [${result.mcp.join(", ")}])`,
+					`${action}d MCP server "${server}" in profile "${profile.name}" (mcps: [${result.mcps.join(", ")}])`,
 					"info",
 				);
+				await reloadForMcpOverlay(ctx, reactivated.selection);
 			} catch (error) {
 				notify(ctx, error instanceof Error ? error.message : String(error), "error");
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-profile-switch",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Named profiles for Pi: skills, MCP servers, tools, model, and instructions per workflow — switched in place in the same session.",
   "type": "module",
   "keywords": [

package/schemas/profiles.schema.json

@@ -10,8 +10,8 @@
   "additionalProperties": false,
   "properties": {
     "schemaVersion": {
-      "description": "1 is current. 2 is the number v0.1.0 wrote for the same field shape and still reads; saves always write 1.",
-      "enum": [1, 2]
+      "description": "Catalog format version. Only 1 is accepted.",
+      "const": 1
     },
     "profiles": {
       "type": "object",
@@ -44,19 +44,12 @@
           },
           "description": "Skill names or globs. Controls what the model sees in the system prompt's skills section; every loaded skill stays callable by the user through /skill:name."
         },
-        "extensions": {
+        "mcps": {
           "type": "array",
           "items": {
             "type": "string"
           },
-          "description": "Ignored. Extensions always load natively (ADR-0007) and are managed with pi install; the field is accepted so existing catalogs keep validating."
-        },
-        "mcp": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "MCP server names or globs, discovered by pi-mcp-adapter configuration. Connection details stay in adapter-managed config."
+          "description": "MCP server names or globs, discovered by pi-mcp-adapter configuration. Connection details stay in adapter-managed config. The legacy key \"mcp\" is still accepted on read and migrates to \"mcps\" on the next save."
         },
         "tools": {
           "type": "array",

package/src/adapter-presence.ts

@@ -0,0 +1,75 @@
+/**
+ * AdapterPresence: a cheap, deterministic "is pi-mcp-adapter installed?"
+ * check that does not depend on extension load order.
+ *
+ * The overlay mechanism only exists to serve the adapter; when the adapter is
+ * absent the extension must not register the `mcp-config` flag default and
+ * must not write anything. Signals, in order of reliability:
+ *
+ * 1. Pi's npm package root (`<agentDir>/npm/node_modules/pi-mcp-adapter`).
+ * 2. The command line (`-e <path>` / `--extension <path>`).
+ * 3. Pi settings `packages` entries.
+ * 4. The adapter's own event-bus presence probe, when it answered during
+ *    extension loading (only reliable when the adapter loaded first).
+ *
+ * Any failure reads as "absent": a false negative only disables the overlay,
+ * while a false positive could hide the user's own Pi-global slot file.
+ */
+
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
+
+import { isRecord } from "./json-file.ts";
+
+const ADAPTER_PACKAGE = "pi-mcp-adapter";
+
+export interface AdapterPresenceInput {
+	agentDir: string;
+	argv: readonly string[];
+	/** Result of the adapter's event-bus probe, when the caller ran one. */
+	probeAnswered?: boolean;
+}
+
+export function adapterPresent(input: AdapterPresenceInput): boolean {
+	if (input.probeAnswered === true) return true;
+	try {
+		for (const candidate of [
+			path.join(input.agentDir, "npm", "node_modules", ADAPTER_PACKAGE),
+			path.join(input.agentDir, "node_modules", ADAPTER_PACKAGE),
+		]) {
+			if (existsSync(candidate)) return true;
+		}
+		return argvMentionsAdapter(input.argv) || settingsListAdapter(input.agentDir);
+	} catch {
+		return false;
+	}
+}
+
+function argvMentionsAdapter(argv: readonly string[]): boolean {
+	for (let index = 0; index < argv.length; index++) {
+		const token = argv[index] ?? "";
+		if (token.includes(ADAPTER_PACKAGE)) return true;
+		if ((token === "-e" || token === "--extension") && (argv[index + 1] ?? "").includes(ADAPTER_PACKAGE)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function settingsListAdapter(agentDir: string): boolean {
+	try {
+		const raw: unknown = JSON.parse(readFileSync(path.join(agentDir, "settings.json"), "utf8"));
+		if (!isRecord(raw) || !Array.isArray(raw.packages)) return false;
+		return raw.packages.some((entry) => {
+			const source =
+				typeof entry === "string"
+					? entry
+					: isRecord(entry) && typeof entry.source === "string"
+						? entry.source
+						: undefined;
+			return source !== undefined && source.includes(ADAPTER_PACKAGE);
+		});
+	} catch {
+		return false;
+	}
+}