pi-profile-switch 0.9.1 → 0.10.0

package/README.md

@@ -107,21 +107,28 @@ If you used an earlier version that stored all profiles in a single `profiles.js
 
 ## Commands
 
-In the TUI, the `/profile` command family manages everything in-session:
+The `/profile` command family manages everything in-session:
 
 | Command | What it does |
 | --- | --- |
-| `/profile` | Interactive profile picker |
-| `/profile list` / `/profile status` | Show profiles / active profile details |
+| `/profile` | Interactive profile picker; without interactive UI it prints the profile list instead |
 | `/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 |
+| `/profile status` | Active profile details: resolved resources and paths, stored overlay, MCP server tri-state |
+| `/profile overlay disable\|enable skill\|extension\|mcp\|tool <name-or-glob>` | Narrow / un-narrow the active profile for this session only; `disable` entries accept names or globs |
+| `/profile overlay clear` | Discard the overlay and reactivate the profile exactly as declared |
 
-All commands work in non-interactive modes (`--mode rpc|print|json`); CRUD wizards are TUI-only.
+All forms work in every mode, including non-interactive ones (`--mode rpc|print|json`); the bare selector degrades to the profile list where no interactive UI exists. The overlay is a runtime-only narrowing: it is never written to a catalog file and never survives a restart. Tools follow the same disable/enable model as the other resource kinds: a tool `disable` entry narrows the profile's resolved tool references — or the runtime's full available tool set when the profile declares no `tools`.
+
+Removed subcommands and their replacements:
+
+| Removed | Replacement |
+| --- | --- |
+| `/profile create` / `/profile edit` / `/profile delete` / `/profile duplicate` | edit the catalog JSON files directly, or configure profiles conversationally with the [`profile-config`](skills/profile-config/SKILL.md) skill |
+| the `tools` replace-form of `/profile overlay` | `/profile overlay disable tool <name-or-glob>` (disable the complement, with globs) or declare the fixed set in the profile's `tools` field |
 
 ## Docs
 
-- [Architecture](docs/architecture/overview.md) · [ADRs](docs/adr/) · [Glossary](CONTEXT.md) (Chinese)
+- [Architecture](docs/architecture/overview.md) · [ADRs](docs/adr/) · [Glossary](CONTEXT.md)
 - JSON Schemas: [`schemas/`](schemas/)
 
 ## License

package/README.zh-CN.md

@@ -107,17 +107,24 @@ pi-profile-switch 会向全局 `profiles/` 目录播种一个初始 **`ask`** pr
 
 ## 命令
 
-在 TUI 中，`/profile` 命令族完成所有会话内操作：
+`/profile` 命令族完成所有会话内操作：
 
 | 命令 | 作用 |
 | --- | --- |
-| `/profile` | 交互式选择 profile |
-| `/profile list` / `/profile status` | 列出 profile / 查看活动 profile 详情 |
+| `/profile` | 交互式选择 profile；无交互界面时打印 profile 列表 |
 | `/profile use <name>` / `/profile reload` | 会话内切换 / 重载（失败自动回滚） |
-| `/profile create\|edit\|delete\|duplicate` | 向导式 profile 增删改（仅 TUI） |
-| `/profile customize` / `/profile reset` | 仅本次会话收窄活动 profile |
+| `/profile status` | 查看活动 profile 详情：解析后的资源与路径、已存 overlay、MCP server 三态 |
+| `/profile overlay disable\|enable skill\|extension\|mcp\|tool <name-or-glob>` | 仅本次会话收窄 / 恢复活动 profile；`disable` 接受名称或 glob |
+| `/profile overlay clear` | 丢弃 overlay，完全按定义重新激活 profile |
 
-非交互模式（`--mode rpc|print|json`）下命令同样生效；CRUD 向导仅 TUI 可用。
+所有命令在非交互模式（`--mode rpc|print|json`）下同样生效；裸 `/profile` 在无交互界面时降级为 profile 列表。overlay 是会话级收窄：绝不写入 catalog 文件，也不会跨重启保留。tool 与其他资源类别使用相同的 disable/enable 模型：tool `disable` 条目收窄 profile 解析出的工具引用；profile 未声明 `tools` 时，则收窄运行时的全部可用工具集。
+
+已移除子命令及其替代：
+
+| 移除 | 替代 |
+| --- | --- |
+| `/profile create` / `/profile edit` / `/profile delete` / `/profile duplicate` | 直接编辑 catalog JSON 文件，或通过 [`profile-config`](skills/profile-config/SKILL.md) skill 对话式配置 |
+| `/profile overlay` 的 `tools` 替换式 | `/profile overlay disable tool <name-or-glob>`（用 glob 禁用其余工具），或在 profile 的 `tools` 字段中声明固定集合 |
 
 ## 文档
 

package/bin/pi-profile.ts

@@ -16,6 +16,7 @@ import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { ExtensionError } from "../src/extension-discovery.ts";
 import { parseLauncherArgs } from "../src/launcher/args.ts";
 import { UnknownProfileError, resolveInitialProfile } from "../src/launcher/initial-profile.ts";
+import { untrustedProjectDiagnostic } from "../src/launcher/untrusted-project-diagnostic.ts";
 import { sweepStaleInstances } from "../src/launcher/runtime-cleanup.ts";
 import { spawnPi } from "../src/launcher/spawn.ts";
 import { McpConfigError, MissingMcpAdapterError } from "../src/mcp-config.ts";
@@ -37,7 +38,7 @@ try {
 	}
 	// Fails before spawning when the profile is unknown or cannot activate.
 	// --approve/--no-approve are consumed here as a one-run trust input.
-	const { plan, discovery, projectDir, warnings } = await resolveInitialProfile(args.profile, {
+	const { plan, discovery, projectDir, projectTrusted, warnings } = await resolveInitialProfile(args.profile, {
 		agentDir,
 		cwd: process.cwd(),
 		trustOverride: args.trustOverride,
@@ -45,6 +46,13 @@ try {
 	for (const warning of warnings) {
 		console.error(`pi-profile: warning: ${warning}`);
 	}
+	// Untrusted-project notice: fires identically for every profile (default
+	// included) because it is driven by the trust determination, not by which
+	// profile branch resolution took. Startup continues either way.
+	const untrustedNotice = untrustedProjectDiagnostic(process.cwd(), projectTrusted);
+	if (untrustedNotice) {
+		console.error(`pi-profile: warning: ${untrustedNotice}`);
+	}
 	// Stale per-launch instance dirs (dead pid, or no pid past the grace
 	// window) are swept before this launch materializes its own. Unrecognized
 	// entries are dispositioned per content scan: kept + reported when they

package/bin/postinstall.js

@@ -12,8 +12,8 @@
  * launcher instead: `bin/pi-profile.ts` calls the runtime ensure
  * (src/starter-assets.ts) on every launch, before resolving the initial
  * profile. The authoritative behavior contract for both assets lives in
- * openspec/specs/profile-catalog/spec.md ("播种 starter profile" and
- * "分发 profile-config skill"); keep this script's rules in sync with
+ * openspec/specs/profile-catalog/spec.md ("Seeding the starter profile" and
+ * "Distributing the profile-config skill"); keep this script's rules in sync with
  * src/starter-assets.ts, which is the single TS implementation.
  *
  * Idempotent and conservative:

package/extensions/pi-profile/index.ts

@@ -6,21 +6,8 @@ import { readTrustInputs } from "../../src/launcher/initial-profile.ts";
 import { discoverAdapterServerNames } from "../../src/mcp-config.ts";
 import { RuntimeStateStore } from "../../src/runtime-state-store.ts";
 import { applyLaunchPlan, readLaunchPlanFile } from "../../src/switching/apply-plan.ts";
-import { CUSTOMIZE_USAGE, customizeOverlay, parseCustomizeArgs, resetOverlay } from "../../src/switching/customize.ts";
+import { OVERLAY_USAGE, applyOverlayMutation, clearOverlay, parseOverlayArgs } from "../../src/switching/overlay.ts";
 import { formatProfileList, listProfiles } from "../../src/switching/list-profiles.ts";
-import {
-	createProfile,
-	deleteProfile,
-	duplicateProfile,
-	editProfile,
-	readCatalogScope,
-} from "../../src/switching/profile-crud.ts";
-import type { ProfileDefinition } from "../../src/profile-catalog.ts";
-import {
-	runProfileCreateWizard,
-	runProfileDuplicateWizard,
-	runProfileEditWizard,
-} from "../../src/switching/profile-wizard.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";
@@ -37,18 +24,15 @@ import { getGlobalStateDir } from "../../src/workspace.ts";
  *   via `before_agent_start`.
  * - `/profile use <name>` / `/profile reload`: in-session switching without
  *   restarting the Pi process (src/switching/switch-profile.ts).
- * - `/profile customize` / `/profile reset`: runtime overlay (ticket 06).
- * - `/profile` (selector), `/profile list`, `/profile status`:
- *   observability surface (ticket 07). Status combines the active launch
- *   plan, the stored overlay, fresh MCP discovery, and Pi's actual command
- *   registrations (the winner evidence for same-name conflicts).
- * - `/profile create|edit|delete|duplicate`: catalog CRUD wizards (ticket 09).
- *   CRUD is TUI-only (ticket 11): gated on `ctx.mode === "tui"` with a
- *   mode-aware refusal. Mutations apply via the standard reload path;
- *   mutation success is notified BEFORE the reload — the command context
- *   is stale afterwards.
- * - list/status ship structured `details` payloads (`{kind, profiles}` /
- *   `{kind, report}`) for RPC consumers (ticket 11).
+ * - `/profile overlay ...`: runtime overlay (ticket 06; renamed with the
+ *   command word — disable/enable/tools/clear).
+ * - `/profile` (selector; degrades to the list without dialog-capable UI)
+ *   and `/profile status`: observability surface (ticket 07). Status
+ *   combines the active launch plan, the stored overlay, fresh MCP
+ *   discovery, and Pi's actual command registrations (the winner evidence
+ *   for same-name conflicts).
+ * - The degraded list and status ship structured `details` payloads
+ *   (`{kind, profiles}` / `{kind, report}`) for RPC consumers (ticket 11).
  *
  * Pi re-executes this module on reload, so post-reload state is established
  * exclusively through `session_start` — nothing stale survives.
@@ -92,7 +76,7 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.registerCommand("profile", {
-		description: "pi-profile: /profile [use|reload|customize|reset|list|status|create|edit|delete|duplicate]",
+		description: "pi-profile: /profile [use|reload|status|overlay]",
 		handler: async (args, ctx) => {
 			const [subcommandRaw, ...rest] = args.trim().split(/\s+/).filter(Boolean);
 			const subcommand = subcommandRaw ?? ""; // bare /profile → selector
@@ -107,35 +91,15 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 					// stale context after reload — see above
 				}
 			};
-			const usage = `usage: /profile [use <name> | reload | ${CUSTOMIZE_USAGE} | reset | list | status | create | edit <name> | delete <name> | duplicate]`;
+			const usage = `usage: /profile [use <name> | reload | status | ${OVERLAY_USAGE}]`;
 			if (subcommand === "use" && rest.length === 0) {
 				notify("usage: /profile use <name>", "error");
 				return;
 			}
-			if (
-				subcommand !== "" &&
-				![
-					"use",
-					"reload",
-					"customize",
-					"reset",
-					"list",
-					"status",
-					"create",
-					"edit",
-					"delete",
-					"duplicate",
-				].includes(
-					subcommand,
-				)
-			) {
+			if (subcommand !== "" && !["use", "reload", "status", "overlay"].includes(subcommand)) {
 				notify(usage, "error");
 				return;
 			}
-			if (["edit", "delete"].includes(subcommand) && rest[0] === undefined) {
-				notify(`usage: /profile ${subcommand} <name>`, "error");
-				return;
-			}
 			try {
 				const plan = await readLaunchPlanFile(runtimeDir);
 				if (plan?.agentDir === undefined) {
@@ -148,6 +112,7 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 					runtimeDir,
 					realAgentDir: plan.agentDir,
 					cwd: ctx.cwd,
+					getAllTools: () => pi.getAllTools(),
 					waitForIdle: () => ctx.waitForIdle(),
 					reload: () => ctx.reload(),
 					// A real reload invalidates this context (Pi re-executes
@@ -172,148 +137,22 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 					notify(`profile reloaded: ${result.profile}`, "info");
 					return;
 				}
-				if (subcommand === "customize") {
-					const result = await customizeOverlay(deps, parseCustomizeArgs(rest.join(" ")));
-					for (const warning of result.warnings) notify(warning, "warning");
-					notify(`overlay updated: ${result.profile}`, "info");
-					return;
-				}
-				if (subcommand === "reset") {
-					const result = await resetOverlay(deps);
-					for (const warning of result.warnings) notify(warning, "warning");
-					notify(`overlay cleared: ${result.profile}`, "info");
-					return;
-				}
-				// Profile catalog CRUD (ticket 09): TUI-only wizards; mutations
-				// land in the chosen scope file. Editing the active profile
-				// reloads immediately; deleting the active profile requires a
-				// replacement chosen up front, then switches to it.
-				if (["create", "edit", "delete", "duplicate"].includes(subcommand)) {
-					if (ctx.mode !== "tui") {
-						notify(`/profile ${subcommand} requires TUI mode (current mode: ${ctx.mode})`, "error");
-						return;
-					}
-					const scopeInput = { realAgentDir: plan.agentDir, cwd: ctx.cwd };
-					if (subcommand === "create") {
-						const { projectTrusted: canWriteProject } = await readTrustInputs({
-							agentDir: plan.agentDir,
-							cwd: ctx.cwd,
-						});
-						const wizard = await runProfileCreateWizard(ctx.ui, { projectTrusted: canWriteProject });
-						if (wizard === undefined) return;
-						await createProfile(scopeInput, wizard.scope, wizard.name, wizard.definition);
-						notify(`created profile "${wizard.name}" (${wizard.scope}) — activate with /profile use ${wizard.name}`, "info");
-						return;
-					}
-					if (subcommand === "duplicate") {
-						const entries = await listProfiles(scopeInput);
-						// Read each scope once (trust-gated — never reads an
-						// untrusted project's catalog).
-						const byScope = {
-							global: await readCatalogScope(scopeInput, "global"),
-							project: await readCatalogScope(scopeInput, "project"),
-						};
-						const candidates: Array<{ name: string; source: "global" | "project"; definition: ProfileDefinition }> = [];
-						for (const entry of entries) {
-							if (entry.source === "builtin") continue;
-							const definition = byScope[entry.source].get(entry.name);
-							if (definition !== undefined) {
-								candidates.push({ name: entry.name, source: entry.source, definition });
-							}
-						}
-						const wizard = await runProfileDuplicateWizard(ctx.ui, { candidates });
-						if (wizard === undefined) return;
-						await duplicateProfile(scopeInput, wizard.scope, wizard.sourceName, wizard.newName);
-						notify(
-							`duplicated "${wizard.sourceName}" → "${wizard.newName}" (${wizard.scope}) — the full definition was copied`,
-							"info",
-						);
-						return;
-					}
-					const name = rest[0] as string;
-					if (subcommand === "edit") {
-						// Edit the WINNING definition in its source scope.
-						const entries = await listProfiles(scopeInput);
-						const existing = entries.find((entry) => entry.name === name);
-						if (existing === undefined || existing.source === "builtin") {
-							notify(`profile "${name}" not found in a writable catalog`, "error");
-							return;
-						}
-						const definition = (await readCatalogScope(scopeInput, existing.source)).get(name);
-						if (definition === undefined) {
-							notify(`profile "${name}" not found in the ${existing.source} catalog`, "error");
-							return;
-						}
-						const wizard = await runProfileEditWizard(ctx.ui, {
-							existing: { name, source: existing.source, definition },
-						});
-						if (wizard === undefined) return;
-						await editProfile(scopeInput, wizard.scope, wizard.name, wizard.definition);
-						if (name === plan.profile) {
-							notify(`saved profile "${name}"; reloading`, "info");
-							await switchProfile(plan.profile, deps, { reloadCurrent: true });
-						} else {
-							notify(`saved profile "${name}" (inactive — runtime untouched)`, "info");
-						}
+				if (subcommand === "overlay") {
+					const command = parseOverlayArgs(rest.join(" "));
+					if (command.kind === "clear") {
+						const result = await clearOverlay(deps);
+						for (const warning of result.warnings) notify(warning, "warning");
+						notify(`overlay cleared: ${result.profile}`, "info");
 						return;
 					}
-					// delete
-					const entries = await listProfiles(scopeInput);
-					const existing = entries.find((entry) => entry.name === name);
-					if (existing === undefined || existing.source === "builtin") {
-						notify(`profile "${name}" not found in a writable catalog`, "error");
-						return;
-					}
-					// Both scopes hold the name: choose which record to delete.
-					let scope = existing.source as "global" | "project";
-					const projectCatalog = await readCatalogScope(scopeInput, "project");
-					const globalCatalog = await readCatalogScope(scopeInput, "global");
-					if (projectCatalog.has(name) && globalCatalog.has(name)) {
-						const chosen = await ctx.ui.select(`delete "${name}" from which catalog?`, ["global", "project"]);
-						if (chosen === undefined) return;
-						scope = chosen as "global" | "project";
-					}
-					// If the OTHER scope keeps the name alive, deletion reveals
-					// it and the session can stay on the revealed same-name
-					// definition (symmetric: project→global and global→project).
-					const survivesElsewhere =
-						(scope === "project" && globalCatalog.has(name)) || (scope === "global" && projectCatalog.has(name));
-					let replacement: string | undefined;
-					if (name === plan.profile && !survivesElsewhere) {
-						const survivors = entries.filter((entry) => entry.name !== name);
-						const chosen = await ctx.ui.select(
-							`"${name}" is active — switch to which profile?`,
-							survivors.map((entry) => `${entry.name} [${entry.source}]`),
-						);
-						if (chosen === undefined) return;
-						replacement = chosen.split(" [")[0];
-					}
-					await deleteProfile(scopeInput, scope, name, { activeProfile: plan.profile, replacement });
-					if (name === plan.profile) {
-						if (replacement !== undefined) {
-							notify(`deleted "${name}" (${scope}); switching to ${replacement}`, "info");
-							await switchProfile(replacement, deps, { clearOverlay: true });
-						} else {
-							notify(`deleted the ${scope} record of "${name}"; reloading the revealed definition`, "info");
-							await switchProfile(plan.profile, deps, { reloadCurrent: true });
-						}
-					} else {
-						notify(`deleted profile "${name}" (${scope})`, "info");
-					}
+					const result = await applyOverlayMutation(deps, command.mutate);
+					for (const warning of result.warnings) notify(warning, "warning");
+					notify(`overlay updated: ${result.profile}`, "info");
 					return;
 				}
 				// Observability surface (ticket 07): bare /profile opens the
-				// selector; list/status render via a displayed custom message.
+				// selector; status renders via a displayed custom message.
 				const entries = await listProfiles({ realAgentDir: plan.agentDir, cwd: ctx.cwd });
-				if (subcommand === "list") {
-					pi.sendMessage({
-						customType: "pi-profile",
-						content: formatProfileList(entries, plan.profile),
-						display: true,
-						details: { kind: "list", profiles: entries },
-					});
-					return;
-				}
 				if (subcommand === "status") {
 					const { projectTrusted } = await readTrustInputs({ agentDir: plan.agentDir, cwd: ctx.cwd });
 					const stateDir = plan.source === "project" ? path.join(ctx.cwd, ".pi") : getGlobalStateDir(plan.agentDir);
@@ -338,13 +177,17 @@ export default function piProfileExtension(pi: ExtensionAPI): void {
 					});
 					return;
 				}
-				// Bare /profile: the interactive selector. Without dialog-capable
-				// UI (print mode), fall back to the list.
-				if (!ctx.hasUI) {
+				// Bare /profile: the interactive selector. Degradation boundary
+				// (delta "Observability surface"): outside TUI mode the selector
+				// does not run — the bare invocation degrades to the trust-gated
+				// list, carrying the structured payload the removed `list`
+				// subcommand emitted.
+				if (!ctx.hasUI || ctx.mode !== "tui") {
 					pi.sendMessage({
 						customType: "pi-profile",
 						content: formatProfileList(entries, plan.profile),
 						display: true,
+						details: { kind: "list", profiles: entries },
 					});
 					return;
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-profile-switch",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "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": [