Route all app commands through a single RPC envelope (#542)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

crates-tauri/yaak-app-client/src/git_ext.rs

@@ -3,10 +3,7 @@
 //! This module provides the Tauri commands for git functionality.
 
 use crate::error::Result;
-use crate::git_watcher::{GitWatchResult, watch_git_worktree_status};
 use std::path::{Path, PathBuf};
-use tauri::ipc::Channel;
-use tauri::{AppHandle, Runtime, command};
 use yaak_git::{
     BranchDeleteResult, CloneResult, GitBranchInfo, GitCommit, GitFileDiff, GitRemote,
     GitStatusSummary, GitWorktreeStatus, PullResult, PushResult, git_add, git_add_credential,
@@ -19,17 +16,14 @@ use yaak_git::{
 
 // NOTE: All of these commands are async to prevent blocking work from locking up the UI
 
-#[command]
 pub async fn cmd_git_checkout(dir: &Path, branch: &str, force: bool) -> Result<String> {
     Ok(git_checkout_branch(dir, branch, force).await?)
 }
 
-#[command]
 pub async fn cmd_git_branch(dir: &Path, branch: &str, base: Option<&str>) -> Result<()> {
     Ok(git_create_branch(dir, branch, base).await?)
 }
 
-#[command]
 pub async fn cmd_git_delete_branch(
     dir: &Path,
     branch: &str,
@@ -38,56 +32,38 @@ pub async fn cmd_git_delete_branch(
     Ok(git_delete_branch(dir, branch, force.unwrap_or(false)).await?)
 }
 
-#[command]
 pub async fn cmd_git_delete_remote_branch(dir: &Path, branch: &str) -> Result<()> {
     Ok(git_delete_remote_branch(dir, branch).await?)
 }
 
-#[command]
 pub async fn cmd_git_merge_branch(dir: &Path, branch: &str) -> Result<()> {
     Ok(git_merge_branch(dir, branch).await?)
 }
 
-#[command]
 pub async fn cmd_git_rename_branch(dir: &Path, old_name: &str, new_name: &str) -> Result<()> {
     Ok(git_rename_branch(dir, old_name, new_name).await?)
 }
 
-#[command]
 pub async fn cmd_git_status(dir: &Path) -> Result<GitStatusSummary> {
     Ok(git_status(dir)?)
 }
 
-#[command]
 pub async fn cmd_git_branch_info(dir: &Path) -> Result<GitBranchInfo> {
     Ok(git_branch_info(dir)?)
 }
 
-#[command]
 pub async fn cmd_git_worktree_status(dir: &Path) -> Result<GitWorktreeStatus> {
     Ok(git_worktree_status(dir)?)
 }
 
-#[command]
-pub async fn cmd_git_watch_worktree_status<R: Runtime>(
-    app_handle: AppHandle<R>,
-    dir: &Path,
-    channel: Channel<GitWorktreeStatus>,
-) -> Result<GitWatchResult> {
-    watch_git_worktree_status(app_handle, dir, channel).await
-}
-
-#[command]
 pub async fn cmd_git_log(dir: &Path) -> Result<Vec<GitCommit>> {
     Ok(git_log(dir)?)
 }
 
-#[command]
 pub async fn cmd_git_log_for_file(dir: &Path, rela_path: PathBuf) -> Result<Vec<GitCommit>> {
     Ok(git_log_for_file(dir, &rela_path)?)
 }
 
-#[command]
 pub async fn cmd_git_file_diff_for_commit(
     dir: &Path,
     commit_oid: &str,
@@ -96,37 +72,30 @@ pub async fn cmd_git_file_diff_for_commit(
     Ok(git_file_diff_for_commit(dir, commit_oid, &rela_path)?)
 }
 
-#[command]
 pub async fn cmd_git_initialize(dir: &Path) -> Result<()> {
     Ok(git_init(dir)?)
 }
 
-#[command]
 pub async fn cmd_git_clone(url: &str, dir: &Path) -> Result<CloneResult> {
     Ok(git_clone(url, dir).await?)
 }
 
-#[command]
 pub async fn cmd_git_commit(dir: &Path, message: &str) -> Result<()> {
     Ok(git_commit(dir, message).await?)
 }
 
-#[command]
 pub async fn cmd_git_fetch_all(dir: &Path) -> Result<()> {
     Ok(git_fetch_all(dir).await?)
 }
 
-#[command]
 pub async fn cmd_git_push(dir: &Path) -> Result<PushResult> {
     Ok(git_push(dir).await?)
 }
 
-#[command]
 pub async fn cmd_git_pull(dir: &Path) -> Result<PullResult> {
     Ok(git_pull(dir).await?)
 }
 
-#[command]
 pub async fn cmd_git_pull_force_reset(
     dir: &Path,
     remote: &str,
@@ -135,12 +104,10 @@ pub async fn cmd_git_pull_force_reset(
     Ok(git_pull_force_reset(dir, remote, branch).await?)
 }
 
-#[command]
 pub async fn cmd_git_pull_merge(dir: &Path, remote: &str, branch: &str) -> Result<PullResult> {
     Ok(git_pull_merge(dir, remote, branch).await?)
 }
 
-#[command]
 pub async fn cmd_git_add(dir: &Path, rela_paths: Vec<PathBuf>) -> Result<()> {
     for path in rela_paths {
         git_add(dir, &path)?;
@@ -148,7 +115,6 @@ pub async fn cmd_git_add(dir: &Path, rela_paths: Vec<PathBuf>) -> Result<()> {
     Ok(())
 }
 
-#[command]
 pub async fn cmd_git_unstage(dir: &Path, rela_paths: Vec<PathBuf>) -> Result<()> {
     for path in rela_paths {
         git_unstage(dir, &path)?;
@@ -156,12 +122,10 @@ pub async fn cmd_git_unstage(dir: &Path, rela_paths: Vec<PathBuf>) -> Result<()>
     Ok(())
 }
 
-#[command]
 pub async fn cmd_git_reset_changes(dir: &Path) -> Result<()> {
     Ok(git_reset_changes(dir).await?)
 }
 
-#[command]
 pub async fn cmd_git_restore_files(dir: &Path, rela_paths: Vec<PathBuf>) -> Result<()> {
     for path in rela_paths {
         git_restore(dir, &path)?;
@@ -169,7 +133,6 @@ pub async fn cmd_git_restore_files(dir: &Path, rela_paths: Vec<PathBuf>) -> Resu
     Ok(())
 }
 
-#[command]
 pub async fn cmd_git_restore_file_from_commit(
     dir: &Path,
     commit_oid: &str,
@@ -178,7 +141,6 @@ pub async fn cmd_git_restore_file_from_commit(
     Ok(git_restore_file_from_commit(dir, commit_oid, &rela_path)?)
 }
 
-#[command]
 pub async fn cmd_git_add_credential(
     remote_url: &str,
     username: &str,
@@ -187,17 +149,14 @@ pub async fn cmd_git_add_credential(
     Ok(git_add_credential(remote_url, username, password).await?)
 }
 
-#[command]
 pub async fn cmd_git_remotes(dir: &Path) -> Result<Vec<GitRemote>> {
     Ok(git_remotes(dir)?)
 }
 
-#[command]
 pub async fn cmd_git_add_remote(dir: &Path, name: &str, url: &str) -> Result<GitRemote> {
     Ok(git_add_remote(dir, name, url)?)
 }
 
-#[command]
 pub async fn cmd_git_rm_remote(dir: &Path, name: &str) -> Result<()> {
     Ok(git_rm_remote(dir, name)?)
 }