Merge branch 'release/v2026.16'

Author: love-linger

TRANSLATION.md

@@ -1 +1 @@
-2026.15
+2026.16

VERSION

@@ -20,6 +20,21 @@
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>SOURCE_GIT_VERSION</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Supported Folder</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>public.folder</string>
+			</array>
+		</dict>
+	</array>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 </dict>

build/resources/app/App.plist

@@ -14,7 +14,7 @@ public Agent(Service service)
             _service = service;
         }
 
-        public async Task GenerateCommitMessageAsync(string repo, string changeList, Action<string> onUpdate, CancellationToken cancellation)
+        public async Task GenerateCommitMessageAsync(string repo, string currentBranch, string changeList, string amendParent, Action<string> onUpdate, CancellationToken cancellation)
         {
             var chatClient = _service.GetChatClient();
             if (chatClient == null)
@@ -28,6 +28,7 @@ public async Task GenerateCommitMessageAsync(string repo, string changeList, Act
                 .AppendLine("- Output the conventional commit message (with detail changes in list) directly. Do not explain your output nor introduce your answer.")
                 .AppendLine(_service.AdditionalPrompt)
                 .Append("Repository path: ").AppendLine(repo.Quoted())
+                .Append("Current branch: ").AppendLine(currentBranch.Quoted())
                 .AppendLine("Changed files ('A' means added, 'M' means modified, 'D' means deleted, 'T' means type changed, 'R' means renamed, 'C' means copied): ")
                 .Append(changeList);
 
@@ -94,7 +95,7 @@ public async Task GenerateCommitMessageAsync(string repo, string changeList, Act
 
                             foreach (var call in completion.ToolCalls)
                             {
-                                var result = await ChatTools.ProcessAsync(call, onUpdate);
+                                var result = await ChatTools.ProcessAsync(call, repo, amendParent, onUpdate);
                                 messages.Add(result);
                             }
 

src/AI/Agent.cs

@@ -15,10 +15,6 @@ public static class ChatTools
             {
                 "type": "object",
                 "properties": {
-                    "repo": {
-                        "type": "string",
-                        "description": "The path to the repository."
-                    },
                     "file": {
                         "type": "string",
                         "description": "The path to the file."
@@ -28,28 +24,25 @@ public static class ChatTools
                         "description": "The path to the original file when it has been renamed or copied."
                     }
                  },
-                 "required": ["repo", "file"]
+                 "required": ["file"]
             }
             """)), false);
 
-        public static async Task<ToolChatMessage> ProcessAsync(ChatToolCall call, Action<string> output)
+        public static async Task<ToolChatMessage> ProcessAsync(ChatToolCall call, string repo, string amendParent, Action<string> output)
         {
             using var doc = JsonDocument.Parse(call.FunctionArguments);
 
             if (call.FunctionName.Equals(GetDetailChangesInFile.FunctionName))
             {
-                var hasRepo = doc.RootElement.TryGetProperty("repo", out var repoPath);
                 var hasFile = doc.RootElement.TryGetProperty("file", out var filePath);
                 var hasOriginalFile = doc.RootElement.TryGetProperty("originalFile", out var originalFilePath);
-                if (!hasRepo)
-                    throw new ArgumentException("repo", "The repo argument is required");
                 if (!hasFile)
                     throw new ArgumentException("file", "The file argument is required");
 
                 output?.Invoke($"Read changes in file: {filePath.GetString()}");
 
                 var orgFilePath = hasOriginalFile ? originalFilePath.GetString() : string.Empty;
-                var rs = await new Commands.GetFileChangeForAI(repoPath.GetString(), filePath.GetString(), orgFilePath).ReadAsync();
+                var rs = await new Commands.GetFileChangeForAI(repo, filePath.GetString(), orgFilePath, amendParent).ReadAsync();
                 var message = rs.IsSuccess ? rs.StdOut : string.Empty;
                 return new ToolChatMessage(call.Id, message);
             }

src/AI/ChatTools.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading;
 using Avalonia.Media;
 
 namespace SourceGit
@@ -79,6 +80,12 @@ public static T Use<T>(this T cmd, Models.ICommandLog log) where T : Commands.Co
             cmd.Log = log;
             return cmd;
         }
+
+        public static T WithCancellation<T>(this T cmd, CancellationToken token) where T : Commands.Command
+        {
+            cmd.CancellationToken = token;
+            return cmd;
+        }
     }
 
     public static class DirectoryInfoExtension

src/App.Extensions.cs

@@ -11,6 +11,7 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Media.Fonts;
+using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
 
@@ -101,8 +102,11 @@ public static async Task<bool> AskConfirmAsync(string message, Models.ConfirmBut
 
         public static void SetLocale(string localeKey)
         {
+            var locale = Models.Locale.Supported.Find(x => x.Key.Equals(localeKey, StringComparison.OrdinalIgnoreCase));
+            var finalLocaleKey = locale?.Key ?? "en_US";
+
             if (Current is not App app ||
-                app.Resources[localeKey] is not ResourceDictionary targetLocale ||
+                app.Resources[finalLocaleKey] is not ResourceDictionary targetLocale ||
                 targetLocale == app._activeLocale)
                 return;
 
@@ -472,6 +476,15 @@ private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
             Native.OS.SetupExternalTools();
             Models.AvatarManager.Instance.Start();
 
+            if (this.TryGetFeature<IActivatableLifetime>() is { } activatable)
+            {
+                activatable.Activated += (_, e) =>
+                {
+                    if (e is FileActivatedEventArgs { Files: { Count: > 0 } } fileArgs)
+                        _launcher?.TryOpenRepositoryFromPath(fileArgs.Files[0].Path.LocalPath);
+                };
+            }
+
             string startupRepo = null;
             if (desktop.Args is { Length: 1 })
             {
@@ -524,6 +537,9 @@ private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
         #region Check for Updates
         private void Check4Update(bool manually = false)
         {
+            if (_launcher != null)
+                _launcher.NewVersion = null;
+
             Task.Run(async () =>
             {
                 try
@@ -537,23 +553,20 @@ private void Check4Update(bool manually = false)
                     if (ver == null)
                         return;
 
-                    // Check if already up-to-date.
-                    if (!ver.IsNewVersion)
+                    if (manually)
                     {
-                        if (manually)
+                        if (ver.IsNewVersion)
+                            ShowSelfUpdateResult(ver);
+                        else
                             ShowSelfUpdateResult(new Models.AlreadyUpToDate());
-                        return;
                     }
-
-                    // Should not check ignored tag if this is called manually.
-                    if (!manually)
+                    else if (_launcher != null)
                     {
-                        var pref = ViewModels.Preferences.Instance;
-                        if (ver.TagName == pref.IgnoreUpdateTag)
+                        if (!ver.IsNewVersion || ver.TagName == ViewModels.Preferences.Instance.IgnoreUpdateTag)
                             return;
-                    }
 
-                    ShowSelfUpdateResult(ver);
+                        _launcher.NewVersion = ver;
+                    }
                 }
                 catch (Exception e)
                 {

src/App.axaml.cs

@@ -48,9 +48,9 @@ public async Task<bool> DeleteLocalAsync(bool force)
             return await ExecAsync().ConfigureAwait(false);
         }
 
-        public async Task<bool> DeleteRemoteAsync(string remote)
+        public async Task<bool> DeleteRemoteAsync(string remote, bool force)
         {
-            Args = $"branch -D -r {remote}/{_name}";
+            Args = $"branch {(force ? "-D" : "-d")} -r {remote}/{_name}";
             return await ExecAsync().ConfigureAwait(false);
         }
 

src/Commands/Branch.cs

@@ -62,7 +62,7 @@ public async Task<bool> ExecAsync()
                         lock (capturedLock)
                         {
                             if (captured is { Process: { HasExited: false } })
-                                captured.Process.Kill();
+                                captured.Process.Kill(true);
                         }
                     });
                 }

src/Commands/Command.cs

@@ -144,20 +144,23 @@ private void ParseLine(ArraySegment<byte> lineBytes)
             if (line.Length == 0)
                 return;
 
-            // If we are reading a chunk body, try to read the current line as body first (because
-            // the number of chunk body is greater than the number of chunk indicator in most time.
+            // If we are reading a chunk-body, try to read the current line as chunk-body first (because
+            // there are usually more chunk-body lines than chunk-indicator lines).
             if (_isInChunk)
             {
-                if (ParseChunkBodyLine(line, lineBytes[1..]))
+                if (ParseChunkBodyLine(line, lineBytes))
                     return;
 
                 ProcessInlineHighlights();
                 _isInChunk = false;
             }
 
-            // If the current line is not a chunk body, try to parse it as chunk indicator
+            // If the current line is not a chunk-body, try to parse it as chunk-indicator
             if (ParseChunkStartLine(line))
+            {
+                _isInChunk = true;
                 return;
+            }
 
             // Fallback to diff headers to support type-changed diff (multiple headers).
             ParseDiffHeaderLine(line);
@@ -193,7 +196,6 @@ private bool ParseChunkStartLine(string line)
                 _newLine = int.Parse(match.Groups[2].Value);
                 _last = new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, null, 0, 0);
                 _result.TextDiff.Lines.Add(_last);
-                _isInChunk = true;
                 return true;
             }
 
@@ -204,13 +206,14 @@ private bool ParseChunkBodyLine(string line, ArraySegment<byte> lineBytes)
         {
             var prefix = line[0];
             var content = line.Substring(1);
+            var rawContent = lineBytes[1..].ToArray();
             if (ParseLFSChange(prefix, content))
                 return true;
 
             if (prefix == PREFIX_DELETED)
             {
                 _result.TextDiff.DeletedLines++;
-                _last = new Models.TextDiffLine(Models.TextDiffLineType.Deleted, content, lineBytes.ToArray(), _oldLine, 0);
+                _last = new Models.TextDiffLine(Models.TextDiffLineType.Deleted, content, rawContent, _oldLine, 0);
                 _deleted.Add(_last);
                 _oldLine++;
                 return true;
@@ -219,7 +222,7 @@ private bool ParseChunkBodyLine(string line, ArraySegment<byte> lineBytes)
             if (prefix == PREFIX_ADDED)
             {
                 _result.TextDiff.AddedLines++;
-                _last = new Models.TextDiffLine(Models.TextDiffLineType.Added, content, lineBytes.ToArray(), 0, _newLine);
+                _last = new Models.TextDiffLine(Models.TextDiffLineType.Added, content, rawContent, 0, _newLine);
                 _added.Add(_last);
                 _newLine++;
                 return true;
@@ -229,7 +232,7 @@ private bool ParseChunkBodyLine(string line, ArraySegment<byte> lineBytes)
             {
                 ProcessInlineHighlights();
 
-                _last = new Models.TextDiffLine(Models.TextDiffLineType.Normal, content, lineBytes.ToArray(), _oldLine, _newLine);
+                _last = new Models.TextDiffLine(Models.TextDiffLineType.Normal, content, rawContent, _oldLine, _newLine);
                 _result.TextDiff.Lines.Add(_last);
                 _oldLine++;
                 _newLine++;