@oh-my-pi/pi-coding-agent 1.341.0 → 2.1.1337

package/src/utils/shell.ts

@@ -1,7 +1,58 @@
-import { existsSync } from "node:fs";
-import { SettingsManager } from "../core/settings-manager.js";
+import { accessSync, constants, existsSync } from "node:fs";
+import { SettingsManager } from "../core/settings-manager";
+
+export interface ShellConfig {
+	shell: string;
+	args: string[];
+	env: Record<string, string | undefined>;
+	prefix: string | undefined;
+}
+
+let cachedShellConfig: ShellConfig | null = null;
+
+/**
+ * Check if a shell binary is executable.
+ */
+function isExecutable(path: string): boolean {
+	try {
+		accessSync(path, constants.X_OK);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * Build the spawn environment (cached).
+ */
+function buildSpawnEnv(shell: string): Record<string, string | undefined> {
+	const noCI = process.env.PI_BASH_NO_CI || process.env.CLAUDE_BASH_NO_CI;
+	return {
+		...process.env,
+		SHELL: shell,
+		GIT_EDITOR: "true",
+		GPG_TTY: "not a tty",
+		PICODE: "1",
+		CLAUDECODE: "1",
+		...(noCI ? {} : { CI: "true" }),
+	};
+}
+
+/**
+ * Get shell args, optionally including login shell flag.
+ * Supports PI_BASH_NO_LOGIN and CLAUDE_BASH_NO_LOGIN to skip -l.
+ */
+function getShellArgs(): string[] {
+	const noLogin = process.env.PI_BASH_NO_LOGIN || process.env.CLAUDE_BASH_NO_LOGIN;
+	return noLogin ? ["-c"] : ["-l", "-c"];
+}
 
-let cachedShellConfig: { shell: string; args: string[] } | null = null;
+/**
+ * Get shell prefix for wrapping commands (profilers, strace, etc.).
+ */
+function getShellPrefix(): string | undefined {
+	return process.env.PI_SHELL_PREFIX || process.env.CLAUDE_CODE_SHELL_PREFIX;
+}
 
 /**
  * Find bash executable on PATH (Windows)
@@ -21,15 +72,27 @@ function findBashOnPath(): string | null {
 	return null;
 }
 
+/**
+ * Build full shell config from a shell path.
+ */
+function buildConfig(shell: string): ShellConfig {
+	return {
+		shell,
+		args: getShellArgs(),
+		env: buildSpawnEnv(shell),
+		prefix: getShellPrefix(),
+	};
+}
+
 /**
  * Get shell configuration based on platform.
  * Resolution order:
  * 1. User-specified shellPath in settings.json
  * 2. On Windows: Git Bash in known locations, then bash on PATH
- * 3. On Unix: /bin/bash
+ * 3. On Unix: $SHELL if bash/zsh, then fallback paths
  * 4. Fallback: sh
  */
-export function getShellConfig(): { shell: string; args: string[] } {
+export function getShellConfig(): ShellConfig {
 	if (cachedShellConfig) {
 		return cachedShellConfig;
 	}
@@ -40,7 +103,7 @@ export function getShellConfig(): { shell: string; args: string[] } {
 	// 1. Check user-specified shell path
 	if (customShellPath) {
 		if (existsSync(customShellPath)) {
-			cachedShellConfig = { shell: customShellPath, args: ["-c"] };
+			cachedShellConfig = buildConfig(customShellPath);
 			return cachedShellConfig;
 		}
 		throw new Error(
@@ -62,7 +125,7 @@ export function getShellConfig(): { shell: string; args: string[] } {
 
 		for (const path of paths) {
 			if (existsSync(path)) {
-				cachedShellConfig = { shell: path, args: ["-c"] };
+				cachedShellConfig = buildConfig(path);
 				return cachedShellConfig;
 			}
 		}
@@ -70,7 +133,7 @@ export function getShellConfig(): { shell: string; args: string[] } {
 		// 3. Fallback: search bash.exe on PATH (Cygwin, MSYS2, WSL, etc.)
 		const bashOnPath = findBashOnPath();
 		if (bashOnPath) {
-			cachedShellConfig = { shell: bashOnPath, args: ["-c"] };
+			cachedShellConfig = buildConfig(bashOnPath);
 			return cachedShellConfig;
 		}
 
@@ -83,21 +146,38 @@ export function getShellConfig(): { shell: string; args: string[] } {
 		);
 	}
 
-	// Unix: prefer user's shell from $SHELL, fallback to bash, then sh
+	// Unix: prefer user's shell from $SHELL if it's bash/zsh and executable
 	const userShell = process.env.SHELL;
-	if (userShell && existsSync(userShell)) {
-		cachedShellConfig = { shell: userShell, args: ["-c"] };
+	const isValidShell = userShell && (userShell.includes("bash") || userShell.includes("zsh"));
+	if (isValidShell && isExecutable(userShell)) {
+		cachedShellConfig = buildConfig(userShell);
 		return cachedShellConfig;
 	}
 
+	// Fallback paths (Claude's approach: check known locations)
+	const fallbackPaths = ["/bin", "/usr/bin", "/usr/local/bin", "/opt/homebrew/bin"];
+	const preferZsh = !userShell?.includes("bash");
+	const shellOrder = preferZsh ? ["zsh", "bash"] : ["bash", "zsh"];
+
+	for (const shellName of shellOrder) {
+		for (const dir of fallbackPaths) {
+			const shellPath = `${dir}/${shellName}`;
+			if (isExecutable(shellPath)) {
+				cachedShellConfig = buildConfig(shellPath);
+				return cachedShellConfig;
+			}
+		}
+	}
+
+	// Last resort: use Bun.which
 	const bashPath = Bun.which("bash");
 	if (bashPath) {
-		cachedShellConfig = { shell: bashPath, args: ["-c"] };
+		cachedShellConfig = buildConfig(bashPath);
 		return cachedShellConfig;
 	}
 
 	const shPath = Bun.which("sh");
-	cachedShellConfig = { shell: shPath || "sh", args: ["-c"] };
+	cachedShellConfig = buildConfig(shPath || "sh");
 	return cachedShellConfig;
 }
 

package/src/utils/tools-manager.ts

@@ -2,7 +2,7 @@ import { chmodSync, createWriteStream, existsSync, mkdirSync, renameSync, rmSync
 import { arch, platform } from "node:os";
 import { join } from "node:path";
 import chalk from "chalk";
-import { APP_NAME, getToolsDir } from "../config.js";
+import { APP_NAME, getToolsDir } from "../config";
 
 const TOOLS_DIR = getToolsDir();
 

package/examples/custom-tools/subagent/agents/reviewer.md

@@ -1,35 +0,0 @@
----
-name: reviewer
-description: Code review specialist for quality and security analysis
-tools: read, grep, find, ls, bash
-model: claude-sonnet-4-5
----
-
-You are a senior code reviewer. Analyze code for quality, security, and maintainability.
-
-Bash is for read-only commands only: `git diff`, `git log`, `git show`. Do NOT modify files or run builds.
-Assume tool permissions are not perfectly enforceable; keep all bash usage strictly read-only.
-
-Strategy:
-1. Run `git diff` to see recent changes (if applicable)
-2. Read the modified files
-3. Check for bugs, security issues, code smells
-
-Output format:
-
-## Files Reviewed
-- `path/to/file.ts` (lines X-Y)
-
-## Critical (must fix)
-- `file.ts:42` - Issue description
-
-## Warnings (should fix)
-- `file.ts:100` - Issue description
-
-## Suggestions (consider)
-- `file.ts:150` - Improvement idea
-
-## Summary
-Overall assessment in 2-3 sentences.
-
-Be specific with file paths and line numbers.

package/src/core/tools/exa/logger.ts

@@ -1,56 +0,0 @@
-/**
- * Exa Error Logger
- *
- * Append-only logging to ~/.pi/ for debugging production issues.
- */
-
-import { appendFileSync, existsSync, mkdirSync } from "fs";
-import { homedir } from "os";
-import { join } from "path";
-import { CONFIG_DIR_NAME } from "../../../config.js";
-
-/** Get the base config directory (e.g., ~/.pi/) */
-function getConfigDir(): string {
-	return join(homedir(), CONFIG_DIR_NAME);
-}
-
-/** Log file paths */
-const LOG_FILES = {
-	exa: "exa_errors.log",
-	view: "view_errors.log",
-} as const;
-
-type LogType = keyof typeof LOG_FILES;
-
-/** Format a log entry with timestamp */
-function formatEntry(message: string, context?: Record<string, unknown>): string {
-	const timestamp = new Date().toISOString();
-	const contextStr = context ? ` ${JSON.stringify(context)}` : "";
-	return `[${timestamp}] ${message}${contextStr}\n`;
-}
-
-/** Append to log file (creates directory if needed) */
-export function logError(type: LogType, message: string, context?: Record<string, unknown>): void {
-	try {
-		const configDir = getConfigDir();
-		if (!existsSync(configDir)) {
-			mkdirSync(configDir, { recursive: true });
-		}
-
-		const logPath = join(configDir, LOG_FILES[type]);
-		const entry = formatEntry(message, context);
-		appendFileSync(logPath, entry);
-	} catch {
-		// Silently ignore logging failures - we don't want to break tool execution
-	}
-}
-
-/** Log MCP fetch/call errors */
-export function logExaError(message: string, context?: Record<string, unknown>): void {
-	logError("exa", message, context);
-}
-
-/** Log render/view errors */
-export function logViewError(message: string, context?: Record<string, unknown>): void {
-	logError("view", message, context);
-}