mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
pakrym-oai
1aa3e432cc
## Why Shell snapshot lifecycle state was split between `Shell` and `SessionServices`: `Shell` carried the receiver while session code exposed and forwarded the raw sender. That coupled shell identity to mutable snapshot state and made refresh, inheritance, and file lifetime harder to reason about. ## What changed - make each `Arc<ShellSnapshot>` represent one cwd-specific snapshot generation - store the active generation in `SessionServices` with `ArcSwapOption` - have construction start the background build and expose only a cwd-validated snapshot path - use `ShellSnapshotFile` ownership to delete snapshot files automatically - pass snapshot paths explicitly to shell runtimes instead of storing snapshot state on `Shell` - preserve inherited and in-flight generations by pinning their `Arc` while they are in use ## Test plan - `cargo check -p codex-core --lib` - `just test -p codex-core 'shell_snapshot::tests'` - `just test -p codex-core shell_command_snapshot_still_intercepts_apply_patch` - `just test -p codex-core shell_snapshot_deleted_after_shutdown_with_skills`
105 lines
3.2 KiB
Rust
105 lines
3.2 KiB
Rust
use codex_exec_server::ShellInfo;
|
|
use codex_shell_command::shell_detect::DetectedShell;
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use std::path::PathBuf;
|
|
|
|
pub use codex_shell_command::shell_detect::ShellType;
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
|
pub struct Shell {
|
|
pub(crate) shell_type: ShellType,
|
|
pub(crate) shell_path: PathBuf,
|
|
}
|
|
|
|
impl Shell {
|
|
pub fn name(&self) -> &'static str {
|
|
self.shell_type.name()
|
|
}
|
|
|
|
/// Takes a string of shell and returns the full list of command args to
|
|
/// use with `exec()` to run the shell command.
|
|
pub fn derive_exec_args(&self, command: &str, use_login_shell: bool) -> Vec<String> {
|
|
match self.shell_type {
|
|
ShellType::Zsh | ShellType::Bash | ShellType::Sh => {
|
|
let arg = if use_login_shell { "-lc" } else { "-c" };
|
|
vec![
|
|
self.shell_path.to_string_lossy().to_string(),
|
|
arg.to_string(),
|
|
command.to_string(),
|
|
]
|
|
}
|
|
ShellType::PowerShell => {
|
|
let mut args = vec![self.shell_path.to_string_lossy().to_string()];
|
|
if !use_login_shell {
|
|
args.push("-NoProfile".to_string());
|
|
}
|
|
|
|
args.push("-Command".to_string());
|
|
args.push(command.to_string());
|
|
args
|
|
}
|
|
ShellType::Cmd => {
|
|
let mut args = vec![self.shell_path.to_string_lossy().to_string()];
|
|
args.push("/c".to_string());
|
|
args.push(command.to_string());
|
|
args
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<DetectedShell> for Shell {
|
|
fn from(detected: DetectedShell) -> Self {
|
|
Self {
|
|
shell_type: detected.shell_type,
|
|
shell_path: detected.shell_path,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Shell {
|
|
pub(crate) fn from_environment_shell_info(shell_info: ShellInfo) -> anyhow::Result<Self> {
|
|
let shell_type = match shell_info.name.as_str() {
|
|
"zsh" => ShellType::Zsh,
|
|
"bash" => ShellType::Bash,
|
|
"powershell" => ShellType::PowerShell,
|
|
"sh" => ShellType::Sh,
|
|
"cmd" => ShellType::Cmd,
|
|
name => anyhow::bail!("unknown environment shell `{name}`"),
|
|
};
|
|
|
|
Ok(Self {
|
|
shell_type,
|
|
shell_path: PathBuf::from(shell_info.path),
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(all(test, unix))]
|
|
fn ultimate_fallback_shell() -> Shell {
|
|
codex_shell_command::shell_detect::ultimate_fallback_shell().into()
|
|
}
|
|
|
|
pub fn get_shell_by_model_provided_path(shell_path: &PathBuf) -> Shell {
|
|
codex_shell_command::shell_detect::get_shell_by_model_provided_path(shell_path).into()
|
|
}
|
|
|
|
pub fn get_shell(shell_type: ShellType, path: Option<&PathBuf>) -> Option<Shell> {
|
|
codex_shell_command::shell_detect::get_shell(shell_type, path).map(Into::into)
|
|
}
|
|
|
|
pub fn default_user_shell() -> Shell {
|
|
codex_shell_command::shell_detect::default_user_shell().into()
|
|
}
|
|
|
|
#[cfg(all(test, target_os = "macos"))]
|
|
fn default_user_shell_from_path(user_shell_path: Option<PathBuf>) -> Shell {
|
|
codex_shell_command::shell_detect::default_user_shell_from_path(user_shell_path).into()
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[cfg(unix)]
|
|
#[path = "shell_tests.rs"]
|
|
mod tests;
|