@f5xc-salesdemos/xcsh 15.6.2 → 15.7.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "15.6.2",
+	"version": "15.7.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5xc-salesdemos/xcsh",
 	"author": "Can Boluk",
@@ -46,12 +46,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5xc-salesdemos/xcsh-stats": "15.6.2",
-		"@f5xc-salesdemos/pi-agent-core": "15.6.2",
-		"@f5xc-salesdemos/pi-ai": "15.6.2",
-		"@f5xc-salesdemos/pi-natives": "15.6.2",
-		"@f5xc-salesdemos/pi-tui": "15.6.2",
-		"@f5xc-salesdemos/pi-utils": "15.6.2",
+		"@f5xc-salesdemos/xcsh-stats": "15.7.0",
+		"@f5xc-salesdemos/pi-agent-core": "15.7.0",
+		"@f5xc-salesdemos/pi-ai": "15.7.0",
+		"@f5xc-salesdemos/pi-natives": "15.7.0",
+		"@f5xc-salesdemos/pi-tui": "15.7.0",
+		"@f5xc-salesdemos/pi-utils": "15.7.0",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/cli/update-cli.ts

@@ -2,7 +2,8 @@
  * Update CLI command handler.
  *
  * Handles `xcsh update` to check for and install updates.
- * Uses bun if available, otherwise downloads binary from GitHub releases.
+ * Auto-detects the installation method (npm, brew, bun, or standalone binary)
+ * and updates through the appropriate channel.
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
@@ -60,14 +61,74 @@ function isPathInDirectory(filePath: string, directoryPath: string): boolean {
 	return relativePath === "" || (!relativePath.startsWith("..") && !path.isAbsolute(relativePath));
 }
 
-type UpdateTarget = { method: "bun" } | { method: "binary"; path: string };
+export type InstallMethod = "npm" | "brew" | "bun" | "binary";
 
-function resolveUpdateMethod(ompPath: string, bunBinDir: string | undefined): "bun" | "binary" {
-	if (!bunBinDir) return "binary";
-	return isPathInDirectory(ompPath, bunBinDir) ? "bun" : "binary";
+type UpdateTarget =
+	| { method: "npm"; path: string }
+	| { method: "brew"; path: string }
+	| { method: "bun" }
+	| { method: "binary"; path: string };
+
+/**
+ * Detect how xcsh was installed by examining the binary path.
+ *
+ * Detection order:
+ * 1. bun  — binary is inside bun's global bin directory
+ * 2. npm  — binary is a symlink whose resolution chain contains "node_modules"
+ * 3. brew — binary path or realpath contains "Cellar" or "homebrew"
+ * 4. binary — fallback for standalone installs
+ */
+function detectInstallMethod(binPath: string, bunBinDir: string | undefined): InstallMethod {
+	// 1. Bun: binary lives inside bun's global bin dir
+	if (bunBinDir && isPathInDirectory(binPath, bunBinDir)) {
+		return "bun";
+	}
+
+	// 2. npm: binary is a symlink whose target chain contains node_modules
+	try {
+		const stats = fs.lstatSync(binPath);
+		if (stats.isSymbolicLink()) {
+			const linkTarget = fs.readlinkSync(binPath);
+			const resolvedTarget = path.resolve(path.dirname(binPath), linkTarget);
+			if (linkTarget.includes("node_modules") || resolvedTarget.includes("node_modules")) {
+				return "npm";
+			}
+			try {
+				const realPath = fs.realpathSync(binPath);
+				if (realPath.includes("node_modules")) {
+					return "npm";
+				}
+			} catch {
+				// realpath may fail if target doesn't exist
+			}
+		}
+	} catch {
+		// lstat/readlink may fail; fall through
+	}
+
+	// 3. brew: path or realpath contains Cellar or homebrew
+	const lowerBinPath = binPath.toLowerCase();
+	if (lowerBinPath.includes("/cellar/") || lowerBinPath.includes("/homebrew/")) {
+		return "brew";
+	}
+	try {
+		const realPath = fs.realpathSync(binPath).toLowerCase();
+		if (realPath.includes("/cellar/") || realPath.includes("/homebrew/")) {
+			return "brew";
+		}
+	} catch {
+		// realpath may fail; fall through
+	}
+
+	// 4. Standalone binary (fallback)
+	return "binary";
+}
+
+function resolveUpdateMethod(ompPath: string, bunBinDir: string | undefined): InstallMethod {
+	return detectInstallMethod(ompPath, bunBinDir);
 }
 
-export function _resolveUpdateMethodForTest(ompPath: string, bunBinDir: string | undefined): "bun" | "binary" {
+export function _resolveUpdateMethodForTest(ompPath: string, bunBinDir: string | undefined): InstallMethod {
 	return resolveUpdateMethod(ompPath, bunBinDir);
 }
 async function resolveUpdateTarget(): Promise<UpdateTarget> {
@@ -175,8 +236,9 @@ function resolveOmpPath(): string | undefined {
  */
 async function verifyInstalledVersion(
 	expectedVersion: string,
+	explicitPath?: string,
 ): Promise<{ ok: boolean; actual?: string; path?: string }> {
-	const ompPath = resolveOmpPath();
+	const ompPath = explicitPath ?? resolveOmpPath();
 	if (!ompPath) return { ok: false };
 	try {
 		const result = await $`${ompPath} --version`.quiet().nothrow();
@@ -194,8 +256,8 @@ async function verifyInstalledVersion(
 /**
  * Print post-update verification result.
  */
-async function printVerification(expectedVersion: string): Promise<void> {
-	const result = await verifyInstalledVersion(expectedVersion);
+async function printVerification(expectedVersion: string, explicitPath?: string): Promise<void> {
+	const result = await verifyInstalledVersion(expectedVersion, explicitPath);
 	if (result.ok) {
 		console.log(chalk.green(`\n${theme.status.success} Updated to ${expectedVersion}`));
 		return;
@@ -231,6 +293,30 @@ async function updateViaBun(expectedVersion: string): Promise<void> {
 	await printVerification(expectedVersion);
 }
 
+/**
+ * Update via npm package manager.
+ */
+async function updateViaNpm(expectedVersion: string): Promise<void> {
+	console.log(chalk.dim("Updating via npm..."));
+	const result = await $`npm install -g ${PACKAGE}@${expectedVersion}`.nothrow();
+	if (result.exitCode !== 0) {
+		throw new Error(`npm install failed with exit code ${result.exitCode}`);
+	}
+}
+
+/**
+ * Handle brew-installed xcsh.
+ *
+ * For corporate environments, brew-managed software must not be bypassed.
+ * Prints instructions instead of running brew upgrade automatically.
+ */
+function updateViaBrew(targetPath: string, expectedVersion: string): void {
+	console.log(chalk.yellow(`\n${APP_NAME} at ${targetPath} was installed via Homebrew.`));
+	console.log(chalk.yellow(`To update to ${expectedVersion}, run:`));
+	console.log(chalk.cyan(`  brew upgrade ${APP_NAME}`));
+	console.log(chalk.dim("\nThis ensures the update goes through your organization's Homebrew tap."));
+}
+
 /**
  * Download a release binary to a target path, replacing an existing file.
  */
@@ -261,7 +347,7 @@ async function updateViaBinaryAt(targetPath: string, expectedVersion: string): P
 		await fs.promises.rename(tempPath, targetPath);
 		await fs.promises.unlink(backupPath);
 
-		await printVerification(expectedVersion);
+		await printVerification(expectedVersion, targetPath);
 		console.log(chalk.dim(`Restart ${APP_NAME} to use the new version`));
 	} catch (err) {
 		if (fs.existsSync(backupPath) && !fs.existsSync(targetPath)) {
@@ -310,10 +396,22 @@ export async function runUpdateCommand(opts: { force: boolean; check: boolean })
 	// Choose update method based on the prioritized xcsh binary in PATH
 	try {
 		const target = await resolveUpdateTarget();
-		if (target.method === "bun") {
-			await updateViaBun(release.version);
-		} else {
-			await updateViaBinaryAt(target.path, release.version);
+		console.log(chalk.dim(`Install method: ${target.method}`));
+
+		switch (target.method) {
+			case "bun":
+				await updateViaBun(release.version);
+				break;
+			case "npm":
+				await updateViaNpm(release.version);
+				await printVerification(release.version);
+				break;
+			case "brew":
+				updateViaBrew(target.path, release.version);
+				return;
+			case "binary":
+				await updateViaBinaryAt(target.path, release.version);
+				break;
 		}
 	} catch (err) {
 		console.error(chalk.red(`Update failed: ${err}`));
@@ -334,6 +432,12 @@ ${chalk.bold("Options:")}
   -c, --check   Check for updates without installing
   -f, --force   Force reinstall even if up to date
 
+${chalk.bold("Install methods (auto-detected):")}
+  npm           Installed via npm install -g
+  brew          Installed via Homebrew (prints upgrade instructions)
+  bun           Installed via bun install -g
+  binary        Standalone binary (direct download)
+
 ${chalk.bold("Examples:")}
   ${APP_NAME} update           Update to latest version
   ${APP_NAME} update --check   Check if updates are available

package/src/config/settings-schema.ts

@@ -791,7 +791,7 @@ export const SETTINGS_SCHEMA = {
 
 	"compaction.handoffSaveToDisk": {
 		type: "boolean",
-		default: false,
+		default: true,
 		ui: {
 			tab: "context",
 			label: "Save Handoff Docs",

package/src/modes/components/status-line/presets.ts

@@ -4,7 +4,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	default: {
 		leftSegments: ["pi", "model", "plan_mode", "path", "git", "pr", "context_pct", "token_total", "cost"],
 		rightSegments: [],
-		separator: "powerline-thin",
+		separator: "powerline",
 		segmentOptions: {
 			model: { showThinkingLevel: true },
 			path: { abbreviate: true, maxLength: 40, stripWorkPrefix: true },
@@ -25,7 +25,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	compact: {
 		leftSegments: ["model", "plan_mode", "git", "pr"],
 		rightSegments: ["cost", "context_pct"],
-		separator: "powerline-thin",
+		separator: "powerline",
 		segmentOptions: {
 			model: { showThinkingLevel: false },
 			git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: false },
@@ -95,7 +95,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 		// User-defined - these are just defaults that get overridden
 		leftSegments: ["model", "plan_mode", "path", "git", "pr"],
 		rightSegments: ["token_total", "cost", "context_pct"],
-		separator: "powerline-thin",
+		separator: "powerline",
 		segmentOptions: {},
 	},
 };