fix(zsh): model and provider selection (#1806)

Author: amitksingh1490

crates/forge_main/src/porcelain.rs

@@ -74,6 +74,20 @@ impl Porcelain {
             })
         })
     }
+
+    pub fn swap_cols(self, col1: usize, col2: usize) -> Self {
+        Porcelain(
+            self.0
+                .into_iter()
+                .map(|mut row| {
+                    if row.len() > col1.max(col2) {
+                        row.swap(col1, col2);
+                    }
+                    row
+                })
+                .collect(),
+        )
+    }
     #[allow(unused)]
     pub fn into_body(self) -> Vec<Vec<Option<String>>> {
         // Skip headers and return
@@ -389,6 +403,31 @@ mod tests {
         assert_eq!(actual, expected)
     }
 
+    #[test]
+    fn test_swap_cols() {
+        let info = Porcelain(vec![
+            vec![
+                Some("user1".into()),
+                Some("Alice".into()),
+                Some("30".into()),
+            ],
+            vec![Some("user2".into()), Some("Bob".into()), Some("25".into())],
+        ]);
+
+        let actual = info.swap_cols(0, 1).into_rows();
+
+        let expected = vec![
+            vec![
+                Some("Alice".into()),
+                Some("user1".into()),
+                Some("30".into()),
+            ],
+            vec![Some("Bob".into()), Some("user2".into()), Some("25".into())],
+        ];
+
+        assert_eq!(actual, expected)
+    }
+
     #[test]
     fn test_into_long() {
         let info = Info::new()

crates/forge_main/src/ui.rs

@@ -629,13 +629,18 @@ impl<A: API + 'static, F: Fn() -> A> UI<A, F> {
         }
 
         if porcelain {
-            self.writeln(Porcelain::from(&info).skip(1).map_col(3, |col| {
-                if col == Some("Supported".to_owned()) {
-                    Some("🛠️".into())
-                } else {
-                    None
-                }
-            }))?;
+            self.writeln(
+                Porcelain::from(&info)
+                    .skip(1)
+                    .swap_cols(0, 1)
+                    .map_col(3, |col| {
+                        if col == Some("Supported".to_owned()) {
+                            Some("🛠️".into())
+                        } else {
+                            None
+                        }
+                    }),
+            )?;
         } else {
             self.writeln(info)?;
         }

shell-plugin/forge.plugin.zsh

@@ -102,7 +102,7 @@ function _forge_select_and_set_config() {
 
             if [[ -n "$selected" ]]; then
                 local name="${selected%% *}"
-                _forge_exec config set "--$config_flag" "$name"
+                _forge_exec config set "$config_flag" "$name"
             fi
         fi
     )
@@ -290,7 +290,7 @@ function _forge_action_provider() {
 
 # Action handler: Select model
 function _forge_action_model() {
-    _forge_select_and_set_config "list models" "model" "Model" "1,3.."
+    _forge_select_and_set_config "list models" "model" "Model" "2,3.."
     _forge_reset
 }