Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions crates/minimal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,10 @@ pub struct ActivateArgs {
/// Optional session name
#[arg(long, short)]
pub name: Option<String>,
/// Project path to activate (defaults to current directory)
#[arg(default_value = ".")]
pub path: String,
/// Project path to activate. Defaults to the directory set by
/// `-C`/`--repo-dir`, or the current working directory when neither
/// is given.
pub path: Option<String>,
/// How to load project files into the session.
#[arg(long, value_enum, default_value_t = SyncMode::Tarball)]
pub sync: SyncMode,
Expand Down Expand Up @@ -582,18 +583,14 @@ async fn cmd_default(global: &GlobalArgs) -> Result<(), anyhow::Error> {
}
None => {
// No sessions exist: activate a new one for the current directory
// and chain into attach, mirroring `min activate --attach`. Honor
// `--repo-dir` (`-C`) so `min -C /path` activates for /path, not
// the process's actual cwd — matching the attach side, which uses
// `cwd_host_path(global)` for its cwd comparison.
// (or -C/--repo-dir if set) and chain into attach, mirroring
// `min activate --attach`. `cmd_activate` resolves the path from
// `global.repo_dir` when no positional is given, matching the
// attach side's `cwd_host_path(global)`.
drop(client);
let path = match global.repo_dir.as_deref() {
Some(dir) => dir.to_string_lossy().to_string(),
None => ".".to_string(),
};
let activate_args = ActivateArgs {
name: None,
path,
path: None,
sync: SyncMode::Tarball,
network: CliNetworkMode::HostNet,
ingress: Vec::new(),
Expand Down Expand Up @@ -1070,8 +1067,14 @@ fn resolve_upload_root(dir: &camino::Utf8Path) -> Result<camino::Utf8PathBuf, an
pub async fn cmd_activate(global: &GlobalArgs, args: ActivateArgs) -> Result<(), anyhow::Error> {
ensure_daemon(global)?;

let project_path = std::fs::canonicalize(&args.path)
.with_context(|| format!("Cannot resolve project path '{}'", args.path))?;
let effective_path = match (&args.path, &global.repo_dir) {
(Some(p), _) => std::path::PathBuf::from(p),
(None, Some(dir)) => dir.clone(),
(None, None) => std::path::PathBuf::from("."),
};

let project_path = std::fs::canonicalize(&effective_path)
.with_context(|| format!("Cannot resolve project path '{}'", effective_path.display()))?;

let utf8_path = camino::Utf8PathBuf::from_path_buf(project_path)
.map_err(|_| anyhow::anyhow!("Project path is not valid UTF-8"))?;
Expand Down
53 changes: 51 additions & 2 deletions crates/minimal/tests/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ async fn activate_creates_session() {

let activate_args = ActivateArgs {
name: Some("test-session".to_string()),
path: project.path().to_string_lossy().to_string(),
path: Some(project.path().to_string_lossy().to_string()),
sync: SyncMode::Tarball,
network: CliNetworkMode::NoNet,
ingress: vec![],
Expand Down Expand Up @@ -262,7 +262,7 @@ async fn activate_uploads_project_files() {

let activate_args = ActivateArgs {
name: Some("upload-test".to_string()),
path: project.path().to_string_lossy().to_string(),
path: Some(project.path().to_string_lossy().to_string()),
sync: SyncMode::Tarball,
network: CliNetworkMode::NoNet,
ingress: vec![],
Expand Down Expand Up @@ -298,6 +298,55 @@ async fn activate_uploads_project_files() {

// --- attach (smart resolution) ---

/// `min activate` with no positional path but `-C/--repo-dir` set uploads
/// from the repo-dir directory, not the process cwd (#873).
#[tokio::test]
async fn activate_uses_repo_dir_when_no_positional_path() {
let (daemon, mut global) = setup().await;

let project = tempfile::TempDir::new().unwrap();
std::fs::create_dir(project.path().join(".git")).unwrap();
std::fs::write(
project.path().join("minimal.toml"),
"# test minimal.toml\n[upstream]\nrepo = \"https://github.com/gominimal/pkgs\"\nbranch = \"main\"\n\n[stack]\nuse = \"shell\"\n",
)
.unwrap();
std::fs::write(project.path().join("hello.txt"), "hello world").unwrap();

global.repo_dir = Some(project.path().to_path_buf());

let activate_args = ActivateArgs {
name: Some("repo-dir-test".to_string()),
path: None,
sync: SyncMode::Tarball,
network: CliNetworkMode::NoNet,
ingress: vec![],
loadout: vec![],
no_loadouts: false,
no_prompt: false,
attach: false,
};
cmd_activate(&global, activate_args).await.unwrap();

let mut client = daemon.server.connect().await;
use minimald_rpc::ListSessions;
let resp = client.call::<ListSessions>(&()).await;
assert_eq!(resp.sessions.len(), 1);
let session = &resp.sessions[0];

let project_canon = project.path().canonicalize().unwrap();
let session_path = session.project_path.as_ref().unwrap();
assert_eq!(
session_path.as_str(),
project_canon.to_str().unwrap(),
"session project_path should match -C/--repo-dir, not cwd"
);

let sftp = client.open_sftp(session.id).await;
let hello = sftp.read("hello.txt").await.unwrap();
assert_eq!(hello, b"hello world");
}

/// `min attach` with no session argument and `--no-input` errors cleanly when
/// no sessions exist, rather than hanging or shelling out to ssh. The error
/// surfaces before any ssh exec, so it is deterministic in a test environment.
Expand Down