Auto-resolve cherry-pick conflicts via AI chat in the pick branch window

Not working well yet

Author: timxx

qgitc/aichatwidget.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import json
+import os
 import typing
 from typing import Any, Dict, List, Optional, Tuple, Union
 
@@ -40,6 +41,8 @@
     AGENT_SYS_PROMPT,
     CODE_REVIEW_PROMPT,
     CODE_REVIEW_SYS_PROMPT,
+    RESOLVE_PROMPT,
+    RESOLVE_SYS_PROMPT,
 )
 from qgitc.preferences import Preferences
 from qgitc.submoduleexecutor import SubmoduleExecutor
@@ -115,7 +118,11 @@ def __init__(self, parent=None, embedded=False):
         # Code review diff collection (staged/local changes)
         self._codeReviewExecutor: Optional[SubmoduleExecutor] = None
         self._codeReviewDiffs: List[str] = []
-        self._codeReviewScene: str = None
+        self._extraContext: str = None
+
+        # Sync helper flows can optionally auto-run a tightly-scoped set of
+        # WRITE tools without user confirmation.
+        self._allowWriteTools: bool = False
 
         self._isInitialized = False
         QTimer.singleShot(100, self._onDelayInit)
@@ -136,10 +143,10 @@ def event(self, event: QEvent):
             return True
         if event.type() == CodeReviewSceneEvent.Type:
             if event.scene_line:
-                if not self._codeReviewScene:
-                    self._codeReviewScene = event.scene_line
+                if not self._extraContext:
+                    self._extraContext = event.scene_line
                 else:
-                    self._codeReviewScene += "\n" + event.scene_line
+                    self._extraContext += "\n" + event.scene_line
             return True
         return super().event(event)
 
@@ -281,7 +288,7 @@ def queryClose(self):
             self._codeReviewExecutor.cancel()
             self._codeReviewExecutor = None
             self._codeReviewDiffs.clear()
-            self._codeReviewScene = None
+        self._extraContext = None
 
     def sizeHint(self):
         if self._embedded:
@@ -412,7 +419,7 @@ def _doRequest(self, prompt: str, chatMode: AiChatMode, sysPrompt: str = None, c
         titleSeed = (params.sys_prompt + "\n" +
                      prompt) if params.sys_prompt else prompt
 
-        codeReviewContext: Optional[str] = None
+        extraContext = self._extraContext
 
         if chatMode == AiChatMode.Agent:
             params.tools = AgentToolRegistry.openai_tools()
@@ -430,9 +437,9 @@ def _doRequest(self, prompt: str, chatMode: AiChatMode, sysPrompt: str = None, c
             params.tool_choice = "auto"
             params.sys_prompt = sysPrompt or CODE_REVIEW_SYS_PROMPT
 
-            scene = (self._codeReviewScene or "").strip(
+            scene = (self._extraContext or "").strip(
             ) or "(no scene metadata)"
-            codeReviewContext = "CODE REVIEW SCENE (metadata)\n" + scene
+            extraContext = "CODE REVIEW SCENE (metadata)\n" + scene
             params.prompt = CODE_REVIEW_PROMPT.format(
                 diff=params.prompt,
                 language=ApplicationBase.instance().uiLanguage())
@@ -443,12 +450,12 @@ def _doRequest(self, prompt: str, chatMode: AiChatMode, sysPrompt: str = None, c
             contextText = provider.buildContextText(
                 selectedIds) if provider is not None else ""
 
-            if chatMode == AiChatMode.CodeReview and codeReviewContext:
+            if extraContext:
                 merged = (contextText or "").strip()
                 if merged:
-                    merged += "\n\n" + codeReviewContext
+                    merged += "\n\n" + extraContext
                 else:
-                    merged = codeReviewContext
+                    merged = extraContext
                 contextText = merged
 
             if contextText:
@@ -531,7 +538,13 @@ def _doMessageReady(self, model: AiModelBase, response: AiResponse, collapsed=Fa
                 tool = AgentToolRegistry.tool_by_name(
                     toolName) if toolName else None
 
-                if toolName and tool and tool.tool_type == ToolType.READ_ONLY:
+                # Auto-run only READ_ONLY tools by default. For certain sync helper
+                # flows we optionally auto-run *WRITE* tools, but never DANGEROUS.
+                if toolName and tool and (
+                    tool.tool_type == ToolType.READ_ONLY or (
+                        self._allowWriteTools and tool.tool_type == ToolType.WRITE
+                    )
+                ):
                     if autoGroupId is None:
                         autoGroupId = self._nextAutoGroupId
                         self._nextAutoGroupId += 1
@@ -935,7 +948,7 @@ def _appendRepoFileSummary(repoLabel: str, sha1: str, repoDiff: str):
         curHistory = self._historyPanel.currentHistory()
         if not curHistory or curHistory.messages:
             self._createNewConversation()
-        self._codeReviewScene = scene
+        self._extraContext = scene
         self._doRequest(diff, AiChatMode.CodeReview)
 
     def _makeFileList(self, files: List[str]) -> str:
@@ -957,7 +970,7 @@ def codeReviewForStagedFiles(self, submodules):
         """Start a code review for staged/local changes across submodules."""
         self._ensureCodeReviewExecutor()
         self._codeReviewDiffs.clear()
-        self._codeReviewScene = "type: staged changes (index)\n"
+        self._extraContext = "type: staged changes (index)\n"
         self._codeReviewExecutor.submit(submodules, self._fetchStagedDiff)
 
     def _ensureCodeReviewExecutor(self):
@@ -1171,7 +1184,7 @@ def _loadMessagesFromHistory(self, messages: List[Dict], addToChatBot=True):
             if role == AiRole.Assistant and isinstance(toolCalls, list) and toolCalls:
                 toolCallResult, hasMoreMessages = self._collectToolCallResult(
                     i + 1, messages)
-                
+
                 for tc in toolCalls:
                     if not isinstance(tc, dict):
                         continue
@@ -1293,7 +1306,7 @@ def _clearCurrentChat(self):
         self._autoToolGroups.clear()
         self._nextAutoGroupId = 1
         self._codeReviewDiffs.clear()
-        self._codeReviewScene = None
+        self._extraContext = None
         self.messages.clear()
 
     def _setEmbeddedRecentListVisible(self, visible: bool):
@@ -1345,3 +1358,101 @@ def _getToolIcon(toolType: int) -> str:
     @property
     def contextPanel(self) -> AiChatContextPanel:
         return self._contextPanel
+
+    def resolveConflictSync(self, repoDir: str, sha1: str, path: str, conflictText: str) -> Tuple[bool, Optional[str]]:
+        """Resolve a conflicted file given an excerpt of the working tree file.
+
+        Returns (ok, reason). On success, ok=True and reason=None.
+        """
+        self._waitForInitialization()
+        model = self.currentChatModel()
+        if not model:
+            return False, "no_model"
+
+        context = (
+            f"sha1: {sha1}\n"
+            f"conflicted_file: {path}"
+        )
+        self._extraContext = context
+
+        prompt = RESOLVE_PROMPT.format(
+            conflict=conflictText,
+        )
+
+        self._allowWriteTools = True
+
+        loop = QEventLoop()
+        done: Dict[str, object] = {"ok": False, "reason": None}
+
+        timer = QTimer()
+        timer.setSingleShot(True)
+        timer.start(5 * 60 * 1000)
+
+        oldHistoryCount = len(model.history)
+
+        def _lastAssistantTextSince(startIndex: int) -> str:
+            # Find the latest assistant message text after startIndex.
+            history = model.history[startIndex:]
+            for h in reversed(history):
+                if h.role == AiRole.Assistant:
+                    if h.message:
+                        return h.message
+            return ""
+
+        def _finalizeIfIdle():
+            # Timeout?
+            if timer.remainingTime() <= 0:
+                done["ok"] = False
+                done["reason"] = "Assistant response timed out"
+                model.requestInterruption()
+                loop.quit()
+                return
+
+            # If the assistant explicitly reported failure, honor it.
+            response = _lastAssistantTextSince(oldHistoryCount)
+            if "QGITC_RESOLVE_FAILED:" in response:
+                parts = response.split("QGITC_RESOLVE_FAILED:", 1)
+                reason = parts[1].strip() if len(parts) > 1 else ""
+                done["ok"] = False
+                done["reason"] = reason or "Assistant reported failure"
+                loop.quit()
+                return
+
+            if "QGITC_RESOLVE_OK" not in response:
+                return
+
+            # Verify the working tree file is conflict-marker-free.
+            try:
+                absPath = os.path.join(repoDir, path)
+                with open(absPath, "r", encoding="utf-8", errors="replace") as f:
+                    merged = f.read()
+            except Exception as e:
+                done["ok"] = False
+                done["reason"] = f"read_back_failed: {e}"
+                loop.quit()
+                return
+
+            if "<<<<<<<" in merged or "=======" in merged or ">>>>>>>" in merged:
+                done["ok"] = False
+                done["reason"] = "conflict_markers_remain"
+                loop.quit()
+                return
+
+            done["ok"] = True
+            done["reason"] = None
+            loop.quit()
+
+        timer.timeout.connect(_finalizeIfIdle)
+
+        # Re-check completion whenever the model finishes a generation step or
+        # a tool finishes (tools may trigger another continue-only generation).
+        model.finished.connect(_finalizeIfIdle)
+
+        self._doRequest(prompt, AiChatMode.Agent, RESOLVE_SYS_PROMPT)
+        loop.exec()
+
+        timer.stop()
+        model.finished.disconnect(_finalizeIfIdle)
+        self._allowWriteTools = False
+
+        return bool(done.get("ok", False)), done.get("reason")

qgitc/gitutils.py

@@ -369,11 +369,11 @@ def externalDiff(branchDir, commit, path=None, tool=None):
         process = GitProcess(cwd, args)
 
     @staticmethod
-    def conflictFiles():
+    def conflictFiles(repoDir=None):
         args = ["diff", "--name-only",
                 "--diff-filter=U",
                 "--no-color"]
-        data = Git.checkOutput(args)
+        data = Git.checkOutput(args, repoDir=repoDir)
         if not data:
             return None
         return data.rstrip(b'\n').decode("utf-8").split('\n')
@@ -425,17 +425,17 @@ def mergeBranchName():
         return name
 
     @staticmethod
-    def resolveBy(ours, path):
+    def resolveBy(ours, path, repoDir=None):
         args = ["checkout",
                 "--ours" if ours else "--theirs",
                 path]
-        process = Git.run(args)
+        process = Git.run(args, repoDir=repoDir)
         process.communicate()
         if process.returncode != 0:
             return False
 
         args = ["add", path]
-        process = Git.run(args)
+        process = Git.run(args, repoDir=repoDir)
         process.communicate()
         return True if process.returncode == 0 else False
 
@@ -1081,3 +1081,23 @@ def isShallowRepo(repoDir=None):
             shallowFile = os.path.join(
                 repoDir or Git.REPO_DIR, ".git", "shallow")
             return os.path.exists(shallowFile)
+
+    @staticmethod
+    def getConflictFileBlobIds(filePath, repoDir=None):
+        args = ["ls-files", "-u", "--", filePath]
+        data = Git.checkOutput(args, repoDir=repoDir)
+        if not data:
+            return None
+
+        lines = data.decode("utf-8").split('\n')
+        blobIds = {}
+        for line in lines:
+            if not line.strip():
+                continue
+            parts = line.split()
+            if len(parts) >= 3:
+                stage = int(parts[2])
+                blobId = parts[1]
+                blobIds[stage] = blobId
+
+        return blobIds