cicy-desktop 2.1.119 → 2.1.121

package/.github/workflows/windows-exe-release.yml

@@ -95,6 +95,27 @@ jobs:
           path: dist/*.exe
           if-no-files-found: error
 
+      # 把最新的安装 exe 推到 OSS 的**单一固定 key**(主人:latest 只发一个)。
+      # 每次发版覆盖同一个文件,永远只有一个 latest，URL 不变:
+      #   https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com/releases/cicy-desktop-latest.exe
+      - name: Upload latest EXE to OSS (single 'latest' file, overwritten)
+        shell: pwsh
+        env:
+          OSS_AK: ${{ secrets.OSS_ACCESS_KEY_ID }}
+          OSS_SK: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
+        run: |
+          Invoke-WebRequest -Uri "https://gosspublic.alicdn.com/ossutil/1.7.18/ossutil-v1.7.18-windows-amd64.zip" -OutFile ossutil.zip
+          Expand-Archive -LiteralPath ossutil.zip -DestinationPath ossutil-dir -Force
+          $oss = "ossutil-dir\ossutil-v1.7.18-windows-amd64\ossutil.exe"
+          & $oss config -e oss-cn-shanghai.aliyuncs.com -i "$env:OSS_AK" -k "$env:OSS_SK"
+          $exe = Get-ChildItem dist\*.exe | Where-Object { $_.Name -match 'Setup' } | Select-Object -First 1
+          if (-not $exe) { $exe = Get-ChildItem dist\*.exe | Select-Object -First 1 }
+          if (-not $exe) { Write-Error "no exe found in dist"; exit 1 }
+          Write-Host "Uploading $($exe.Name) -> oss://cicy-1372193042-cn/releases/cicy-desktop-latest.exe"
+          & $oss cp "$($exe.FullName)" "oss://cicy-1372193042-cn/releases/cicy-desktop-latest.exe" -f --acl public-read
+          if ($LASTEXITCODE -ne 0) { Write-Error "ossutil upload failed"; exit 1 }
+          Write-Host "Latest EXE: https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com/releases/cicy-desktop-latest.exe"
+
       - name: Publish release (drop draft, mark latest)
         # Only promote AFTER all assets uploaded successfully. autoUpdater on
         # existing clients will pick up the new version on its next poll.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.119",
+  "version": "2.1.121",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -98,7 +98,9 @@
       "allowToChangeInstallationDirectory": false,
       "oneClick": true,
       "perMachine": false,
-      "allowElevation": true
+      "allowElevation": true,
+      "createDesktopShortcut": "always",
+      "createStartMenuShortcut": true
     },
     "electronVersion": "41.0.3"
   },

package/src/sidecar/wsl-docker.js

@@ -193,13 +193,22 @@ async function startEngine() {
         "if ! pgrep dockerd >/dev/null 2>&1; then rm -f /var/run/docker.pid /run/docker.pid /var/run/docker.sock /run/docker.sock; fi; " +
         "pgrep dockerd >/dev/null 2>&1 || (nohup dockerd >/var/log/cicy-dockerd.log 2>&1 &); " +
         // First boot of a freshly-imported distro: cold WSL2 VM + large pre-baked
-        // /var/lib/docker → give it longer than 20s.
-        "for i in $(seq 1 40); do [ -S /var/run/docker.sock ] && docker version >/dev/null 2>&1 && break; sleep 1; done",
-        { timeout: 60000 });
+        // /var/lib/docker (restoring containers + overlay) can take well over 40s.
+        // Wait up to 120s — the 40s window was too short on cold boot, which made
+        // the next attempt pkill the STILL-INITIALIZING daemon and relaunch it
+        // cold again (a restart loop → 「引擎没起来」even though dockerd was fine).
+        "for i in $(seq 1 120); do [ -S /var/run/docker.sock ] && docker version >/dev/null 2>&1 && break; sleep 1; done",
+        { timeout: 150000 });
     } catch {}
     if (await dockerEngineUp()) return true;
-    // Failed: kill the half-dead daemon + clear runtime files for a clean retry.
-    try { await wslRun("pkill -9 dockerd 2>/dev/null; rm -f /var/run/docker.pid /run/docker.pid /var/run/docker.sock /run/docker.sock; sleep 1", { timeout: 15000 }); } catch {}
+    // Not up after the wait. Only hard-reset when dockerd actually DIED (crash) —
+    // if it's still alive it's just slow/mid-init, so leave it and let the next
+    // attempt's wait loop keep polling instead of killing a healthy daemon.
+    try {
+      await wslRun(
+        "if ! pgrep dockerd >/dev/null 2>&1; then rm -f /var/run/docker.pid /run/docker.pid /var/run/docker.sock /run/docker.sock; fi; sleep 1",
+        { timeout: 15000 });
+    } catch {}
   }
   return false;
 }