feat: full git management — fetch, pull, force push, stash, branch delete/merge, create PR, fix remote checkout

Author: Swofty-Developments

crates/tauri-app/agent-sidecar/index.mjs

@@ -55,6 +55,11 @@ let approvalCounter = 0;
 let hasCompletedQuery = false;
 let lastSessionId = null;
 
+// Incremental streaming state — the SDK yields full message snapshots,
+// so we diff against the previous lengths to emit only new characters.
+let lastTextLen = 0;
+let lastThinkingLen = 0;
+
 // ── Stdin reader ─────────────────────────────────────────────────────────────
 
 const rl = createInterface({ input: process.stdin, terminal: false });
@@ -187,6 +192,10 @@ async function handleQuery(cmd) {
   let capturedSessionId = sessionId || null;
   let turnEmitted = false;
 
+  // Reset incremental streaming counters for new query.
+  lastTextLen = 0;
+  lastThinkingLen = 0;
+
   // Emit turn_started so the frontend shows "generating" state
   emit({ type: "turn_started" });
 
@@ -250,6 +259,8 @@ async function handleQuery(cmd) {
 
         hasCompletedQuery = true;
         lastSessionId = capturedSessionId;
+        lastTextLen = 0;
+        lastThinkingLen = 0;
         emit({ type: "turn_completed", sessionId: capturedSessionId || "" });
         turnEmitted = true;
         continue;
@@ -264,11 +275,13 @@ async function handleQuery(cmd) {
         continue;
       }
 
-      // assistant message — extract content blocks
+      // assistant message — extract content blocks (incremental diff)
       if (msgType === "assistant" && message.message?.content) {
         for (const block of message.message.content) {
           if (block.type === "text" && block.text) {
-            emit({ type: "text_delta", text: block.text });
+            const newText = block.text.slice(lastTextLen);
+            if (newText) emit({ type: "text_delta", text: newText });
+            lastTextLen = block.text.length;
           } else if (block.type === "tool_use") {
             emit({
               type: "tool_use_start",
@@ -283,7 +296,9 @@ async function handleQuery(cmd) {
               });
             }
           } else if (block.type === "thinking" && block.thinking) {
-            emit({ type: "thinking_delta", text: block.thinking });
+            const newThinking = block.thinking.slice(lastThinkingLen);
+            if (newThinking) emit({ type: "thinking_delta", text: newThinking });
+            lastThinkingLen = block.thinking.length;
           }
         }
         continue;

crates/tauri-app/frontend/e2e/helpers.ts

@@ -280,6 +280,26 @@ export async function injectMockIPC(page: Page) {
         case "list_slash_commands":
           return [{ name: "/help", description: "Show help", source: "built-in" }];
 
+        // Git extended
+        case "git_fetch":
+          return "Fetched successfully";
+        case "git_pull":
+          return "Already up to date.";
+        case "git_push_force":
+          return "Force pushed successfully";
+        case "git_delete_branch":
+          return `Deleted branch ${args.name}`;
+        case "git_merge_branch":
+          return `Merged ${args.branch}`;
+        case "git_stash":
+          return "Saved working directory";
+        case "git_stash_pop":
+          return "Applied stash";
+        case "git_create_pr":
+          return `https://github.com/test/repo/pull/1`;
+        case "git_diff_branches":
+          return [];
+
         // Diff
         case "get_changed_files":
         case "get_session_diff":

crates/tauri-app/frontend/src/components/chat/ThreadSetup.tsx

@@ -22,6 +22,8 @@ export function ThreadSetup(props: Props) {
   async function loadBranches() {
     setLoadingBranches(true);
     try {
+      // Fetch first so remote-only branches are available locally
+      await ipc.gitFetch(props.repoPath).catch(() => {});
       const list = await ipc.gitBranches(props.repoPath);
       setBranches(list);
     } catch (e) {
@@ -39,6 +41,8 @@ export function ThreadSetup(props: Props) {
         const thread = store.projects.flatMap((p) => p.threads).find((t) => t.id === props.threadId);
         const wt = await ipc.createWorktree(props.threadId, thread?.title || "worktree", props.repoPath);
         setStore("worktrees", props.threadId, wt);
+        // Fetch so remote-only branches can be checked out
+        await ipc.gitFetch(wt.path).catch(() => {});
         // Checkout the requested branch in the worktree
         if (branchName !== "main" && branchName !== "master") {
           await ipc.gitCheckout(wt.path, branchName);