cicy-desktop 2.1.367 → 2.1.369

package/src/backends/homepage-react/index.html

@@ -39,7 +39,7 @@
     setTimeout(check, 5000);
   })();
   </script>
-  <script type="module" crossorigin src="./assets/index-BWZkvmvO.js"></script>
+  <script type="module" crossorigin src="./assets/index-BMeWzitz.js"></script>
   <link rel="stylesheet" crossorigin href="./assets/index-CVk0uc2g.css">
 </head>
 <body>

package/src/backends/hub-client.js

@@ -143,7 +143,7 @@ async function sidecarToken() {
   if (!tok && process.platform === "win32") {
     try {
       tok = String(
-        (await require("../sidecar/wsl-docker").readContainerToken(SIDECAR_PORT)) || ""
+        (await require("../sidecar/app-docker").readContainerToken(SIDECAR_PORT)) || ""
       ).trim();
     } catch (e) {
       log.warn(`[hub] sidecar token: ${e.message}`);

package/src/backends/local-teams.js

@@ -318,7 +318,7 @@ async function openTeam(id, opts = {}) {
   let token = (opts && opts.token) || "";
   if (!token) {
     if (isWinDockerTeam) {
-      try { token = String(await require("../sidecar/wsl-docker").readContainerToken(localPort) || "").trim(); } catch (e) { log.warn(`[local-teams] open ${id}: container token read failed: ${e.message}`); }
+      try { token = String(await require("../sidecar/app-docker").readContainerToken(localPort) || "").trim(); } catch (e) { log.warn(`[local-teams] open ${id}: container token read failed: ${e.message}`); }
       if (!token) return { ok: false, error: "container_token_unavailable", hint: "cicy-code 容器还没就绪(读不到容器内的 token)。稍等几秒或用卡片菜单「重启」。" };
     } else if (isLocalUrl) {
       token = readGlobal()?.api_token || node.api_token || "";

package/src/backends/sidecar-ipc.js

@@ -34,7 +34,8 @@ const hostMihomo = require("../sidecar/host-mihomo"); // 宿主侧 mihomo ——
 // 按平台分发 Docker-版 cicy-code 的运行层:darwin → Colima,win32 → WSL2。两者同接口
 // (bootstrap/status/restart/stop/dockerRestart/recreate/update/upgrade/runContainer/
 // readContainerToken),所以下面的 handler 共用一份逻辑,只换底层模块。
-const appDocker = process.platform === "darwin" ? colimaDocker : wslDocker;
+// win32 上再分:老机器 WSL2,新机器 QEMU(不靠 WSL,:8009)—— 见 sidecar/linux-backend.js。
+const appDocker = require("../sidecar/app-docker");
 // Docker-版 cicy-code 只剩 Windows(WSL2)。(2026-06 回调): macOS 改回 native cicy-code
 // (:8008,colima 在 16G mac 上压垮内存被 jetsam 杀)→ darwin 不再走 docker,这里不放行,
 // 所有 docker:app-* handler / reconcile / chrome-proxy 在 mac 上全部 no-op,DockerCard 不显示。
@@ -115,7 +116,7 @@ async function ensureDockerTeam() {
     return null;
   };
   try {
-    const r = await cc.registerDockerTeam({ port: APP_PORT });
+    const r = await cc.registerDockerTeam({ port: APP_PORT, title: "本机团队" });
     if (r && r.ok && r.apiKey) {
       dockerTeamReg = { teamId: r.teamId, title: r.title || `Docker :${APP_PORT}`, apiKey: r.apiKey };
       try { const store = readDockerTeams(); store[APP_VOLUME] = { ...(store[APP_VOLUME] || {}), teamId: r.teamId, title: dockerTeamReg.title, apiKey: r.apiKey }; writeDockerTeams(store); } catch {}
@@ -551,7 +552,9 @@ function register({ sidecarLogPath } = {}) {
   const registerAppTeam = async () => {
     const lt = require("./local-teams");
     await ensureDockerTeam(); // 确保独立云端 team 存在 + 拿到 teamId/title
-    const title = (dockerTeamReg && dockerTeamReg.title) || "Docker 团队";
+    // 默认名「本机团队」(2026-10-21);云端还是系统缺省名(老的 Docker 团队 / Docker :<port>)时也换成它。
+    const t0 = dockerTeamReg && dockerTeamReg.title;
+    const title = (!t0 || /^\s*docker\s*(团队|team)?\s*(:\s*\d+)?\s*$/i.test(t0)) ? "本机团队" : t0;
     // is_docker + cloud_team_id are passed INTO addTeam so they land in the SAME
     // writeNodes as the node — before addTeam's fire-and-forget syncNameToCloud
     // runs. That's what stops the freshly-created :8008 node from device-registering
@@ -582,6 +585,9 @@ function register({ sidecarLogPath } = {}) {
   // 否则 → WSL 卷 \\wsl$\<distro>\…\volumes\<vol>\_data(= 容器 /home/cicy)。
   ipcMain.handle("docker:open-dir", async (_e, which) => {
     if (!APP_DOCKER_SUPPORTED) return { ok: false, error: "unsupported" };
+    // QEMU 后端没有宿主共享目录(Windows 上的 QEMU 不支持 virtio-9p/virtiofs):C:\projects 没挂进容器,
+    // 卷在虚拟机磁盘里,资源管理器打不开。如实说,别打开一个和容器无关的目录。
+    if (appDocker.backend === "qemu") return { ok: false, error: "qemu_no_host_share", hint: "QEMU 版容器的文件在虚拟机里,请在 cicy-code 里或首页 Debian 终端里访问" };
     try {
       const { shell } = require("electron");
       let p;

package/src/i18n/locales/en.json

@@ -236,14 +236,14 @@
       "menu": "Port settings",
       "title": "Port settings",
       "sub": "Extra ports (besides :8008) published so Windows can reach in-container services",
-      "mainFixed": ":8008 · cicy-code (fixed)",
+      "mainFixed": ":{{p}} · cicy-code (fixed)",
       "add": "+ Add port",
       "ph": "Port 1-65535",
       "save": "Save & rebuild",
       "saving": "Saving…",
       "cancel": "Cancel",
       "hint": "Saving rebuilds the container (volume data kept) with a brief interruption",
-      "invalid": "Invalid port (1-65535, not 8008, no duplicates)",
+      "invalid": "Invalid port (1-65535, not {{p}}, no duplicates)",
       "none": "No extra ports",
       "remove": "Remove"
     },

package/src/i18n/locales/fr.json

@@ -236,14 +236,14 @@
       "menu": "Réglage des ports",
       "title": "Réglage des ports",
       "sub": "Ports supplémentaires (hors :8008) publiés pour que Windows atteigne les services du conteneur",
-      "mainFixed": ":8008 · cicy-code (fixe)",
+      "mainFixed": ":{{p}} · cicy-code (fixe)",
       "add": "+ Ajouter un port",
       "ph": "Port 1-65535",
       "save": "Enregistrer et reconstruire",
       "saving": "Enregistrement…",
       "cancel": "Annuler",
       "hint": "L'enregistrement reconstruit le conteneur (données du volume conservées), brève interruption",
-      "invalid": "Port invalide (1-65535, pas 8008, sans doublon)",
+      "invalid": "Port invalide (1-65535, pas {{p}}, sans doublon)",
       "none": "Aucun port supplémentaire",
       "remove": "Retirer"
     },

package/src/i18n/locales/ja.json

@@ -236,14 +236,14 @@
       "menu": "ポート設定",
       "title": "ポート設定",
       "sub": ":8008 以外に公開し、Windows からコンテナ内サービスへ直接到達できるポート",
-      "mainFixed": ":8008 · cicy-code(固定)",
+      "mainFixed": ":{{p}} · cicy-code(固定)",
       "add": "+ ポートを追加",
       "ph": "ポート 1-65535",
       "save": "保存して再構築",
       "saving": "保存中…",
       "cancel": "キャンセル",
       "hint": "保存するとコンテナを再構築します(ボリュームのデータは保持、短時間中断)",
-      "invalid": "無効なポート(1-65535、8008 不可、重複不可)",
+      "invalid": "無効なポート(1-65535、{{p}} 不可、重複不可)",
       "none": "追加ポートなし",
       "remove": "削除"
     },

package/src/i18n/locales/zh-CN.json

@@ -209,7 +209,7 @@
     "recreateOk": "确定重建",
     "runningWslBroken": "运行中 · ⚠ WSL 管理异常(能打开;更新/重启需修复 WSL)",
     "openFailed": "打开失败",
-    "openTitle": "打开 Docker 团队",
+    "openTitle": "打开本机团队",
     "repairWsl": "修复 WSL",
     "wslBrokenRepair": "WSL 管理异常 · 点「修复 WSL」重装",
     "openWslDir": "打开 WSL 目录",
@@ -236,14 +236,14 @@
       "menu": "端口设置",
       "title": "端口设置",
       "sub": "除 :8008 外,额外发布、可从 Windows 直达容器内服务的端口",
-      "mainFixed": ":8008 · cicy-code(固定)",
+      "mainFixed": ":{{p}} · cicy-code(固定)",
       "add": "+ 添加端口",
       "ph": "端口号 1-65535",
       "save": "保存并重建",
       "saving": "保存中…",
       "cancel": "取消",
       "hint": "保存会重建容器(volume 数据保留),会有短暂中断",
-      "invalid": "有端口无效(1-65535,不能是 8008,不能重复)",
+      "invalid": "有端口无效(1-65535,不能是 {{p}},不能重复)",
       "none": "暂无额外端口",
       "remove": "移除"
     },

package/src/main.js

@@ -6,6 +6,9 @@ const { default: contextMenu } = require("electron-context-menu");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+// 必须最先:决定 Windows 上 Docker-版 cicy-code 走 WSL(老机器)还是 QEMU(新机器 :8009),
+// 并在任何模块读 CICY_DOCKER_APP_PORT 之前把端口定下来。见 sidecar/linux-backend.js。
+require("./sidecar/linux-backend").init();
 const cicyCodeSidecar = require("./sidecar/cicy-code");
 const backendsIPC = require("./backends/ipc");
 const { openHomepage } = require("./backends/homepage-window");

package/src/sidecar/app-docker.js

@@ -0,0 +1,9 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+// Docker-版 cicy-code 的运行层(同接口):darwin → Colima,win32 → WSL2(老机器)或 QEMU(新机器)。
+// 选哪个见 linux-backend.js。调用方一律经这里拿,别再直接 require("./wsl-docker")。
+const backend = require("./linux-backend").backend();
+module.exports = process.platform === "darwin" ? require("./colima-docker")
+  : backend === "qemu" ? require("./qemu-docker")
+  : require("./wsl-docker");

package/src/sidecar/docker.js

@@ -219,7 +219,16 @@ function headETag(url, hops = 5) {
 function imageEtagPath() { return path.join(downloadsDir(), "cicy-code-latest.etag"); }
 function readLoadedImageEtag() { try { return fs.readFileSync(imageEtagPath(), "utf8").trim(); } catch { return ""; } }
 function writeLoadedImageEtag(v) { try { fs.writeFileSync(imageEtagPath(), String(v || "")); } catch {} }
-async function remoteImageEtag() { return headETag(R2_TARBALL); }
+// 国内网络到 R2 公开域名(*.de5.net)会被重置;dl.cicy-ai.com 是同一个桶经 Cloudflare Worker 的只读镜像
+// (仓库 ~/projects/cicy-dl-mirror,ETag/Range 原样透传)。R2 HEAD 不通时一律改走它。
+const R2_MIRROR_TARBALL = process.env.CICY_DOCKER_MIRROR_URL || "https://dl.cicy-ai.com/images/cicy-code-latest.tar.gz";
+async function remoteImageEtag() { return (await headETag(R2_TARBALL)) || headETag(R2_MIRROR_TARBALL); }
+// 先 HEAD 一下 R2(15s 超时),通就用 R2,不通直接换镜像 —— 别让 curl 在被重置的 R2 上重试 8 轮(每轮几十秒)。
+async function pickTarballSource() {
+  if ((await headSize(R2_TARBALL)) > 0) return { url: R2_TARBALL, alt: R2_MIRROR_TARBALL };
+  if ((await headSize(R2_MIRROR_TARBALL)) > 0) return { url: R2_MIRROR_TARBALL, alt: null };
+  return { url: R2_TARBALL, alt: R2_MIRROR_TARBALL };
+}
 // Drop the cached tarball so a stale copy on disk can't be reused (downloadImageTarball
 // skips a complete file by size, which a same-size new image would wrongly satisfy).
 function clearImageTarball() { try { fs.unlinkSync(imageTarballPath()); } catch {} }
@@ -403,22 +412,23 @@ function curlDownload(url, dest, { emit, phase = "image", label = "下载镜像"
 // (much faster here); falls back to the node downloader if curl is unavailable.
 async function downloadImageTarball({ emit } = {}) {
   const dest = imageTarballPath();
+  const src = await pickTarballSource();   // R2 不通(国内)→ dl.cicy-ai.com 镜像
   // REUSE a complete tarball already on disk (staged into ~/Downloads, or a prior
   // run) BEFORE curlDownload touches it — curlDownload doesn't skip a complete file
   // (and a failed curl truncates it). headSize uses node http so it works even when
   // curl can't resolve the host. Skips the ~500MB re-download per new user.
   try {
-    const expected = await headSize(R2_TARBALL);
+    const expected = await headSize(src.url);
     const have = fs.statSync(dest).size;
     if (expected > 0 && have === expected) {
       emit && emit({ phase: "image", status: "skip", message: "镜像:已有完整包,跳过下载", progress: 100, received: have, total: expected });
       return dest;
     }
   } catch {}
-  try { await curlDownload(R2_TARBALL, dest, { emit, phase: "image", label: "下载镜像" }); }
+  try { await curlDownload(src.url, dest, { emit, phase: "image", label: "下载镜像" }); }
   catch (e) {
     emit && emit({ phase: "image", status: "running", message: `curl 下载失败(${e.message}),改用内置下载…` });
-    await ensureDownloaded(R2_TARBALL, dest, null, { emit, phase: "image", label: "下载镜像" });
+    await ensureDownloaded(src.url, dest, src.alt, { emit, phase: "image", label: "下载镜像" });
   }
   return dest;
 }

package/src/sidecar/linux-backend.js

@@ -0,0 +1,55 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+// Windows 上 Docker-版 cicy-code 跑在哪:WSL2(老机器)还是 QEMU(新机器,不再用 WSL)。
+//
+// 规则:2026-10-21 起新机器走 QEMU、端口 8009;2026-10-22 用户定「所有的机器全部用 QEMU」——
+// 新判定一律 qemu(不再看机器上有没有 WSL)。已经落盘的判定不自动改:老机器的 wsl 由人逐台迁
+// (停 WSL 容器 → 改 linux-backend.json → 重启 desktop),避免一升级就整队断服。
+// 判定结果写进 ~/cicy-ai/db/linux-backend.json。CICY_LINUX_BACKEND=wsl|qemu 可强制覆盖。
+//
+// 必须在 main.js 最早处 init():sidecar-ipc 等模块在 require 时就读 CICY_DOCKER_APP_PORT。
+
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const { execFileSync } = require("child_process");
+
+const FILE = path.join(os.homedir(), "cicy-ai", "db", "linux-backend.json");
+const DISTRO = process.env.CICY_WSL_DISTRO || "cicy-code-wsl";
+const QEMU_PORT = 8009;
+let _backend = null;
+
+// 老机器的证据:WSL 注册表里有我们的发行版,或者之前算过的 docker 状态说装过。只读,不碰 wsl.exe。
+function hasWslInstall() {
+  try {
+    execFileSync("reg", ["query", "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Lxss", "/s", "/f", DISTRO, "/d", "/e"], { windowsHide: true, timeout: 8000, stdio: "ignore" });
+    return true;
+  } catch {}
+  try {
+    const j = JSON.parse(fs.readFileSync(path.join(os.homedir(), "cicy-ai", "db", "docker-status.json"), "utf8"));
+    if (j && (j.installed || j.running) && Number(j.port || 8008) === 8008) return true;
+  } catch {}
+  return false;
+}
+
+function decide() {
+  if (process.platform !== "win32") return "native";
+  const forced = String(process.env.CICY_LINUX_BACKEND || "").toLowerCase();
+  if (forced === "wsl" || forced === "qemu") return forced;
+  try { const j = JSON.parse(fs.readFileSync(FILE, "utf8")); if (j && (j.backend === "wsl" || j.backend === "qemu")) return j.backend; } catch {}
+  const b = "qemu";
+  try { fs.mkdirSync(path.dirname(FILE), { recursive: true }); fs.writeFileSync(FILE, JSON.stringify({ backend: b, decidedAt: new Date().toISOString(), hadWsl: hasWslInstall() }, null, 2)); } catch {}
+  return b;
+}
+
+function init() {
+  if (_backend) return _backend;
+  _backend = decide();
+  if (_backend === "qemu" && !process.env.CICY_DOCKER_APP_PORT) process.env.CICY_DOCKER_APP_PORT = String(QEMU_PORT);
+  if (_backend === "qemu" && !process.env.CICY_SIDECAR_PORT) process.env.CICY_SIDECAR_PORT = process.env.CICY_DOCKER_APP_PORT;
+  return _backend;
+}
+function backend() { return _backend || init(); }
+
+module.exports = { init, backend, QEMU_PORT, hasWslInstall };