fix: Audit 05/07 (#1955)

* Fix git submodules.

* Fix clean hydration.

* Update stdin.

* Bump versions.

* Add timeout.

* Add config command.

* Fix output prefixing.

Author: milesj

.yarn/versions/03d1ee1e.yml

@@ -0,0 +1,9 @@
+releases:
+  "@moonrepo/cli": patch
+  "@moonrepo/core-linux-arm64-gnu": patch
+  "@moonrepo/core-linux-arm64-musl": patch
+  "@moonrepo/core-linux-x64-gnu": patch
+  "@moonrepo/core-linux-x64-musl": patch
+  "@moonrepo/core-macos-arm64": patch
+  "@moonrepo/core-macos-x64": patch
+  "@moonrepo/core-windows-x64-msvc": patch

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## Unreleased
+
+#### 🚀 Updates
+
+- Updated `moon run` to support passing touched files via stdin.
+- Updated commands that wait for stdin to continue after 10 seconds if nothing was received.
+
+#### 🐞 Fixes
+
+- Fixed an issue where Git v2 would error loading submodules that haven't been checked out yet.
+- Fixed an issue with remote cache hydration that would leave around stale artifacts.
+- Fixed an issue where parallel persistent tasks wouldn't prefix output.
+
 ## 1.35.5
 
 #### 🐞 Fixes

crates/app/src/commands/debug/config.rs

@@ -0,0 +1,12 @@
+use crate::session::MoonSession;
+use starbase::AppResult;
+
+pub async fn debug_config(session: MoonSession) -> AppResult {
+    dbg!(&session.workspace_config);
+
+    dbg!(&session.toolchain_config);
+
+    dbg!(&session.tasks_config);
+
+    Ok(None)
+}

crates/app/src/commands/debug/mod.rs

@@ -1,9 +1,13 @@
+pub mod config;
 pub mod vcs;
 
 use clap::Subcommand;
 
 #[derive(Clone, Debug, Subcommand)]
 pub enum DebugCommands {
+    #[command(name = "config", about = "Debug loaded configuration.")]
+    Config,
+
     #[command(name = "vcs", about = "Debug the VCS.")]
     Vcs,
 }

crates/app/src/commands/query.rs

@@ -14,7 +14,7 @@ use starbase::AppResult;
 use starbase_styles::color;
 use starbase_utils::json;
 use std::collections::BTreeMap;
-use tracing::{instrument, warn};
+use tracing::{debug, instrument, warn};
 
 const HEADING_AFFECTED: &str = "Affected by";
 const HEADING_FILTERS: &str = "Filters";
@@ -574,6 +574,8 @@ pub async fn touched_files(session: MoonSession, args: QueryTouchedFilesArgs) ->
         status: args.status,
     };
 
+    debug!("Querying for touched files");
+
     let result = query_touched_files(&vcs, &options).await?;
 
     // Write to stdout directly to avoid broken pipe panics

crates/app/src/commands/run.rs

@@ -1,5 +1,5 @@
 use crate::components::run_action_pipeline;
-use crate::queries::touched_files::{QueryTouchedFilesOptions, query_touched_files};
+use crate::queries::touched_files::{QueryTouchedFilesOptions, query_touched_files_with_stdin};
 use crate::session::MoonSession;
 use clap::Args;
 use iocraft::prelude::element;
@@ -134,7 +134,7 @@ pub async fn run_target(
     // Always query for a touched files list as it'll be used by many actions
     let touched_files = if vcs.is_enabled() {
         let local = is_local(args);
-        let result = query_touched_files(
+        let result = query_touched_files_with_stdin(
             &vcs,
             &QueryTouchedFilesOptions {
                 default_branch: !local && !is_test_env(),

crates/app/src/queries/touched_files.rs

@@ -7,7 +7,10 @@ use rustc_hash::FxHashSet;
 use serde::{Deserialize, Serialize};
 use starbase_styles::color;
 use starbase_utils::json;
-use std::io::{IsTerminal, Read, stdin};
+use std::io::{IsTerminal, stdin};
+use std::time::Duration;
+use tokio::io::AsyncReadExt;
+use tokio::time::timeout;
 use tracing::{debug, trace, warn};
 
 #[derive(Clone, Default, Deserialize, Serialize)]
@@ -54,8 +57,6 @@ pub async fn query_touched_files(
     vcs: &BoxedVcs,
     options: &QueryTouchedFilesOptions,
 ) -> miette::Result<QueryTouchedFilesResult> {
-    debug!("Querying for touched files");
-
     let bag = GlobalEnvBag::instance();
     let default_branch = vcs.get_default_branch().await?;
     let current_branch = vcs.get_local_branch().await?;
@@ -157,24 +158,37 @@ pub async fn query_touched_files_with_stdin(
     vcs: &BoxedVcs,
     options: &QueryTouchedFilesOptions,
 ) -> miette::Result<QueryTouchedFilesResult> {
+    debug!("Querying for touched files");
+
     let mut buffer = String::new();
 
     // Only read piped data when stdin is not a TTY,
     // otherwise the process will hang indefinitely waiting for EOF.
     if !stdin().is_terminal() {
-        stdin().read_to_string(&mut buffer).into_diagnostic()?;
+        if let Ok(read_result) = timeout(
+            Duration::from_secs(10),
+            tokio::io::stdin().read_to_string(&mut buffer),
+        )
+        .await
+        {
+            read_result.into_diagnostic()?;
+        }
     }
 
     // If piped via stdin, parse and use it
     if !buffer.is_empty() {
         // As JSON
         if buffer.starts_with('{') {
+            debug!("Received from stdin as JSON");
+
             let result: QueryTouchedFilesResult = json::parse(&buffer)?;
 
             return Ok(result);
         }
         // As lines
         else {
+            debug!("Received from stdin as separate lines");
+
             let files =
                 FxHashSet::from_iter(buffer.split('\n').map(WorkspaceRelativePathBuf::from));
 

crates/cli/src/main.rs

@@ -149,6 +149,7 @@ async fn main() -> MainResult {
                     commands::completions::completions(session, args).await
                 }
                 Commands::Debug { command } => match command {
+                    DebugCommands::Config => commands::debug::config::debug_config(session).await,
                     DebugCommands::Vcs => commands::debug::vcs::debug_vcs(session).await,
                 },
                 Commands::Docker { command } => match command {

crates/task-runner/src/command_executor.rs

@@ -290,12 +290,13 @@ impl<'task> CommandExecutor<'task> {
     }
 
     fn prepare_state(&mut self, context: &ActionContext, report_item: &mut TaskReportItem) {
-        let is_primary = context.is_primary_target(&self.task.target);
         let is_ci = is_ci_env();
+        let is_primary = context.is_primary_target(&self.task.target);
+        let is_only_primary = is_primary && context.primary_targets.len() == 1;
 
         // When a task is configured as local (no caching), or the interactive flag is passed,
         // we don't "capture" stdout/stderr (which breaks stdin) and let it stream natively.
-        if !self.task.options.cache && context.primary_targets.len() == 1 && !is_ci {
+        if !self.task.options.cache && is_only_primary && !is_ci {
             self.interactive = true;
         }
 
@@ -308,10 +309,7 @@ impl<'task> CommandExecutor<'task> {
         };
 
         // If only a single persistent task is being ran, we should not prefix the output.
-        if context.primary_targets.len() == 1
-            && is_primary
-            && (self.task.is_persistent() || self.task.deps.is_empty())
-        {
+        if is_only_primary && (self.task.is_persistent() || self.task.deps.is_empty()) {
             report_item.output_prefix = None;
         }
 

crates/task-runner/src/output_hydrater.rs

@@ -99,10 +99,7 @@ impl OutputHydrater<'_> {
                 color::muted_light(error.to_string()),
             );
 
-            // Delete target outputs to ensure a clean slate
-            for output in &self.task.output_files {
-                fs::remove_file(output.to_logical_path(&self.app.workspace_root))?;
-            }
+            self.delete_existing_outputs()?;
         }
 
         Ok(true)
@@ -114,6 +111,8 @@ impl OutputHydrater<'_> {
         state: &mut ActionState<'_>,
     ) -> miette::Result<bool> {
         if let Some(remote) = RemoteService::session() {
+            self.delete_existing_outputs()?;
+
             match remote.restore_action_result(state).await {
                 Ok(restored) => {
                     return Ok(restored);
@@ -132,4 +131,12 @@ impl OutputHydrater<'_> {
 
         Ok(false)
     }
+
+    fn delete_existing_outputs(&self) -> miette::Result<()> {
+        for output in self.task.get_output_files(&self.app.workspace_root, true)? {
+            fs::remove_file(output)?;
+        }
+
+        Ok(())
+    }
 }