fix: paths in OCI & WIT subcommands (#286)

* fix: paths in OCI & WIT commands

Signed-off-by: Lucas Fontes <lucas@cosmonic.com>

* handling dir selection a bit more gracefully

Signed-off-by: Lucas Fontes <lucas@cosmonic.com>

---------

Signed-off-by: Lucas Fontes <lucas@cosmonic.com>

Author: lxfontes

crates/wash/src/cli/mod.rs

@@ -306,6 +306,8 @@ pub struct CliContext {
     config: Option<PathBuf>,
     // path to project dir. Usually current working dir
     project_dir: PathBuf,
+    // the original working directory when the CLI was invoked, used for resolving relative paths in commands
+    original_working_dir: PathBuf,
 }
 
 impl Deref for CliContext {
@@ -406,9 +408,14 @@ impl CliContextBuilder {
             .start()
             .await?;
 
+        let original_working_dir = std::env::current_dir()
+            .ok()
+            .or_else(|| self.project_dir.clone())
+            .context("failed to get current working directory and no project dir specified")?;
+
         let project_dir = match &self.project_dir {
             Some(dir) => dir.clone(),
-            None => std::env::current_dir()?,
+            None => original_working_dir.clone(),
         };
 
         // Change working directory to project path
@@ -418,6 +425,7 @@ impl CliContextBuilder {
             app_strategy,
             host,
             project_dir,
+            original_working_dir,
             config: self.config,
             plugin_manager: plugin_manager.clone(),
         };
@@ -506,6 +514,10 @@ impl CliContext {
         }
     }
 
+    pub fn original_working_dir(&self) -> &PathBuf {
+        &self.original_working_dir
+    }
+
     pub fn user_config_path(&self) -> std::path::PathBuf {
         if let Some(config) = &self.config {
             return config.clone();

crates/wash/src/cli/oci.rs

@@ -85,7 +85,7 @@ impl PullCommand {
         let component_path = if self.component_path.is_absolute() {
             self.component_path.clone()
         } else {
-            ctx.project_dir().join(&self.component_path)
+            ctx.original_working_dir().join(&self.component_path)
         };
 
         // Write the component to the specified output path
@@ -133,7 +133,7 @@ impl PushCommand {
         let component_path = if self.component_path.is_absolute() {
             self.component_path.clone()
         } else {
-            ctx.project_dir().join(&self.component_path)
+            ctx.original_working_dir().join(&self.component_path)
         };
 
         let component = tokio::fs::read(&component_path)

crates/wash/src/cli/wit.rs

@@ -792,7 +792,11 @@ async fn handle_build(
 
     // Determine output path
     let output_path = if let Some(output) = output_override {
-        output.to_path_buf()
+        if output.is_absolute() {
+            output.to_path_buf()
+        } else {
+            ctx.original_working_dir().join(output)
+        }
     } else {
         // Default to project root: <package-name>-<version>.wasm or <package-name>.wasm
         let filename = if let Some(ver) = &version {