pi-profile-switch 0.12.0 → 0.12.2

package/README.md

@@ -100,6 +100,10 @@ How fields resolve:
 - A nonempty `mcp_tools` requires `pi-mcp-adapter` even when `mcps` is omitted. Existing adapter `includeTools` filters are combined only when the profile uses identical selectors or the existing filter is `"*"`; otherwise activation fails before writing runtime files. Existing `excludeTools` restrictions continue to apply.
 - **Migration note:** Former MCP references in `tools` (e.g. `mcp__*`, `<server>_*`) no longer govern MCP access. Move desired MCP tool restrictions to `mcp_tools`.
 - `mcps` references servers from your pi-mcp-adapter configuration; connection details stay in the adapter's own config.
+  - **Omitting `mcps`** leaves all discovered user-level servers at their normal adapter-defined availability.
+  - **`mcps: []` with `pi-mcp-adapter` selected** disables every discovered user-level server (shared locations are explicitly marked `disabled`; agentDir-only servers are omitted from the generated instance `mcp.json`).
+  - **`mcps: []` without `pi-mcp-adapter`** is inert: it does not read MCP configuration, change server availability, or fail because of a malformed config file.
+  - Trusted project-level MCP servers are always kept enabled and are never narrowed by `mcps`.
 - Any field you omit keeps plain Pi behavior.
 
 The files in [`examples/`](examples/) mirror the two profiles above: `ask.json` is the seeded starter, `example.json` the full-field demo.

package/README.zh-CN.md

@@ -100,6 +100,10 @@ pi-profile-switch 会向全局 `profiles/` 目录播种一个初始 **`ask`** pr
 - 非空的 `mcp_tools` 即使在省略 `mcps` 时也需要 `pi-mcp-adapter`。只有当 profile selector 与已有的 `includeTools` 字面值完全相同，或已有列表是 `"*"` 时才能安全组合；否则会在写入 runtime 文件前报错。已有的 `excludeTools` 限制仍然生效。
 - **迁移提示**：旧 profile 中写入 `tools` 的 MCP 工具名称或 glob（如 `mcp__*`、`<server>_*`）不再控制 MCP 访问；如有需要请迁移至 `mcp_tools`。
 - `mcps` 引用 pi-mcp-adapter 配置中的 server；连接细节留在 adapter 自己的配置里。
+  - **省略 `mcps`**：保留所有已发现用户级 server 的原生可用性。
+  - **`mcps: []` 且选中了 `pi-mcp-adapter`**：禁用所有已发现用户级 server（共享位置的 server 会被显式标记为 `disabled`；仅位于 agentDir 的 server 会从生成的实例 `mcp.json` 中省略）。
+  - **`mcps: []` 但未选中 `pi-mcp-adapter`**：该声明不生效，不会读取 MCP 配置、改变 server 可用性，也不会因配置文件损坏而报错。
+  - 受信任的项目级 MCP server 始终保持启用，不受 `mcps` 收窄。
 - 未写的字段保持原生 Pi 行为。
 
 [`examples/`](examples/) 中的两个文件与上面一一对应：`ask.json` 是播种的初始 profile，`example.json` 是全字段演示。

package/extensions/pi-profile/index.ts

@@ -234,6 +234,7 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 						overlay: state.overlay,
 						discoveredMcpServers,
 						disabledMcpServers,
+						projectMcpServers: [...mcpDiscovery.projectServers].sort(),
 						commands: pi.getCommands(),
 						tools: pi.getAllTools(),
 					});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-profile-switch",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Named profiles for Pi: reference skills, extensions, MCP servers, and tools per workflow, switched without restarting. Install: npm install -g pi-profile-switch (not pi install).",
   "type": "module",
   "keywords": [

package/skills/profile-config/SKILL.md

@@ -54,7 +54,7 @@ All fields are optional. Undeclared fields keep native Pi behavior or current st
 | `description` | `string` | Short description of the profile (e.g. `"Read-only review profile"`). |
 | `skills` | `string[]` | Skill names or globs to reference. When undeclared, available skills are not narrowed. |
 | `extensions` | `string[]` | Extension identifiers or globs to reference. When undeclared, available extensions are not narrowed. |
-| `mcps` | `string[]` | MCP server names or globs to reference. When undeclared, `mcps` itself adds no adapter requirement; a nonempty `mcp_tools` still requires `pi-mcp-adapter`. |
+| `mcps` | `string[]` | MCP server names or globs to reference. When undeclared, all discovered user-level servers keep their normal adapter availability and `mcps` adds no adapter requirement; a nonempty `mcp_tools` still requires `pi-mcp-adapter`. An explicit `mcps: []` disables every discovered user-level server when `pi-mcp-adapter` is selected, and is inert when the adapter is not selected. Project-level servers are never narrowed. |
 | `tools` | `string[]` | Whitelisted non-MCP tool names or globs (built-in and extension tools only). Live MCP tools remain usable independently of `tools`. When undeclared, tools are not narrowed and Pi's native tool set is kept. |
 | `mcp_tools` | `Record<string, string[]>` | Per-server MCP tool selection: literal server names mapped to literal adapter selectors (original or prefixed names; both forms may select the same tool). Globs are rejected. An omitted server allows all tools; a nonempty array allows only matches; an empty array (`[]`) denies all tools while keeping the server enabled. An empty object (`{}`) behaves like omission. Nonempty declarations require `pi-mcp-adapter`, even when `mcps` is omitted. |
 | `defaultProvider` | `string` | Default model provider (e.g. `"anthropic"`, `"openai"`). Effective only when declared together with `defaultModel`. |
@@ -70,7 +70,9 @@ All fields are optional. Undeclared fields keep native Pi behavior or current st
   "skills": [
     "profile-config"
   ],
-  "extensions": [],
+  "extensions": [
+    "pi-mcp-adapter"
+  ],
   "mcps": [],
   "tools": [
     "read",

package/src/launcher/initial-profile.ts

@@ -158,10 +158,20 @@ export async function resolveInitialProfile(
 		return { plan, discovery, projectDir, projectTrusted, warnings };
 	}
 
+	const discovery = await discoverLauncherResources({ ...context, projectTrusted });
+
 	const mcpToolsDef = (profile.definition as { mcp_tools?: Record<string, string[]> }).mcp_tools;
 	const hasMcpTools = mcpToolsDef !== undefined && Object.keys(mcpToolsDef).length > 0;
+	const declaredMcps = profile.definition.mcps;
+	const isEmptyMcps = declaredMcps !== undefined && declaredMcps.length === 0;
+	let adapterSelectedForEmptyMcps = false;
+	if (isEmptyMcps) {
+		const extSelection = await discovery.extensions.select(profile.definition.extensions ?? []);
+		adapterSelectedForEmptyMcps = extSelection.entries.some(isAdapterExtension);
+	}
 	const needsMcp = Boolean(
-		profile.definition.mcps?.length ||
+		(declaredMcps?.length ?? 0) > 0 ||
+		(isEmptyMcps && adapterSelectedForEmptyMcps) ||
 		hasMcpTools ||
 		(options?.overlay?.disabledMcps?.length ?? 0) > 0,
 	);
@@ -169,7 +179,6 @@ export async function resolveInitialProfile(
 		? await loadMergedMcpServers(context.agentDir, projectDir)
 		: undefined;
 
-	const discovery = await discoverLauncherResources({ ...context, projectTrusted });
 	const plan = await resolveProfile({
 		profile,
 		skills: discovery.skills,

package/src/profile-resolver.ts

@@ -228,23 +228,14 @@ export async function resolveProfile(input: ResolveInput): Promise<ActivationPla
 		input.discoveredMcpServers = Object.keys(input.mcpDiscovery.servers).sort();
 	}
 
-	let mcps: string[] | undefined;
-	if (definition.mcps !== undefined && definition.mcps.length > 0) {
-		if (input.discoveredMcpServers === undefined) {
-			throw new ActivationError(
-				`profile "${profile.name}" declares MCP servers but no adapter server discovery is available`,
-			);
-		}
-		mcps = expandReferences(definition.mcps, input.discoveredMcpServers, (name) => name, "MCP server", {
-			onZeroMatch: (reference) => unmatched.push(`mcp:${reference}`),
-		});
-	}
-
 	let selectedSkills = expandReferences(definition.skills ?? [], skills, (skill) => skill.name, "skill", {
 		onZeroMatch: (reference) => unmatched.push(`skill:${reference}`),
 	});
 
 	// Extension references resolve directly against discovered extensions.
+	// Resolve extensions before MCP so an explicitly empty `mcps` array can
+	// be distinguished from omission based on whether the profile selects the
+	// adapter (honor-empty-mcp-allowlist).
 	const selection = await extensions.select(definition.extensions ?? []);
 	for (const reference of selection.unmatched) unmatched.push(`extension:${reference}`);
 	let planExtensions: Array<{ id: string; entry: string; origin?: "package" | "local" | "path" }> = selection.entries.map(
@@ -255,6 +246,29 @@ export async function resolveProfile(input: ResolveInput): Promise<ActivationPla
 		}),
 	);
 
+	const hasAdapter = planExtensions.some((entry) => isAdapterExtension(entry));
+
+	let mcps: string[] | undefined;
+	if (definition.mcps !== undefined) {
+		if (definition.mcps.length > 0) {
+			if (input.discoveredMcpServers === undefined) {
+				throw new ActivationError(
+					`profile "${profile.name}" declares MCP servers but no adapter server discovery is available`,
+				);
+			}
+			mcps = expandReferences(definition.mcps, input.discoveredMcpServers, (name) => name, "MCP server", {
+				onZeroMatch: (reference) => unmatched.push(`mcp:${reference}`),
+			});
+		} else if (hasAdapter) {
+			if (input.mcpDiscovery === undefined) {
+				throw new ActivationError(
+					`profile "${profile.name}" declares MCP servers but no adapter server discovery is available`,
+				);
+			}
+			mcps = [];
+		}
+	}
+
 	// --- overlay narrowing (ticket 06) ---
 	// Overlay disable entries are names or globs stored as written and
 	// re-expanded at every resolution; unmatched literals fail and identify

package/src/startup-notifier.ts

@@ -21,8 +21,7 @@
  * (`workspaceDir`, i.e. `getProfileSwitchDir()`).
  */
 
-import { createHash } from "node:crypto";
-import { mkdir, open, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
 import path from "node:path";
 
 import { isRecord } from "./json-file.ts";
@@ -61,9 +60,6 @@ const MAX_ANNOUNCEMENTS = 50;
 const MAX_ID_LENGTH = 128;
 const MAX_MESSAGE_LENGTH = 400;
 const MAX_ACTION_LENGTH = 200;
-/** A pending display claim older than this is considered abandoned (the
- *  presenting process died mid-display) and may be reclaimed. */
-const CLAIM_STALE_MS = 10 * 60 * 1000;
 const HISTORY_SCHEMA_VERSION = 1;
 
 export interface NoticeSurface {
@@ -276,7 +272,7 @@ function parseNpmLatest(text: string): string {
 }
 
 // ---------------------------------------------------------------------------
-// Global history and exclusive display claims
+// Global history
 // ---------------------------------------------------------------------------
 
 function notificationsDir(workspaceDir: string): string {
@@ -316,41 +312,6 @@ async function recordDisplayed(dir: string, key: string): Promise<void> {
 	await atomicWriteJson(path.join(dir, "displayed.json"), { schemaVersion: HISTORY_SCHEMA_VERSION, keys: [...keys] });
 }
 
-function claimFile(dir: string, key: string): string {
-	const digest = createHash("sha256").update(key).digest("hex");
-	return path.join(dir, "claims", `${digest}.json`);
-}
-
-/** Exclusive per-key claim around synchronous presentation: concurrent
- *  launches (same process or separate ones) cannot both display the same
- *  notice. Abandoned claims go stale and become reclaimable. */
-async function tryAcquireClaim(dir: string, key: string, nowMs: number): Promise<boolean> {
-	const file = claimFile(dir, key);
-	await mkdir(path.dirname(file), { recursive: true });
-	for (let attempt = 0; attempt < 2; attempt++) {
-		try {
-			const handle = await open(file, "wx");
-			try {
-				await handle.writeFile(JSON.stringify({ key, at: nowMs }));
-			} finally {
-				await handle.close();
-			}
-			return true;
-		} catch (error) {
-			if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
-			const existing = await readJsonQuiet(file);
-			const at = isRecord(existing) && typeof existing.at === "number" ? existing.at : 0;
-			if (nowMs - at <= CLAIM_STALE_MS) return false;
-			await rm(file, { force: true });
-		}
-	}
-	return false;
-}
-
-async function releaseClaim(dir: string, key: string): Promise<void> {
-	await rm(claimFile(dir, key), { force: true });
-}
-
 // ---------------------------------------------------------------------------
 // Candidate evaluation and presentation
 // ---------------------------------------------------------------------------
@@ -425,16 +386,8 @@ function report(surface: NoticeSurface, message: string): void {
 }
 
 async function present(dir: string, candidate: Candidate, surface: NoticeSurface, nowMs: number): Promise<void> {
-	if (!(await tryAcquireClaim(dir, candidate.key, nowMs))) return;
-	try {
-		surface.display(candidate.message, candidate.level);
-		await recordDisplayed(dir, candidate.key);
-	} catch (error) {
-		// A failed presentation releases its claim so a later launch retries.
-		await releaseClaim(dir, candidate.key);
-		throw error;
-	}
-	await releaseClaim(dir, candidate.key);
+	surface.display(candidate.message, candidate.level);
+	await recordDisplayed(dir, candidate.key);
 }
 
 // ---------------------------------------------------------------------------

package/src/switching/status.ts

@@ -73,6 +73,9 @@ export function buildStatusReport(input: {
 	overlay?: RuntimeOverlay;
 	discoveredMcpServers: string[];
 	disabledMcpServers: string[];
+	/** Project-owned server names from trust-gated MCP discovery; kept enabled
+	 *  when the profile declares a defined `mcps` selection. */
+	projectMcpServers?: string[];
 	commands: RegisteredCommand[];
 	tools: RegisteredTool[];
 }): StatusReport {
@@ -89,9 +92,15 @@ export function buildStatusReport(input: {
 		disabled = input.discoveredMcpServers.filter((name) => adapterDisabled.has(name));
 		missing = [];
 	} else {
-		enabled = plan.mcps;
+		const projectMcpServers = new Set(input.projectMcpServers ?? []);
+		const adapterDisabled = new Set(input.disabledMcpServers);
+		const explicitMcps = new Set(plan.mcps);
+		const projectEnabled = input.discoveredMcpServers.filter(
+			(name) => projectMcpServers.has(name) && !explicitMcps.has(name) && !adapterDisabled.has(name),
+		);
+		enabled = [...plan.mcps, ...projectEnabled].sort();
 		disabled = input.discoveredMcpServers.filter((name) => !enabled.includes(name));
-		missing = enabled.filter((name) => !discovered.has(name));
+		missing = plan.mcps.filter((name) => !discovered.has(name));
 	}
 
 	const mcp = { enabled, disabled, missing };