fix: resolve all 6 Copilot review comments on PR #7

1. MinimalIntegration.cs: Fix System.Version comment accuracy
2. RealDownloadService.cs: Accept _updateUrl as-is (no /Upgrade/Verification append),
   add tenantId, use TryGetProperty for response parsing, add productId param,
   lowercase platform values
3. NamedPipeIPC.cs: Use Environment.ProcessId for unique pipe name,
   enforce timeoutMs via linked CancellationTokenSource with TimeoutException
4. clinerules/05: Fix curl appType from 1 to 0, fix manifest path

Author: JusterZhu

.claude/skills/generalupdate-advanced/templates/NamedPipeIPC.cs

@@ -20,18 +20,30 @@
 /// </summary>
 public class NamedPipeIpcProvider : IAsyncDisposable
 {
-    private const string PipeName = "GeneralUpdate_IPC_";
+    // Unique pipe name per client process — prevents collisions between parallel instances
+    private readonly string _pipeName = $"GeneralUpdate_IPC_{Environment.ProcessId}";
     private NamedPipeServerStream? _server;
     private NamedPipeClientStream? _client;
     private readonly CancellationTokenSource _cts = new();
 
     /// <summary>Called by Client process: create server pipe, wait for Upgrade.</summary>
     public async Task<string> ServerWaitAsync(int timeoutMs = 30000)
     {
-        _server = new NamedPipeServerStream(PipeName, PipeDirection.InOut,
+        _server = new NamedPipeServerStream(_pipeName, PipeDirection.InOut,
             maxNumberOfServerInstances: 1, TransmissionMode.Byte, PipeOptions.Asynchronous);
-        await _server.WaitForConnectionAsync(_cts.Token);
-        return PipeName;
+
+        // Enforce caller-supplied timeout via CancellationTokenSource
+        using var timeoutCts = new CancellationTokenSource(timeoutMs);
+        using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, _cts.Token);
+        try
+        {
+            await _server.WaitForConnectionAsync(linkedCts.Token);
+        }
+        catch (OperationCanceledException) when (timeoutCts.IsCancellationRequested)
+        {
+            throw new TimeoutException($"Upgrade process did not connect within {timeoutMs}ms");
+        }
+        return _pipeName;
     }
 
     /// <summary>Called by Upgrade process: connect to Client pipe.</summary>

.claude/skills/generalupdate-init/templates/MinimalIntegration.cs

@@ -47,12 +47,12 @@ public static async Task<bool> RunAsync()
  * 3. 文件放错目录（必须和 .exe 同级）
  * 4. UpdatePath 写成了相对路径但当前目录不对
  *
- * ⚠️ 版本号规则：必须使用 4 段式，如 "1.0.0.0"
- *   "1.0" 被 System.Version 解析为 1.0.0.0（Build=-1, Revision=-1）。
- *   但服务器返回 1.0.0.0（Build=0, Revision=0），
- *   new Version("1.0") < new Version("1.0.0.0") 成立，
- *   导致版本比较误判为"有更新"→ 无限升级循环。
- *   务必始终使用 4 段式版本号。
+ * ⚠️ Version format: Must use 4 segments, e.g. "1.0.0.0"
+ *   new Version("1.0") parses to 1.0.-1.-1 (Build=-1, Revision=-1),
+ *   NOT 1.0.0.0. When the server returns 1.0.0.0 (Build=0, Revision=0),
+ *   new Version("1.0") < new Version("1.0.0.0") is TRUE,
+ *   causing a false "update available" detection → infinite upgrade loop.
+ *   ALWAYS use 4-segment version strings everywhere.
  *
  * ⚠️ 路径规则：
  *   InstallPath: 可写 "."（表示 exe 所在目录）或绝对路径

.claude/skills/generalupdate-ui/templates/RealDownloadService.cs

@@ -45,15 +45,17 @@ public class RealDownloadService : IDownloadService
     private readonly string _updateUrl;
     private readonly string _secretKey;
     private readonly AppType _appType;
+    private readonly string _productId;
     private CancellationTokenSource? _cts;
     private int _retryCount;
     private const int MaxRetries = 3;
 
-    public RealDownloadService(string updateUrl, string secretKey, AppType appType = AppType.Client)
+    public RealDownloadService(string updateUrl, string secretKey, AppType appType = AppType.Client, string productId = "unknown")
     {
         _updateUrl = updateUrl;
         _secretKey = secretKey;
         _appType = appType;
+        _productId = productId;
 
         CurrentStatistics = new DownloadStatistics
         {
@@ -132,39 +134,56 @@ private async Task RunCheckAsync(CancellationToken token)
 
         try
         {
-            // 直接调用服务端 /Upgrade/Verification API 仅检查版本
-            // 不触发 LaunchAsync（避免启动完整下载+升级流程）
             using var client = new HttpClient { Timeout = TimeSpan.FromSeconds(10) };
 
             var payload = JsonSerializer.Serialize(new
             {
                 appKey = _secretKey,
                 appType = (int)_appType,
                 clientVersion = GetCurrentVersion(),
-                productId = GetProductId(),
-                platform = GetPlatform()
+                productId = _productId,
+                platform = GetPlatform(),
+                tenantId = "default"
             });
 
+            // Use _updateUrl as-is; it should already point to the full Verification endpoint
             var response = await client.PostAsync(
-                _updateUrl.TrimEnd('/') + "/Upgrade/Verification",
+                _updateUrl,
                 new StringContent(payload, Encoding.UTF8, "application/json"),
                 token);
 
             if (!response.IsSuccessStatusCode)
             {
-                ErrorOccurred?.Invoke($"服务器返回 {(int)response.StatusCode}");
+                ErrorOccurred?.Invoke($"Server returned {(int)response.StatusCode}");
                 UpdateState(DownloadStatus.DownloadError);
                 return;
             }
 
             var json = await response.Content.ReadAsStringAsync(token);
             using var doc = JsonDocument.Parse(json);
-            var body = doc.RootElement.GetProperty("body");
+
+            // Check for server error envelope first: { code, message, body }
+            if (doc.RootElement.TryGetProperty("code", out var codeProp) &&
+                codeProp.GetInt32() != 200)
+            {
+                var msg = doc.RootElement.TryGetProperty("message", out var msgProp)
+                    ? msgProp.GetString() ?? "Unknown server error"
+                    : "Unknown server error";
+                ErrorOccurred?.Invoke($"Server error: {msg}");
+                UpdateState(DownloadStatus.DownloadError);
+                return;
+            }
+
+            if (!doc.RootElement.TryGetProperty("body", out var body) || body.GetArrayLength() == 0)
+            {
+                UpdateState(DownloadStatus.AlreadyLatest);
+                return;
+            }
+
             var hasUpdate = body.GetArrayLength() > 0;
 
             if (hasUpdate)
             {
-                // 读取第一个版本的信息填充统计
                 var first = body[0];
                 CurrentStatistics.Version = first.TryGetProperty("version", out var v) ? v.GetString() : null;
                 CurrentStatistics.TotalBytesToReceive = first.TryGetProperty("size", out var s) ? s.GetInt64() : 0;
@@ -178,12 +197,12 @@ private async Task RunCheckAsync(CancellationToken token)
         }
         catch (OperationCanceledException)
         {
-            ErrorOccurred?.Invoke("检查已取消");
+            ErrorOccurred?.Invoke("Check cancelled");
             UpdateState(DownloadStatus.Idle);
         }
         catch (Exception ex)
         {
-            ErrorOccurred?.Invoke($"检查更新失败: {ex.Message}");
+            ErrorOccurred?.Invoke($"Check failed: {ex.Message}");
             UpdateState(DownloadStatus.DownloadError);
         }
     }
@@ -194,18 +213,12 @@ private static string GetCurrentVersion()
             ?.GetName()?.Version?.ToString(4) ?? "1.0.0.0";
     }
 
-    private static string GetProductId()
-    {
-        // 从 manifest 中读取，简化实现
-        return "unknown";
-    }
-
     private static string GetPlatform()
     {
-        if (OperatingSystem.IsWindows()) return "Windows";
-        if (OperatingSystem.IsLinux()) return "Linux";
-        if (OperatingSystem.IsMacOS()) return "MacOS";
-        return "Unknown";
+        if (OperatingSystem.IsWindows()) return "windows";
+        if (OperatingSystem.IsLinux()) return "linux";
+        if (OperatingSystem.IsMacOS()) return "macos";
+        return "unknown";
     }
 
     private async Task RunDownloadAsync(CancellationToken token)

.clinerules/05-generalupdate-troubleshoot.md

@@ -69,10 +69,10 @@ tags: ["dotnet", "generalupdate"]
 
 ```bash
 # 测试 API 是否可访问
-curl -v -X POST "http://your-server/Upgrade/Verification" -H "Content-Type: application/json" -d '{"appKey":"xxx","appType":1,"clientVersion":"1.0.0.1","productId":"xxx","platform":"windows","tenantId":"default"}'
+curl -v -X POST "http://your-server/Upgrade/Verification" -H "Content-Type: application/json" -d '{"appKey":"xxx","appType":0,"clientVersion":"1.0.0.1","productId":"xxx","platform":"windows","tenantId":"default"}'
 
-# 验证 manifest.json 内容
-cat /path/to/app/manifest.json | jq .
+# 验证 generalupdate.manifest.json 内容
+cat /path/to/app/generalupdate.manifest.json | jq .
 
 # 检查 UpgradeApp 是否存在
 ls -la /path/to/app/Upgrade/Upgrade.exe