fix(native-sidecar): parse node input type before eval

Author: NathanFlurry

crates/native-sidecar/src/execution/launch.rs

@@ -1698,14 +1698,36 @@ pub(super) fn resolve_special_node_cli_invocation(
     args: &[String],
     env: &mut BTreeMap<String, String>,
 ) -> Option<(String, Vec<String>)> {
-    let first = args.first()?;
+    let mut index = 0;
+    while let Some(arg) = args.get(index) {
+        match arg.as_str() {
+            "--input-type" => {
+                if !apply_node_input_type(env, args.get(index + 1)?) {
+                    return None;
+                }
+                index += 2;
+            }
+            value if value.starts_with("--input-type=") => {
+                if !apply_node_input_type(env, &value["--input-type=".len()..]) {
+                    return None;
+                }
+                index += 1;
+            }
+            _ => break,
+        }
+    }
+
+    let first = args.get(index)?;
     match first.as_str() {
         "-e" | "--eval" => {
             env.insert(
                 String::from("AGENTOS_NODE_EVAL"),
-                args.get(1).cloned().unwrap_or_default(),
+                args.get(index + 1).cloned().unwrap_or_default(),
             );
-            Some((first.clone(), args.iter().skip(2).cloned().collect()))
+            Some((
+                String::from("-e"),
+                args.iter().skip(index + 2).cloned().collect(),
+            ))
         }
         "-v" | "--version" => {
             env.insert(
@@ -1760,12 +1782,32 @@ if (summary.failed > 0) process.exitCode = 1;
 "#,
                 ),
             );
-            Some((String::from("-e"), args.iter().skip(1).cloned().collect()))
+            Some((
+                String::from("-e"),
+                args.iter().skip(index + 1).cloned().collect(),
+            ))
         }
         _ => None,
     }
 }
 
+fn apply_node_input_type(env: &mut BTreeMap<String, String>, value: &str) -> bool {
+    match value {
+        "module" => {
+            env.insert(
+                String::from("AGENTOS_GUEST_ENTRYPOINT_MODULE_MODE"),
+                String::from("1"),
+            );
+            true
+        }
+        "commonjs" => {
+            env.remove("AGENTOS_GUEST_ENTRYPOINT_MODULE_MODE");
+            true
+        }
+        _ => false,
+    }
+}
+
 fn node_runtime_command_name(command: &str) -> Option<&str> {
     let name = Path::new(command)
         .file_name()

crates/native-sidecar/tests/service.rs

@@ -14987,7 +14987,7 @@ if (child.status !== 0) {
             );
         }
 
-        fn command_resolution_executes_node_eval_command() {
+        fn command_resolution_executes_node_module_eval_command() {
             let mut sidecar = create_test_sidecar();
             let (connection_id, session_id) =
                 authenticate_and_open_session(&mut sidecar).expect("authenticate and open session");
@@ -15009,8 +15009,11 @@ if (child.status !== 0) {
                         runtime: None,
                         entrypoint: None,
                         args: vec![
+                            String::from("--input-type=module"),
                             String::from("-e"),
-                            String::from("process.stdout.write('node-eval-ok\\n')"),
+                            String::from(
+                                "process.stdout.write(await Promise.resolve('node-module-eval-ok\\n'))",
+                            ),
                         ],
                         env: std::collections::HashMap::new(),
                         cwd: None,
@@ -15030,7 +15033,7 @@ if (child.status !== 0) {
                 drain_process_output(&mut sidecar, &vm_id, "proc-command-node-eval");
 
             assert_eq!(exit_code, Some(0), "stderr: {stderr}");
-            assert!(stdout.contains("node-eval-ok"), "stdout: {stdout}");
+            assert!(stdout.contains("node-module-eval-ok"), "stdout: {stdout}");
         }
         fn command_resolution_rejects_unknown_command() {
             let mut sidecar = create_test_sidecar();
@@ -25652,7 +25655,7 @@ try {
             bindings_javascript_child_process_rejects_invalid_json_file_input_before_dispatch();
             bindings_javascript_child_process_accepts_valid_json_input();
             command_resolution_executes_javascript_path_command_with_sidecar_mappings();
-            command_resolution_executes_node_eval_command();
+            command_resolution_executes_node_module_eval_command();
             command_resolution_rejects_unknown_command();
             python_vfs_rpc_requests_proxy_into_the_vm_kernel_filesystem();
             javascript_sync_rpc_requests_proxy_into_the_vm_kernel_filesystem();