pi-profile-switch 0.4.3 → 0.4.4

package/README.md

@@ -59,7 +59,6 @@ In the TUI, the `/profile` command family manages everything in-session:
 | `/profile use <name>` / `/profile reload` | Switch / reload without restarting (rollback on failure) |
 | `/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 |
 
 All commands work in non-interactive modes (`--mode rpc|print|json`); CRUD wizards are TUI-only.
 

package/README.zh-CN.md

@@ -59,7 +59,6 @@ Profile 只**引用**资源，从不复制资源。已安装的包和标准目
 | `/profile use <name>` / `/profile reload` | 会话内切换 / 重载（失败自动回滚） |
 | `/profile create\|edit\|delete\|duplicate` | 向导式 profile 增删改（仅 TUI） |
 | `/profile customize` / `/profile reset` | 仅本次会话收窄活动 profile |
-| `/mcp enable\|disable <server>` | 在活动 profile 中开关 MCP server |
 
 非交互模式（`--mode rpc|print|json`）下命令同样生效；CRUD 向导仅 TUI 可用。
 

package/extensions/pi-profile/index.ts

@@ -21,8 +21,6 @@ import {
 	runProfileDuplicateWizard,
 	runProfileEditWizard,
 } from "../../src/switching/profile-wizard.ts";
-import { probeAdapterPresence } from "../../src/mcp-coordination.ts";
-import { setMcpServerEnabled } from "../../src/switching/mcp-toggle.ts";
 import { buildStatusReport, formatStatusMarkdown } from "../../src/switching/status.ts";
 import { switchProfile, type SwitchDeps } from "../../src/switching/switch-profile.ts";
 import { getGlobalStateDir } from "../../src/workspace.ts";
@@ -53,9 +51,6 @@ import { getGlobalStateDir } from "../../src/workspace.ts";
  *   is stale afterwards.
  * - list/status ship structured `details` payloads (`{kind, profiles}` /
  *   `{kind, report}`) for RPC consumers (ticket 11).
- * - `/mcp enable|disable <server>`: edit the active profile's mcp array in
- *   its owning catalog, then reload (ticket 10). Fails clearly with the
- *   adapter absent; notifies before the reload (stale context after).
  *
  * Pi re-executes this module on reload, so post-reload state is established
  * exclusively through `session_start` — nothing stale survives.
@@ -383,69 +378,4 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 			}
 		},
 	});
-
-	// Persistent profile-scoped MCP toggles (ticket 10): edit the active
-	// profile's mcp array in its owning catalog, then reload so the runtime
-	// and the republished allowlist match. The adapter's own configuration
-	// (mcp.json files) is never written.
-	pi.registerCommand("mcp", {
-		description: "pi-profile: /mcp enable <server> | /mcp disable <server>",
-		handler: async (args, ctx) => {
-			const notify = (message: string, level: "info" | "warning" | "error") => {
-				try {
-					ctx.ui?.notify(message, level);
-				} catch {
-					// stale context after reload — see /profile
-				}
-			};
-			const [action, server] = args.trim().split(/\s+/).filter(Boolean);
-			if (!["enable", "disable"].includes(action ?? "") || server === undefined) {
-				notify("usage: /mcp enable <server> | /mcp disable <server>", "error");
-				return;
-			}
-			try {
-				const plan = await readLaunchPlanFile(runtimeDir);
-				if (plan?.agentDir === undefined) {
-					notify("pi-profile: launch plan is missing agentDir — cannot toggle MCP servers", "error");
-					return;
-				}
-				if (!probeAdapterPresence(pi.events)) {
-					throw new Error(
-						"pi-mcp-adapter is not active in this session — /mcp enable|disable requires it " +
-							"(select the adapter in the profile's extensions).",
-					);
-				}
-				const result = await setMcpServerEnabled(
-					{ realAgentDir: plan.agentDir, cwd: ctx.cwd, profile: { name: plan.profile, source: plan.source } },
-					server,
-					action === "enable",
-				);
-				if (!result.changed) {
-					notify(`MCP server "${server}" is already ${action}d in profile "${plan.profile}"`, "info");
-					return;
-				}
-				// Notify BEFORE the reload: this context is stale afterwards.
-				notify(
-					`${action}d MCP server "${server}" in profile "${plan.profile}" (mcps: [${result.mcps.join(", ")}]); reloading`,
-					"info",
-				);
-				const switched = await switchProfile(plan.profile, {
-					runtimeDir,
-					realAgentDir: plan.agentDir,
-					cwd: ctx.cwd,
-					waitForIdle: () => ctx.waitForIdle(),
-					reload: () => ctx.reload(),
-					// Same staleness probe as /profile: interactive Pi
-					// swallows reload refusals; a live context afterwards
-					// means the reload never ran.
-					assertStale: () => {
-						void ctx.cwd;
-					},
-				}, { reloadCurrent: true });
-				for (const warning of switched.warnings) notify(warning, "warning");
-			} catch (error) {
-				notify(error instanceof Error ? error.message : String(error), "error");
-			}
-		},
-	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-profile-switch",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Named profiles for Pi: reference skills, extensions, MCP servers, and tools per workflow, switched without restarting.",
   "type": "module",
   "keywords": [

package/src/switching/mcp-toggle.ts

@@ -1,71 +0,0 @@
-/**
- * McpToggle: persistent, profile-scoped `/mcp enable|disable` (ticket 10).
- *
- * The profile's `mcps` array in its OWNING catalog is the profile-scoped
- * state store (ticket 04 established that pi-mcp-adapter@2.33.0 has no
- * allowlist/profile-state API — ADR-0002's assumed store does not exist;
- * pi-profile owns the contract). Runtime effect flows through the standard
- * rewrite-settings-and-reload path: the post-reload session_start
- * republishes the allowlist over the coordination channel.
- *
- * Invariants:
- * - Enable accepts only adapter-discovered names (fail fast on typos);
- *   disable also removes names the adapter no longer reports (stale
- *   cleanup).
- * - The built-in default profile has no catalog entry — toggling it is a
- *   clear error, not a synthetic write.
- * - Only the ACTIVE profile's array changes; other profiles and the
- *   adapter's own configuration (global mcp.json, project .pi/mcp.json)
- *   are never modified.
- */
-
-import { discoverAdapterServerNames } from "../mcp-config.ts";
-import { CatalogError, DEFAULT_PROFILE_NAME, type ProfileDefinition } from "../profile-catalog.ts";
-import { readTrustInputs as readTrust } from "../launcher/initial-profile.ts";
-import { catalogStore, readCatalogScope, type CatalogScope } from "./profile-crud.ts";
-
-export async function setMcpServerEnabled(
-	input: { realAgentDir: string; cwd: string; profile: { name: string; source: string } },
-	server: string,
-	enabled: boolean,
-): Promise<{ mcps: string[]; changed: boolean }> {
-	if (input.profile.name === DEFAULT_PROFILE_NAME || input.profile.source === "builtin") {
-		throw new CatalogError(
-			`the built-in default profile has no catalog entry — create a named profile (/profile create) to toggle MCP servers`,
-		);
-	}
-	const scope = input.profile.source as CatalogScope;
-	if (scope !== "global" && scope !== "project") {
-		throw new CatalogError(`profile "${input.profile.name}" has no writable owning catalog (source: ${input.profile.source})`);
-	}
-
-	const { projectTrusted } = await readTrust({ agentDir: input.realAgentDir, cwd: input.cwd });
-	if (scope === "project" && !projectTrusted) {
-		throw new CatalogError(`project catalog is unavailable: ${input.cwd} is not trusted`);
-	}
-	const discovered = await discoverAdapterServerNames(input.realAgentDir, projectTrusted ? input.cwd : undefined);
-	if (enabled && !discovered.includes(server)) {
-		throw new CatalogError(
-			`unknown MCP server "${server}" — adapter discovered: [${discovered.join(", ") || "(none)"}]`,
-		);
-	}
-
-	const definitions = await readCatalogScope(input, scope);
-	const definition = definitions.get(input.profile.name);
-	if (definition === undefined) {
-		throw new CatalogError(`profile "${input.profile.name}" not found in the ${scope} catalog`);
-	}
-
-	const current = definition.mcps ?? [];
-	if (enabled === current.includes(server)) {
-		return { mcps: current, changed: false }; // already in the requested state
-	}
-	const next = enabled ? [...current, server] : current.filter((name) => name !== server);
-	// Drop the key entirely when empty (exactOptionalPropertyTypes; a
-	// written `mcps: undefined` would also misrepresent the definition).
-	const rest = { ...definition };
-	delete rest.mcps;
-	const updated: ProfileDefinition = next.length > 0 ? { ...rest, mcps: next } : rest;
-	await catalogStore(input, scope).upsert(input.profile.name, updated);
-	return { mcps: next, changed: true };
-}