@howaboua/pi-codex-conversion 1.0.7 → 1.0.9-dev.0

package/src/shell/summary.ts

@@ -1,62 +1,30 @@
-import { parseShellPart, nextCwd } from "./parse.ts";
-import { splitOnConnectors, normalizeTokens, shellSplit } from "./tokenize.ts";
+import { parseCommandString, type ParsedShellCommand } from "./parse-command.ts";
 import type { CommandSummary, ShellAction } from "./types.ts";
 
 export type { CommandSummary, ShellAction } from "./types.ts";
 
-// The adapter only masks commands when every parsed segment still looks like
-// repository exploration. The moment we see an actual side-effectful run, we
-// fall back to raw command rendering so the UI does not hide meaningful work.
 export function summarizeShellCommand(command: string): CommandSummary {
-	const normalized = normalizeTokens(shellSplit(command));
-	const parts = splitOnConnectors(normalized);
-	const fallback = runSummary(command);
-
-	if (parts.length === 0) {
-		return fallback;
-	}
-
-	const actions: ShellAction[] = [];
-	let cwd: string | undefined;
-
-	for (const part of parts) {
-		if (part.length === 0) continue;
-
-		cwd = nextCwd(cwd, part);
-		const parsed = parseShellPart(part, cwd);
-		if (parsed === null) continue;
-		if (parsed.kind === "run") {
-			return fallback;
-		}
-		actions.push(parsed);
-	}
-
-	const deduped = dedupeActions(actions);
-	if (deduped.length === 0) {
-		return fallback;
-	}
-
+	const actions = parseCommandString(command).map(parsedToAction);
 	return {
-		maskAsExplored: deduped.every((action) => action.kind !== "run"),
-		actions: deduped,
+		maskAsExplored: actions.every((action) => action.kind !== "run"),
+		actions,
 	};
 }
 
-function runSummary(command: string): CommandSummary {
-	return {
-		maskAsExplored: false,
-		actions: [{ kind: "run", command: command.trim() || command }],
-	};
-}
-
-function dedupeActions(actions: ShellAction[]): ShellAction[] {
-	const deduped: ShellAction[] = [];
-	for (const action of actions) {
-		const previous = deduped[deduped.length - 1];
-		if (previous && JSON.stringify(previous) === JSON.stringify(action)) {
-			continue;
-		}
-		deduped.push(action);
+function parsedToAction(command: ParsedShellCommand): ShellAction {
+	if (command.kind === "unknown") {
+		return { kind: "run", command: command.command };
+	}
+	if (command.kind === "list") {
+		return command.path ? { kind: "list", command: command.command, path: command.path } : { kind: "list", command: command.command };
+	}
+	if (command.kind === "search") {
+		return {
+			kind: "search",
+			command: command.command,
+			...(command.query ? { query: command.query } : {}),
+			...(command.path ? { path: command.path } : {}),
+		};
 	}
-	return deduped;
+	return { kind: "read", command: command.command, name: command.name, path: command.path };
 }

package/src/shell/tokenize.ts

@@ -23,9 +23,19 @@ export function shellSplit(input: string): string[] {
 			continue;
 		}
 
-		if (char === "\\" && quote !== "'") {
-			escaping = true;
-			continue;
+		if (char === "\\") {
+			if (!quote) {
+				escaping = true;
+				continue;
+			}
+			if (quote === '"') {
+				if (next && (next === "\\" || next === '"' || next === "$" || next === "`")) {
+					escaping = true;
+					continue;
+				}
+				current += char;
+				continue;
+			}
 		}
 
 		if (quote) {
@@ -72,13 +82,26 @@ export function shellSplit(input: string): string[] {
 	return tokens;
 }
 
+export function shellQuote(token: string): string {
+	if (token.length === 0) return "''";
+	if (/^[A-Za-z0-9_@%+=:,./-]+$/.test(token)) return token;
+	return `'${token.replace(/'/g, `'"'"'`)}'`;
+}
+
+export function joinCommandTokens(tokens: string[]): string {
+	return tokens
+		.map((token) => (token === "&&" || token === "||" || token === "|" || token === ";" ? token : shellQuote(token)))
+		.join(" ");
+}
+
 export function normalizeTokens(tokens: string[]): string[] {
 	if (tokens.length >= 3 && (tokens[0] === "yes" || tokens[0] === "y" || tokens[0] === "no" || tokens[0] === "n") && tokens[1] === "|") {
 		return normalizeTokens(tokens.slice(2));
 	}
+	const shell = tokens[0]?.replace(/\\/g, "/").split("/").pop();
 	if (
 		tokens.length === 3 &&
-		(tokens[0] === "bash" || tokens[0] === "zsh" || tokens[0].endsWith("/bash") || tokens[0].endsWith("/zsh")) &&
+		(shell === "bash" || shell === "zsh" || shell === "sh") &&
 		(tokens[1] === "-c" || tokens[1] === "-lc")
 	) {
 		return normalizeTokens(shellSplit(tokens[2]));
@@ -109,7 +132,7 @@ export function shortDisplayPath(path: string): string {
 	const normalized = path.replace(/\\/g, "/").replace(/\/$/, "");
 	const parts = normalized
 		.split("/")
-		.filter((part) => part.length > 0 && part !== "." && part !== "src" && part !== "dist" && part !== "build" && part !== "node_modules");
+		.filter((part) => part.length > 0 && part !== "src" && part !== "dist" && part !== "build" && part !== "node_modules");
 	return parts[parts.length - 1] ?? normalized;
 }
 

package/src/tools/exec-session-manager.ts

@@ -3,6 +3,7 @@ import { spawn, type ChildProcessByStdio } from "node:child_process";
 import { resolve } from "node:path";
 import type { Readable } from "node:stream";
 import * as pty from "node-pty";
+import { CODEX_FALLBACK_SHELL, getCodexRuntimeShell, isFishShell } from "../adapter/runtime-shell.ts";
 
 export interface UnifiedExecResult {
 	chunk_id: string;
@@ -77,7 +78,60 @@ function resolveWorkdir(baseCwd: string, workdir?: string): string {
 }
 
 function resolveShell(shell?: string): string {
-	return shell || process.env.SHELL || "/bin/bash";
+	return getCodexRuntimeShell(shell || process.env.SHELL);
+}
+
+const BASH_SYNC_ENV_KEYS = [
+	"PATH",
+	"SHELL",
+	"HOME",
+	"XDG_CONFIG_HOME",
+	"XDG_DATA_HOME",
+	"XDG_CACHE_HOME",
+	"BUN_INSTALL",
+	"PNPM_HOME",
+	"MISE_DATA_DIR",
+	"MISE_CONFIG_DIR",
+	"MISE_SHIMS_DIR",
+	"CARGO_HOME",
+	"GOPATH",
+	"ANDROID_HOME",
+	"ANDROID_NDK_HOME",
+	"JAVA_HOME",
+];
+
+function shellEscape(value: string): string {
+	if (/^[A-Za-z0-9_@%+=:,./-]+$/.test(value)) return value;
+	return `'${value.replace(/'/g, `'"'"'`)}'`;
+}
+
+function shouldSyncBashEnv(requestedShell: string | undefined, effectiveShell: string): boolean {
+	return effectiveShell === CODEX_FALLBACK_SHELL && isFishShell(requestedShell || process.env.SHELL);
+}
+
+function buildSyncedBashCommand(command: string, env: NodeJS.ProcessEnv): string {
+	const assignments: string[] = [];
+	for (const key of BASH_SYNC_ENV_KEYS) {
+		const value = key === "SHELL" ? CODEX_FALLBACK_SHELL : env[key];
+		if (typeof value !== "string") continue;
+		assignments.push(`export ${key}=${shellEscape(value)}`);
+	}
+	if (assignments.length === 0) return command;
+	return `${assignments.join("; ")}; ${command}`;
+}
+
+function resolveExecution(requestedShell: string | undefined, command: string): { shell: string; command: string; env: NodeJS.ProcessEnv } {
+	const shell = resolveShell(requestedShell);
+	const env: NodeJS.ProcessEnv = { ...process.env };
+	if (!shouldSyncBashEnv(requestedShell, shell)) {
+		return { shell, command, env };
+	}
+	env.SHELL = CODEX_FALLBACK_SHELL;
+	return {
+		shell,
+		command: buildSyncedBashCommand(command, env),
+		env,
+	};
 }
 
 function clampYieldTime(yieldTimeMs: number | undefined, fallback: number): number {
@@ -341,11 +395,12 @@ export function createExecSessionManager(): ExecSessionManager {
 
 	function createPipeSession(input: ExecCommandInput, workdir: string, shell: string, signal?: AbortSignal): PipeExecSession {
 		const login = input.login ?? true;
-		const shellArgs = login ? ["-lc", input.cmd] : ["-c", input.cmd];
+		const execution = resolveExecution(input.shell, input.cmd);
+		const shellArgs = login ? ["-lc", execution.command] : ["-c", execution.command];
 		const child = spawn(shell, shellArgs, {
 			cwd: workdir,
 			stdio: ["ignore", "pipe", "pipe"],
-			env: process.env,
+			env: execution.env,
 		});
 
 		const session: PipeExecSession = {
@@ -387,10 +442,11 @@ export function createExecSessionManager(): ExecSessionManager {
 
 	function createPtySession(input: ExecCommandInput, workdir: string, shell: string, signal?: AbortSignal): PtyExecSession {
 		const login = input.login ?? true;
-		const shellArgs = login ? ["-lc", input.cmd] : ["-c", input.cmd];
+		const execution = resolveExecution(input.shell, input.cmd);
+		const shellArgs = login ? ["-lc", execution.command] : ["-c", execution.command];
 		const child = pty.spawn(shell, shellArgs, {
 			cwd: workdir,
-			env: process.env,
+			env: execution.env,
 			name: process.env.TERM || "xterm-256color",
 			cols: 80,
 			rows: 24,