cicy-desktop 2.1.276 → 2.1.278

package/.github/workflows/linux-app-release.yml

@@ -68,10 +68,12 @@ jobs:
         shell: bash
         env:
           GH_TOKEN: ${{ github.token }}
+          PUBLISH_OWNER: ${{ github.repository_owner }}
+          PUBLISH_REPO: ${{ github.event.repository.name }}
           CICY_OBFUSCATE: "1"   # 发版混淆 JS(prebuild 主进程 + Vite 渲染层),仅 release CI
         run: |
           set -euo pipefail
-          npm run build:linux -- --x64 --config.linux.target=AppImage --publish always
+          npm run build:linux -- --x64 --config.linux.target=AppImage --config.publish.owner="$PUBLISH_OWNER" --config.publish.repo="$PUBLISH_REPO" --publish always
 
       # AppImage + 版本指针传到 OSS —— app-updater 现已全走 OSS(不碰 GitHub),linux 也要在
       # OSS 上有 versioned AppImage(CiCy-Desktop-<ver>.AppImage)和自己的指针 linux-latest-version.txt。

package/.github/workflows/mac-app-release.yml

@@ -139,7 +139,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           gh release create "${{ steps.meta.outputs.tag }}" \
-            --repo "cicy-ai/cicy-desktop" \
+            --repo "${{ github.repository }}" \
             --title "CiCy Desktop v${{ steps.meta.outputs.version }}" \
             --generate-notes \
             --draft \
@@ -183,7 +183,7 @@ jobs:
             pkgbuild --root "$ROOT" --component-plist "$PLIST" --scripts "$SCR" \
               --identifier com.cicy.desktop --version "$VER" --install-location / "$PKG"
             gh release upload "${{ steps.meta.outputs.tag }}" "$PKG" \
-              --repo "cicy-ai/cicy-desktop" --clobber
+              --repo "${{ github.repository }}" --clobber
             echo "uploaded $PKG ($(du -h "$PKG" | cut -f1))"
           done
 

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

@@ -75,7 +75,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           gh release create "${{ steps.meta.outputs.tag }}" \
-            --repo "cicy-ai/cicy-desktop" \
+            --repo "${{ github.repository }}" \
             --title "CiCy Desktop v${{ steps.meta.outputs.version }}" \
             --generate-notes \
             --draft \
@@ -86,14 +86,16 @@ jobs:
         shell: powershell
         env:
           GH_TOKEN: ${{ github.token }}
+          PUBLISH_OWNER: ${{ github.repository_owner }}
+          PUBLISH_REPO: ${{ github.event.repository.name }}
           CICY_OBFUSCATE: "1"   # 发版混淆 JS(prebuild 主进程 + Vite 渲染层),仅 release CI
         run: |
           if (Test-Path dist) { Remove-Item -Recurse -Force dist }
           if (Test-Path "build\logo.ico") {
-            npm run build:win -- --config.win.icon=build/logo.ico --publish always
+            npm run build:win -- --config.win.icon=build/logo.ico --config.publish.owner="$env:PUBLISH_OWNER" --config.publish.repo="$env:PUBLISH_REPO" --publish always
           } else {
             Write-Host "::warning::no icon, using default"
-            npm run build:win -- --publish always
+            npm run build:win -- --config.publish.owner="$env:PUBLISH_OWNER" --config.publish.repo="$env:PUBLISH_REPO" --publish always
           }
 
       # 推 exe 到 OSS。三件事(不再是"永远一个版本"):
@@ -179,6 +181,6 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           gh release edit "${{ steps.meta.outputs.tag }}" \
-            --repo "cicy-ai/cicy-desktop" \
+            --repo "${{ github.repository }}" \
             --draft=false \
             --latest

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.276",
+  "version": "2.1.278",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -143,10 +143,10 @@
   "//optionalDependencies": "(2026-06 回调): mac/linux 改回 native cicy-code(:8008,colima 在 16G mac 上压垮内存)→ 重新内置 cicy-code-<plat> / cicy-mihomo-<plat>,localbin.fromBundle 零网络 seed(npm 仅作更新通道,带 npmmirror→npmjs 回退)。这些由 scripts/sync-runtime-deps.cjs 在 tag-push 时同步到最新版。npm 的 os/cpu 字段保证每个平台只装自己那份。Windows 仍走 docker(WSL :8009),它那份 cicy-code-windows 用不到但 bundle 着无害。",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.558",
-    "cicy-code-darwin-arm64": "2.3.558",
-    "cicy-code-linux-x64": "2.3.558",
-    "cicy-code-linux-arm64": "2.3.558",
+    "cicy-code-darwin-x64": "2.3.563",
+    "cicy-code-darwin-arm64": "2.3.563",
+    "cicy-code-linux-x64": "2.3.563",
+    "cicy-code-linux-arm64": "2.3.563",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/sidecar/cicy-runtime-health.js

@@ -0,0 +1,8 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+function shouldSkipCicyUpdate({ latest, current, platformReady }) {
+  return Boolean(latest && current && latest === current && platformReady);
+}
+
+module.exports = { shouldSkipCicyUpdate };

package/src/sidecar/container-scripts/cicy-code-update.sh

@@ -71,16 +71,46 @@ fi
 [ -n "$ver" ] || { log "could not resolve cicy-code@${want}"; exit 1; }
 dest="$RT/$ver"
 
-if [ -x "$dest/bin/cicy-code" ]; then
-  log "v$ver already installed → repointing"
-else
+case "$(uname -s):$(uname -m)" in
+  Linux:x86_64) platform_pkg="cicy-code-linux-x64" ;;
+  Linux:aarch64|Linux:arm64) platform_pkg="cicy-code-linux-arm64" ;;
+  *) log "unsupported platform: $(uname -s)-$(uname -m)"; exit 1 ;;
+esac
+
+platform_installed() {
+  [ -f "$dest/lib/node_modules/$platform_pkg/package.json" ] ||
+    [ -f "$dest/lib/node_modules/cicy-code/node_modules/$platform_pkg/package.json" ]
+}
+
+install_package() {
+  spec="$1"
+  if npm install -g "$spec" --prefix "$dest" --registry "$REG" \
+    --fetch-retries=2 --fetch-timeout=60000 --fetch-retry-maxtimeout=30000; then
+    return 0
+  fi
+  alt="$NPM_CN"; [ "$REG" = "$NPM_CN" ] && alt="$NPM_OFFICIAL"
+  log "install from $REG failed → falling back to $alt"
+  npm install -g "$spec" --prefix "$dest" --registry "$alt" \
+    --fetch-retries=2 --fetch-timeout=60000 --fetch-retry-maxtimeout=30000
+  REG="$alt"
+}
+
+if [ ! -x "$dest/bin/cicy-code" ]; then
   log "installing v$ver from $REG"
   rm -rf "$dest"
   mkdir -p "$dest"
-  npm install -g "cicy-code@$ver" --prefix "$dest" --registry "$REG" \
-    --fetch-retries=2 --fetch-timeout=60000 --fetch-retry-maxtimeout=30000
+  install_package "cicy-code@$ver"
 fi
 
+if ! platform_installed; then
+  log "repairing missing $platform_pkg@$ver"
+  install_package "$platform_pkg@$ver"
+fi
+
+[ -x "$dest/bin/cicy-code" ] || { log "incomplete runtime: missing bin/cicy-code"; exit 1; }
+platform_installed || { log "incomplete runtime: missing $platform_pkg@$ver"; exit 1; }
+log "v$ver runtime complete → repointing"
+
 mkdir -p "$(dirname "$LINK")"
 ln -sfn "$dest/bin/cicy-code" "$LINK"
 # Keep the npm-global bin (first on PATH) following the canonical link too, so

package/src/sidecar/docker.js

@@ -17,6 +17,7 @@ const http = require("http");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+const { classifyWslPrerequisites } = require("./wsl-prerequisites");
 
 const IMAGE     = process.env.CICY_DOCKER_IMAGE || "cicybot/cicy-code:latest";
 // Image tarball on Aliyun OSS (oss-cn-shanghai, public-read) — CN-domestic and
@@ -660,7 +661,12 @@ async function dismEnableFeature(feature, label, { emit } = {}) {
 // features are verified-enabled (a Windows reboot is then needed before Docker
 // can use WSL2), or { failed } if a feature couldn't be enabled.
 async function ensureWsl({ emit } = {}) {
-  if (!(await wslMissing())) return { ok: true };
+  const executableMissing = await wslMissing();
+  const subsystemEnabled = await featureEnabled("Microsoft-Windows-Subsystem-Linux");
+  const vmPlatformEnabled = await featureEnabled("VirtualMachinePlatform");
+  const state = classifyWslPrerequisites({ executableMissing, subsystemEnabled, vmPlatformEnabled });
+  if (state.ready) return { ok: true };
+
   emit && emit({ phase: "install-docker", status: "running", message: "Docker 需要 WSL2 后端，开始启用所需的 Windows 功能…" });
   const a = await dismEnableFeature("Microsoft-Windows-Subsystem-Linux", "启用 WSL 功能 1/2 · Linux 子系统", { emit });
   const b = await dismEnableFeature("VirtualMachinePlatform", "启用 WSL 功能 2/2 · 虚拟机平台", { emit });
@@ -668,10 +674,12 @@ async function ensureWsl({ emit } = {}) {
     emit && emit({ phase: "done", status: "error", message: "WSL 功能未能全部启用——请点「重试」" });
     return { ok: false, needsReboot: false, failed: true };
   }
-  // Best-effort: also pull the WSL2 kernel/plumbing (no-op until reboot on some
-  // builds; harmless if it errors).
-  await launchElevated("wsl", ["--install", "--no-distribution"], { emit }).catch(() => {});
-  emit && emit({ phase: "install-docker", status: "running", message: "WSL2 功能已启用 ✓，需【重启 Windows】后回来点「重试」继续。" });
+  // Best-effort: also pull the WSL2 kernel/plumbing when the executable itself
+  // is missing. Feature-only repairs must stop here and wait for reboot.
+  if (state.installWsl) {
+    await launchElevated("wsl", ["--install", "--no-distribution"], { emit }).catch(() => {});
+  }
+  emit && emit({ phase: "install-docker", status: "running", message: "WSL2 功能已启用 ✓，请【重启 Windows】；重启后回来点「重试」继续。" });
   return { ok: false, needsReboot: true };
 }
 

package/src/sidecar/wsl-docker.js

@@ -21,6 +21,7 @@ const fs = require("fs");
 const docker = require("./docker"); // shared: downloads, waitUntil, probeHealth, launchElevated, ensureWsl…
 const log = require("electron-log"); // persisted main.log — bootstrap timing/failures land here
 const { t } = require("../i18n"); // 打开/读 token 的可见日志走 i18n
+const { shouldSkipCicyUpdate } = require("./cicy-runtime-health");
 
 // Dedicated distro name — NEVER reuse/clobber a user's own "Ubuntu" distro.
 const DISTRO   = process.env.CICY_WSL_DISTRO || "cicy-code-wsl";
@@ -929,11 +930,10 @@ async function _bootstrap({ onProgress, port = 8008, container = "cicy-code-dock
 
   // 1) WSL2 platform
   begin("ensure-wsl");
-  if (await docker.wslMissing()) {
-    const w = await docker.ensureWsl({ emit });
-    if (w.needsReboot) { fail("wsl_reboot_required"); emit({ phase: "done", status: "reboot", message: "WSL2 正在安装——请【重启 Windows】后回来点「重试」继续。" }); finish(false, "wsl_reboot_required"); return { ok: false, reason: "wsl_reboot_required" }; }
-    done();
-  } else done(true);
+  const w = await docker.ensureWsl({ emit });
+  if (w.needsReboot) { fail("wsl_reboot_required"); emit({ phase: "done", status: "reboot", message: "WSL2 所需功能已启用——请【重启 Windows】后回来点「重试」继续。" }); finish(false, "wsl_reboot_required"); return { ok: false, reason: "wsl_reboot_required" }; }
+  if (!w.ok) { fail("wsl_enable_failed"); finish(false, "wsl_enable_failed"); return { ok: false, reason: "wsl_enable_failed" }; }
+  done(true);
 
   // 2) Ubuntu distro
   begin("ensure-distro");
@@ -986,13 +986,36 @@ async function _bootstrap({ onProgress, port = 8008, container = "cicy-code-dock
     done();
   } else done(true);
 
-  // 7) Health — the ONLY path to ok:true.
+  // 7) Health — the ONLY path to ok:true. A short failed probe triggers the
+  // runtime updater once: it repairs the common partial-install state where the
+  // JS launcher exists but cicy-code-linux-<arch> is missing from the volume.
   begin("wait-health");
   emit({ phase: "container", status: "running", message: "等待 cicy-code 就绪…" });
-  const healthy = await docker.waitUntil(() => probeHealth(port), { totalMs: 120000, everyMs: 3000 });
+  let healthy = await docker.waitUntil(() => probeHealth(port), { totalMs: 15000, everyMs: 3000 });
+  if (!healthy) {
+    emit({ phase: "container", status: "running", message: "服务尚未响应,正在检查并修复运行时完整性…" });
+    try {
+      const repaired = await update({ onProgress: emit, container, port });
+      healthy = Boolean(repaired && repaired.ok && await probeHealth(port));
+    } catch (e) {
+      log.warn(`[bootstrap] runtime auto-repair failed: ${e.message}`);
+    }
+  }
+  if (!healthy) healthy = await docker.waitUntil(() => probeHealth(port), { totalMs: 105000, everyMs: 3000 });
   if (healthy) { done(); await ensureAutostart(); await ensureDesktopShortcut(volume, port); } // survive reboot + desktop shortcut
   else fail("health_timeout");
-  emit({ phase: healthy ? "done" : "container", status: healthy ? "done" : "error", message: healthy ? "Docker cicy-code 已就绪 🎉" : `服务起来了但 :${port} 还没响应——稍等或点「重试」` });
+  let healthMessage = "Docker cicy-code 已就绪 🎉";
+  if (!healthy) {
+    let tail = "";
+    try {
+      const r = await wslRun(`docker logs --tail 60 ${container}`, { timeout: 15000 });
+      tail = String((r.stderr || "") + (r.stdout || "")).trim().slice(-1200);
+    } catch (e) {
+      tail = String((e && (e.stderr || e.stdout)) || "").trim().slice(-1200);
+    }
+    healthMessage = `服务未能响应 :${port}。${tail ? `\n\n容器日志：\n${tail}` : "请点「重试」。"}`;
+  }
+  emit({ phase: healthy ? "done" : "container", status: healthy ? "done" : "error", message: healthMessage });
   finish(healthy, healthy ? null : "health_timeout");
   return { ok: healthy, container };
 }
@@ -1061,6 +1084,18 @@ async function installedCicyVersion(container) {
   } catch { return null; }
 }
 
+// True only when the launcher AND this Linux architecture's optional binary
+// package are present. The version pointer alone is insufficient: npm can leave
+// a partial global install that has bin/cicy-code but cannot start.
+async function cicyRuntimePlatformReady(container) {
+  const check = `target=$(readlink -f "$HOME/.local/bin/cicy-code" 2>/dev/null || true); ` +
+    `dest=$(dirname "$(dirname "$target")" 2>/dev/null); ` +
+    `case "$(uname -m)" in x86_64) p=cicy-code-linux-x64;; aarch64|arm64) p=cicy-code-linux-arm64;; *) exit 1;; esac; ` +
+    `[ -x "$target" ] && { [ -f "$dest/lib/node_modules/$p/package.json" ] || [ -f "$dest/lib/node_modules/cicy-code/node_modules/$p/package.json" ]; }`;
+  try { await wslRun(`docker exec ${container} bash -lc '${check}'`, { timeout: 15000 }); return true; }
+  catch { return false; }
+}
+
 // Update cicy-code IN PLACE. SMART path (避免容器内 npm view 卡 ~2min):
 //  1. 在宿主机解析最新版本号(host 网络,不过容器代理/DNS)
 //  2. 和容器里已装版本比对——一样就直接「已是最新」,根本不 docker exec
@@ -1080,10 +1115,12 @@ async function update({ onProgress, container = "cicy-code-docker", port = 8008
   emit({ phase: "image", status: "running", message: t("docker.updating.checking") });
   let net = "unknown";
   try { net = await require("./net-detect").detect(); } catch {}
-  const [latest, current] = await Promise.all([resolveLatestCicy(net), installedCicyVersion(container)]);
-  log.info(`[wsl-docker] update: net=${net} latest=${latest} current=${current}`);
+  const [latest, current, platformReady] = await Promise.all([
+    resolveLatestCicy(net), installedCicyVersion(container), cicyRuntimePlatformReady(container),
+  ]);
+  log.info(`[wsl-docker] update: net=${net} latest=${latest} current=${current} platformReady=${platformReady}`);
   // 2) 已是最新 → 秒回,根本不进容器装(你点更新等 2 分钟的就是这种「其实已最新」的空跑)。
-  if (latest && current && latest === current) {
+  if (shouldSkipCicyUpdate({ latest, current, platformReady })) {
     emit({ phase: "done", status: "done", message: t("docker.updating.alreadyLatest", { v: current }) });
     return { ok: true, alreadyLatest: true, version: current };
   }

package/src/sidecar/wsl-prerequisites.js

@@ -0,0 +1,15 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+function classifyWslPrerequisites({ executableMissing, subsystemEnabled, vmPlatformEnabled }) {
+  const featuresReady = subsystemEnabled && vmPlatformEnabled;
+  const ready = !executableMissing && featuresReady;
+  return {
+    ready,
+    enableFeatures: !featuresReady,
+    installWsl: executableMissing,
+    needsReboot: !ready,
+  };
+}
+
+module.exports = { classifyWslPrerequisites };

package/test/cicy-code-update.test.js

@@ -0,0 +1,69 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const { spawnSync } = require("node:child_process");
+
+const script = path.join(__dirname, "..", "src", "sidecar", "container-scripts", "cicy-code-update.sh");
+
+function writeExecutable(file, content) {
+  fs.writeFileSync(file, content, { mode: 0o755 });
+}
+
+function runUpdate({ complete = false } = {}) {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "cicy-code-update-"));
+  const home = path.join(root, "home");
+  const store = path.join(root, "store");
+  const bin = path.join(root, "bin");
+  const dest = path.join(store, "2.3.563");
+  fs.mkdirSync(path.join(dest, "bin"), { recursive: true });
+  fs.mkdirSync(bin, { recursive: true });
+  writeExecutable(path.join(dest, "bin", "cicy-code"), "#!/bin/sh\nexit 0\n");
+  if (complete) {
+    fs.mkdirSync(path.join(dest, "lib", "node_modules", "cicy-code-linux-x64"), { recursive: true });
+    fs.writeFileSync(path.join(dest, "lib", "node_modules", "cicy-code-linux-x64", "package.json"), "{}\n");
+  }
+  writeExecutable(path.join(bin, "supervisorctl"), "#!/bin/sh\nexit 1\n");
+  writeExecutable(path.join(bin, "npm"), `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${root}/npm.log"
+prefix=""
+prev=""
+for arg in "$@"; do
+  if [ "$prev" = "--prefix" ]; then prefix="$arg"; break; fi
+  prev="$arg"
+done
+[ -n "$prefix" ]
+mkdir -p "$prefix/lib/node_modules/cicy-code-linux-x64"
+printf '{}\\n' > "$prefix/lib/node_modules/cicy-code-linux-x64/package.json"
+`);
+  const result = spawnSync("bash", [script, "2.3.563"], {
+    encoding: "utf8",
+    env: {
+      ...process.env,
+      HOME: home,
+      CICY_CODE_STORE: store,
+      NPM_REGISTRY: "https://registry.npmjs.org",
+      PATH: `${bin}:${process.env.PATH}`,
+    },
+  });
+  return {
+    ...result,
+    platformPackage: path.join(dest, "lib", "node_modules", "cicy-code-linux-x64", "package.json"),
+    npmLog: fs.existsSync(path.join(root, "npm.log")) ? fs.readFileSync(path.join(root, "npm.log"), "utf8") : "",
+  };
+}
+
+test("repairs an existing cicy-code runtime when its linux-x64 package is missing", () => {
+  const result = runUpdate();
+  assert.equal(result.status, 0, result.stderr);
+  assert.equal(fs.existsSync(result.platformPackage), true);
+  assert.match(result.npmLog, /cicy-code-linux-x64@2\.3\.563/);
+});
+
+test("does not reinstall an existing runtime when its platform package is present", () => {
+  const result = runUpdate({ complete: true });
+  assert.equal(result.status, 0, result.stderr);
+  assert.equal(result.npmLog, "");
+});

package/test/cicy-runtime-health.test.js

@@ -0,0 +1,12 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+
+const { shouldSkipCicyUpdate } = require("../src/sidecar/cicy-runtime-health");
+
+test("does not skip an update when the recorded version matches but the platform package is missing", () => {
+  assert.equal(shouldSkipCicyUpdate({ latest: "2.3.563", current: "2.3.563", platformReady: false }), false);
+});
+
+test("skips an update only when the recorded version matches and the runtime is complete", () => {
+  assert.equal(shouldSkipCicyUpdate({ latest: "2.3.563", current: "2.3.563", platformReady: true }), true);
+});

package/test/wsl-prerequisites.test.js

@@ -0,0 +1,37 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+
+const { classifyWslPrerequisites } = require("../src/sidecar/wsl-prerequisites");
+
+test("requires feature enablement and reboot when wsl.exe exists but Windows features are disabled", () => {
+  assert.deepEqual(
+    classifyWslPrerequisites({
+      executableMissing: false,
+      subsystemEnabled: false,
+      vmPlatformEnabled: false,
+    }),
+    { ready: false, enableFeatures: true, installWsl: false, needsReboot: true },
+  );
+});
+
+test("is ready only when wsl.exe and both Windows features are available", () => {
+  assert.deepEqual(
+    classifyWslPrerequisites({
+      executableMissing: false,
+      subsystemEnabled: true,
+      vmPlatformEnabled: true,
+    }),
+    { ready: true, enableFeatures: false, installWsl: false, needsReboot: false },
+  );
+});
+
+test("installs WSL and enables features when wsl.exe is missing", () => {
+  assert.deepEqual(
+    classifyWslPrerequisites({
+      executableMissing: true,
+      subsystemEnabled: false,
+      vmPlatformEnabled: false,
+    }),
+    { ready: false, enableFeatures: true, installWsl: true, needsReboot: true },
+  );
+});