@f5-sales-demo/xcsh 21.43.2 → 21.43.4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "21.43.2",
+	"version": "21.43.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -64,13 +64,13 @@
 	},
 	"dependencies": {
 		"@agentclientprotocol/sdk": "1.4.0",
-		"@f5-sales-demo/pi-agent-core": "21.43.2",
-		"@f5-sales-demo/pi-ai": "21.43.2",
-		"@f5-sales-demo/pi-natives": "21.43.2",
-		"@f5-sales-demo/pi-resource-management": "21.43.2",
-		"@f5-sales-demo/pi-tui": "21.43.2",
-		"@f5-sales-demo/pi-utils": "21.43.2",
-		"@f5-sales-demo/xcsh-stats": "21.43.2",
+		"@f5-sales-demo/pi-agent-core": "21.43.4",
+		"@f5-sales-demo/pi-ai": "21.43.4",
+		"@f5-sales-demo/pi-natives": "21.43.4",
+		"@f5-sales-demo/pi-resource-management": "21.43.4",
+		"@f5-sales-demo/pi-tui": "21.43.4",
+		"@f5-sales-demo/pi-utils": "21.43.4",
+		"@f5-sales-demo/xcsh-stats": "21.43.4",
 		"@mozilla/readability": "^0.6",
 		"@sinclair/typebox": "0.34.52",
 		"@tobilu/qmd": "2.8.3",

package/src/cli/args.ts

@@ -3,6 +3,7 @@
  */
 import { type Effort, THINKING_EFFORTS } from "@f5-sales-demo/pi-ai";
 import { APP_NAME, CONFIG_DIR_NAME, logger } from "@f5-sales-demo/pi-utils";
+import { CliUsageError } from "@f5-sales-demo/pi-utils/cli";
 import chalk from "chalk";
 import { parseEffort } from "../thinking";
 import {
@@ -49,6 +50,7 @@ export interface Args {
 	models?: string[];
 	tools?: string[];
 	noTools?: boolean;
+	mcp?: boolean;
 	noMcp?: boolean;
 	noLsp?: boolean;
 	noPty?: boolean;
@@ -159,6 +161,9 @@ const APPLY: Record<LaunchFlagName, (result: Args, value: string | true) => void
 	"no-tools": r => {
 		r.noTools = true;
 	},
+	mcp: r => {
+		r.mcp = true;
+	},
 	"no-mcp": r => {
 		r.noMcp = true;
 	},
@@ -399,6 +404,8 @@ export function parseArgs(args: string[], extensionFlags?: ExtensionFlagRegistry
 		result.unrecognizedFlags.push({ token, name: name ?? token.replace(/^-+/, "") });
 	}
 
+	if (result.mcp && result.noMcp) throw new CliUsageError("--mcp cannot be combined with --no-mcp");
+	if (result.mcp && result.noTools) throw new CliUsageError("--mcp cannot be combined with --no-tools");
 	return result;
 }
 

package/src/cli/flag-spec.ts

@@ -79,6 +79,7 @@ export const LAUNCH_FLAGS = defineFlags({
 	"provider-session-id": { arity: "value", description: "Resume a provider-side session", hidden: true },
 	models: { arity: "value", description: "Comma-separated model patterns for Ctrl+P cycling" },
 	"no-tools": { arity: "boolean", description: "Disable all built-in tools" },
+	mcp: { arity: "boolean", description: "Enable MCP servers for this run" },
 	"no-mcp": { arity: "boolean", description: "Disable MCP server discovery and tools" },
 	"no-lsp": { arity: "boolean", description: "Disable LSP tools, formatting, and diagnostics" },
 	"no-pty": { arity: "boolean", description: "Disable PTY-based interactive bash execution" },

package/src/cli/plugin-cli.ts

@@ -7,6 +7,7 @@
 import * as os from "node:os";
 import { createInterface } from "node:readline/promises";
 import { APP_NAME, getProjectDir } from "@f5-sales-demo/pi-utils";
+import { CliUsageError } from "@f5-sales-demo/pi-utils/cli";
 import chalk from "chalk";
 import { preloadPluginRoots, resolveOrDefaultProjectRegistryPath } from "../discovery/helpers";
 import { discoverAndLoadExtensions } from "../extensibility/extensions";
@@ -294,7 +295,7 @@ export async function reviewAndExecuteIntegrationSetup(handle: IntegrationHandle
 }
 
 async function handleIntegrationSetup(args: string[], flags: { json?: boolean }): Promise<void> {
-	if (flags.json) throw new Error("plugin setup is human-only and does not accept --json");
+	if (flags.json) throw new CliUsageError("plugin setup is human-only and does not accept --json");
 	if (args.length !== 1) throw new Error(`Usage: ${APP_NAME} plugin setup <plugin>`);
 	if (!process.stdin.isTTY || !process.stdout.isTTY) throw new Error("Plugin setup requires an interactive terminal");
 	const handle = selectSetupIntegration(await loadIntegrationHandles(), args[0]);

package/src/config/settings-schema.ts

@@ -93,10 +93,13 @@ interface UiMetadata {
 	condition?: string;
 }
 
+type SettingScope = "user";
+
 interface BooleanDef {
 	type: "boolean";
 	default: boolean;
 	ui?: UiMetadata;
+	scope?: SettingScope;
 }
 
 interface StringDef {
@@ -1761,6 +1764,13 @@ export const SETTINGS_SCHEMA = {
 	},
 
 	// MCP
+	"mcp.enabled": {
+		type: "boolean",
+		default: false,
+		scope: "user",
+		ui: { tab: "tools", label: "MCP", description: "Enable MCP servers for new sessions" },
+	},
+
 	"mcp.enableProjectConfig": {
 		type: "boolean",
 		default: true,

package/src/config/settings.ts

@@ -662,10 +662,25 @@ export class Settings {
 	// ─────────────────────────────────────────────────────────────────────────
 
 	#rebuildMerged(): void {
-		this.#merged = this.#deepMerge(this.#deepMerge({}, this.#global), this.#project);
+		const trustedProject = structuredClone(this.#project);
+		for (const [settingPath, definition] of Object.entries(SETTINGS_SCHEMA)) {
+			if (!("scope" in definition) || definition.scope !== "user") continue;
+			this.#deleteByPath(trustedProject, settingPath.split("."));
+		}
+		this.#merged = this.#deepMerge(this.#deepMerge({}, this.#global), trustedProject);
 		this.#merged = this.#deepMerge(this.#merged, this.#overrides);
 	}
 
+	#deleteByPath(obj: RawSettings, segments: string[]): void {
+		let current = obj;
+		for (let i = 0; i < segments.length - 1; i++) {
+			const next = current[segments[i]];
+			if (!next || typeof next !== "object" || Array.isArray(next)) return;
+			current = next as RawSettings;
+		}
+		Reflect.deleteProperty(current, segments[segments.length - 1]);
+	}
+
 	#fireAllHooks(): void {
 		for (const key of Object.keys(SETTING_HOOKS) as SettingPath[]) {
 			const hook = SETTING_HOOKS[key];

package/src/integrations/setup.ts

@@ -50,7 +50,8 @@ export function describeInstallSetupOutcome(
 	const handle = handles.find(
 		candidate => candidate.id === target || candidate.plugin === target || candidate.plugin?.split("@")[0] === target,
 	);
-	const nextAction = handle ? describeIntegrationSetupNextAction(handle) : `xcsh plugin setup ${target}`;
+	const nextTarget = handle?.plugin?.split("@")[0] ?? handle?.id ?? target;
+	const nextAction = `/plugin setup ${nextTarget}`;
 	return `${summary}\nnext: ${nextAction}`;
 }