Add credential prompts for git clone and improve workspace import

Author: gschier

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

@@ -6,11 +6,11 @@ use crate::error::Result;
 use std::path::{Path, PathBuf};
 use tauri::command;
 use yaak_git::{
-    BranchDeleteResult, GitCommit, GitRemote, GitStatusSummary, PullResult, PushResult, git_add,
-    git_add_credential, git_add_remote, git_checkout_branch, git_clone, git_commit,
-    git_create_branch, git_delete_branch, git_delete_remote_branch, git_fetch_all, git_init,
-    git_log, git_merge_branch, git_pull, git_push, git_remotes, git_rename_branch, git_rm_remote,
-    git_status, git_unstage,
+    BranchDeleteResult, CloneResult, GitCommit, GitRemote, GitStatusSummary, PullResult,
+    PushResult, git_add, git_add_credential, git_add_remote, git_checkout_branch, git_clone,
+    git_commit, git_create_branch, git_delete_branch, git_delete_remote_branch, git_fetch_all,
+    git_init, git_log, git_merge_branch, git_pull, git_push, git_remotes, git_rename_branch,
+    git_rm_remote, git_status, git_unstage,
 };
 
 // NOTE: All of these commands are async to prevent blocking work from locking up the UI
@@ -65,7 +65,7 @@ pub async fn cmd_git_initialize(dir: &Path) -> Result<()> {
 }
 
 #[command]
-pub async fn cmd_git_clone(url: &str, dir: &Path) -> Result<()> {
+pub async fn cmd_git_clone(url: &str, dir: &Path) -> Result<CloneResult> {
     Ok(git_clone(url, dir).await?)
 }
 
@@ -107,12 +107,11 @@ pub async fn cmd_git_unstage(dir: &Path, rela_paths: Vec<PathBuf>) -> Result<()>
 
 #[command]
 pub async fn cmd_git_add_credential(
-    dir: &Path,
     remote_url: &str,
     username: &str,
     password: &str,
 ) -> Result<()> {
-    Ok(git_add_credential(dir, remote_url, username, password).await?)
+    Ok(git_add_credential(remote_url, username, password).await?)
 }
 
 #[command]

crates/yaak-git/bindings/gen_git.ts

@@ -59,7 +59,6 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
     if (creds == null) throw new Error('Canceled');
 
     await invoke('cmd_git_add_credential', {
-      dir,
       remoteUrl: result.url,
       username: creds.username,
       password: creds.password,
@@ -154,7 +153,6 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
         if (creds == null) throw new Error('Canceled');
 
         await invoke('cmd_git_add_credential', {
-          dir,
           remoteUrl: result.url,
           username: creds.username,
           password: creds.password,

crates/yaak-git/index.ts

@@ -5,7 +5,15 @@ use std::process::Stdio;
 use tokio::process::Command;
 use yaak_common::command::new_xplatform_command;
 
+/// Create a git command that runs in the specified directory
 pub(crate) async fn new_binary_command(dir: &Path) -> Result<Command> {
+    let mut cmd = new_binary_command_global().await?;
+    cmd.arg("-C").arg(dir);
+    Ok(cmd)
+}
+
+/// Create a git command without a specific directory (for global operations)
+pub(crate) async fn new_binary_command_global() -> Result<Command> {
     // 1. Probe that `git` exists and is runnable
     let mut probe = new_xplatform_command("git");
     probe.arg("--version").stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null());
@@ -17,8 +25,6 @@ pub(crate) async fn new_binary_command(dir: &Path) -> Result<Command> {
     }
 
     // 2. Build the reusable git command
-    let mut cmd = new_xplatform_command("git");
-    cmd.arg("-C").arg(dir);
-
+    let cmd = new_xplatform_command("git");
     Ok(cmd)
 }

crates/yaak-git/src/binary.rs

@@ -2,10 +2,23 @@ use crate::binary::new_binary_command;
 use crate::error::Error::GenericError;
 use crate::error::Result;
 use log::info;
+use serde::{Deserialize, Serialize};
+use std::fs;
 use std::path::Path;
+use ts_rs::TS;
 
-pub async fn git_clone(url: &str, dir: &Path) -> Result<()> {
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, TS)]
+#[serde(rename_all = "snake_case", tag = "type")]
+#[ts(export, export_to = "gen_git.ts")]
+pub enum CloneResult {
+    Success,
+    NeedsCredentials { url: String, error: Option<String> },
+}
+
+pub async fn git_clone(url: &str, dir: &Path) -> Result<CloneResult> {
     let parent = dir.parent().ok_or_else(|| GenericError("Invalid clone directory".to_string()))?;
+    fs::create_dir_all(parent)
+        .map_err(|e| GenericError(format!("Failed to create directory: {e}")))?;
     let mut cmd = new_binary_command(parent).await?;
     cmd.args(["clone", url]).arg(dir).env("GIT_TERMINAL_PROMPT", "0");
 
@@ -15,12 +28,25 @@ pub async fn git_clone(url: &str, dir: &Path) -> Result<()> {
     let stdout = String::from_utf8_lossy(&out.stdout);
     let stderr = String::from_utf8_lossy(&out.stderr);
     let combined = format!("{}{}", stdout, stderr);
+    let combined_lower = combined.to_lowercase();
 
     info!("Cloned status={}: {combined}", out.status);
 
     if !out.status.success() {
+        // Check for credentials error
+        if combined_lower.contains("could not read") {
+            return Ok(CloneResult::NeedsCredentials { url: url.to_string(), error: None });
+        }
+        if combined_lower.contains("unable to access")
+            || combined_lower.contains("authentication failed")
+        {
+            return Ok(CloneResult::NeedsCredentials {
+                url: url.to_string(),
+                error: Some(combined.to_string()),
+            });
+        }
         return Err(GenericError(format!("Failed to clone: {}", combined.trim())));
     }
 
-    Ok(())
+    Ok(CloneResult::Success)
 }

crates/yaak-git/src/clone.rs

@@ -1,24 +1,18 @@
-use crate::binary::new_binary_command;
+use crate::binary::new_binary_command_global;
 use crate::error::Error::GenericError;
 use crate::error::Result;
-use std::path::Path;
 use std::process::Stdio;
 use tokio::io::AsyncWriteExt;
 use url::Url;
 
-pub async fn git_add_credential(
-    dir: &Path,
-    remote_url: &str,
-    username: &str,
-    password: &str,
-) -> Result<()> {
+pub async fn git_add_credential(remote_url: &str, username: &str, password: &str) -> Result<()> {
     let url = Url::parse(remote_url)
         .map_err(|e| GenericError(format!("Failed to parse remote url {remote_url}: {e:?}")))?;
     let protocol = url.scheme();
     let host = url.host_str().unwrap();
     let path = Some(url.path());
 
-    let mut child = new_binary_command(dir)
+    let mut child = new_binary_command_global()
         .await?
         .args(["credential", "approve"])
         .stdin(Stdio::piped())

crates/yaak-git/src/credential.rs

@@ -23,7 +23,7 @@ pub use branch::{
     BranchDeleteResult, git_checkout_branch, git_create_branch, git_delete_branch,
     git_delete_remote_branch, git_merge_branch, git_rename_branch,
 };
-pub use clone::git_clone;
+pub use clone::{CloneResult, git_clone};
 pub use commit::git_commit;
 pub use credential::git_add_credential;
 pub use fetch::git_fetch_all;

crates/yaak-git/src/lib.rs

@@ -1,16 +1,16 @@
 import { open } from '@tauri-apps/plugin-dialog';
-import type { WorkspaceMeta } from '@yaakapp-internal/models';
-import { createGlobalModel, updateModel } from '@yaakapp-internal/models';
+import type { CloneResult } from '@yaakapp-internal/git';
 import { useState } from 'react';
+import { openWorkspaceFromSyncDir } from '../commands/openWorkspaceFromSyncDir';
 import { appInfo } from '../lib/appInfo';
-import { router } from '../lib/router';
 import { invokeCmd } from '../lib/tauri';
 import { showErrorToast } from '../lib/toast';
 import { Banner } from './core/Banner';
 import { Button } from './core/Button';
 import { IconButton } from './core/IconButton';
 import { PlainInput } from './core/PlainInput';
 import { VStack } from './core/Stacks';
+import { promptCredentials } from './git/credentials';
 
 interface Props {
   hide: () => void;
@@ -45,6 +45,24 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
     }
   };
 
+  const doClone = async (): Promise<CloneResult> => {
+    const result = await invokeCmd<CloneResult>('cmd_git_clone', { url, dir: directory });
+    if (result.type !== 'needs_credentials') return result;
+
+    // Prompt for credentials
+    const creds = await promptCredentials({ url: result.url, error: result.error });
+    if (creds == null) throw new Error('Cancelled');
+
+    // Store credentials and retry
+    await invokeCmd('cmd_git_add_credential', {
+      remoteUrl: result.url,
+      username: creds.username,
+      password: creds.password,
+    });
+
+    return invokeCmd<CloneResult>('cmd_git_clone', { url, dir: directory });
+  };
+
   const handleClone = async (e: React.FormEvent) => {
     e.preventDefault();
     if (!url || !directory) return;
@@ -53,29 +71,17 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
     setError(null);
 
     try {
-      // Clone the repository
-      await invokeCmd('cmd_git_clone', { url, dir: directory });
+      const result = await doClone();
 
-      // Create a new workspace
-      const workspaceId = await createGlobalModel({ model: 'workspace', name: repoName });
-      if (workspaceId == null) {
-        throw new Error('Failed to create workspace');
+      if (result.type === 'needs_credentials') {
+        setError(
+          result.error ?? 'Authentication failed. Please check your credentials and try again.',
+        );
+        return;
       }
 
-      // Get and update workspace meta to set the sync directory
-      const workspaceMeta = await invokeCmd<WorkspaceMeta>('cmd_get_workspace_meta', {
-        workspaceId,
-      });
-      await updateModel({
-        ...workspaceMeta,
-        settingSyncDir: directory,
-      });
-
-      // Navigate to the new workspace
-      await router.navigate({
-        to: '/workspaces/$workspaceId',
-        params: { workspaceId },
-      });
+      // Open the workspace from the cloned directory
+      await openWorkspaceFromSyncDir.mutateAsync(directory);
 
       hide();
     } catch (err) {

src-web/components/CloneGitRepositoryDialog.tsx

@@ -1,48 +1,16 @@
 import type { GitCallbacks } from '@yaakapp-internal/git';
-import { showPromptForm } from '../../lib/prompt-form';
-import { Banner } from '../core/Banner';
-import { InlineCode } from '../core/InlineCode';
+import { promptCredentials } from './credentials';
 import { addGitRemote } from './showAddRemoteDialog';
 
 export function gitCallbacks(dir: string): GitCallbacks {
   return {
     addRemote: async () => {
       return addGitRemote(dir);
     },
-    promptCredentials: async ({ url: remoteUrl, error }) => {
-      const isGitHub = /github\.com/i.test(remoteUrl);
-      const userLabel = isGitHub ? 'GitHub Username' : 'Username';
-      const passLabel = isGitHub ? 'GitHub Personal Access Token' : 'Password / Token';
-      const userDescription = isGitHub ? 'Use your GitHub username (not your email).' : undefined;
-      const passDescription = isGitHub
-        ? 'GitHub requires a Personal Access Token (PAT) for write operations over HTTPS. Passwords are not supported.'
-        : 'Enter your password or access token for this Git server.';
-      const r = await showPromptForm({
-        id: 'git-credentials',
-        title: 'Credentials Required',
-        description: error ? (
-          <Banner color="danger">{error}</Banner>
-        ) : (
-          <>
-            Enter credentials for <InlineCode>{remoteUrl}</InlineCode>
-          </>
-        ),
-        inputs: [
-          { type: 'text', name: 'username', label: userLabel, description: userDescription },
-          {
-            type: 'text',
-            name: 'password',
-            label: passLabel,
-            description: passDescription,
-            password: true,
-          },
-        ],
-      });
-      if (r == null) throw new Error('Cancelled credentials prompt');
-
-      const username = String(r.username || '');
-      const password = String(r.password || '');
-      return { username, password };
+    promptCredentials: async ({ url, error }) => {
+      const creds = await promptCredentials({ url, error });
+      if (creds == null) throw new Error('Cancelled credentials prompt');
+      return creds;
     },
   };
 }

src-web/components/git/callbacks.tsx

@@ -0,0 +1,50 @@
+import { showPromptForm } from '../../lib/prompt-form';
+import { Banner } from '../core/Banner';
+import { InlineCode } from '../core/InlineCode';
+
+export interface GitCredentials {
+  username: string;
+  password: string;
+}
+
+export async function promptCredentials({
+  url: remoteUrl,
+  error,
+}: {
+  url: string;
+  error: string | null;
+}): Promise<GitCredentials | null> {
+  const isGitHub = /github\.com/i.test(remoteUrl);
+  const userLabel = isGitHub ? 'GitHub Username' : 'Username';
+  const passLabel = isGitHub ? 'GitHub Personal Access Token' : 'Password / Token';
+  const userDescription = isGitHub ? 'Use your GitHub username (not your email).' : undefined;
+  const passDescription = isGitHub
+    ? 'GitHub requires a Personal Access Token (PAT) for write operations over HTTPS. Passwords are not supported.'
+    : 'Enter your password or access token for this Git server.';
+  const r = await showPromptForm({
+    id: 'git-credentials',
+    title: 'Credentials Required',
+    description: error ? (
+      <Banner color="danger">{error}</Banner>
+    ) : (
+      <>
+        Enter credentials for <InlineCode>{remoteUrl}</InlineCode>
+      </>
+    ),
+    inputs: [
+      { type: 'text', name: 'username', label: userLabel, description: userDescription },
+      {
+        type: 'text',
+        name: 'password',
+        label: passLabel,
+        description: passDescription,
+        password: true,
+      },
+    ],
+  });
+  if (r == null) return null;
+
+  const username = String(r.username || '');
+  const password = String(r.password || '');
+  return { username, password };
+}