@comate/zulu 1.5.0 → 1.5.2

package/comate-engine/assets/skills/icode/scripts/build_git_commit_payload.py

@@ -43,6 +43,22 @@ def _get_current_branch(workspace):
     return ""
 
 
+def _get_upstream_branch(workspace):
+    """获取当前分支的上游远端分支名（strip remote 前缀）"""
+    try:
+        result = subprocess.run(
+            ["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"],
+            capture_output=True, text=True, encoding="utf-8", errors="replace",
+            timeout=10, cwd=workspace
+        )
+        if result.returncode == 0 and result.stdout.strip():
+            upstream = result.stdout.strip()
+            return upstream.split("/", 1)[-1] if "/" in upstream else upstream
+    except (subprocess.TimeoutExpired, FileNotFoundError, OSError):
+        pass
+    return ""
+
+
 def _get_remote_branches(workspace, current_branch):
     try:
         result = subprocess.run(
@@ -74,7 +90,9 @@ def _build_workspace_entry(workspace_path, diff_info):
     repo_name = os.path.basename(workspace_path)
 
     if has_changes:
-        current_branch = _get_current_branch(workspace_path)
+        local_branch = _get_current_branch(workspace_path)
+        upstream_branch = _get_upstream_branch(workspace_path)
+        current_branch = upstream_branch or local_branch
         remote_branches = _get_remote_branches(workspace_path, current_branch)
         diff_summary = {
             "changed_files": diff_info.get("changed_files", []),