cicy-desktop 2.1.172 → 2.1.174

package/.github/workflows/build-wsl-package.yml

@@ -53,18 +53,20 @@ jobs:
           EOF
           docker build -t cicy-wsl-base ctx
 
-      - name: Pre-load cicy-code image into the rootfs
+      - name: Build WSL rootfs (Ubuntu + Docker, image NOT baked)
         run: |
+          # 主人: image NO LONGER baked into the rootfs. wsl-docker.bootstrap downloads +
+          # docker-loads cicy-code-latest.tar.gz at setup (像 mac/colima 那样) → WSL 也拿最新
+          # 烤制镜像,且镜像更新不必重下整个 rootfs(rootfs=Ubuntu+Docker 很少变,瘦了 ~169MB)。
           docker pull "${{ inputs.image }}"
+          # Still save the image so the SAME run republishes the macOS tarball (next step).
           docker save "${{ inputs.image }}" -o /tmp/cicy-image.tar
-          # Run the base privileged, start an inner dockerd, load the image into
-          # its /var/lib/docker (kept in the container fs, NOT a volume), then stop.
-          cid=$(docker run -d --privileged -v /tmp/cicy-image.tar:/img.tar:ro cicy-wsl-base \
+          # Run the base privileged, start an inner dockerd ONCE then stop — purely to clear
+          # stale daemon runtime files so the FIRST dockerd in WSL2 starts clean. No image load.
+          cid=$(docker run -d --privileged cicy-wsl-base \
             bash -c '
               nohup dockerd >/var/log/dind.log 2>&1 &
               for i in $(seq 1 60); do docker info >/dev/null 2>&1 && break; sleep 1; done
-              docker load -i /img.tar
-              docker images
               pkill dockerd || true
               sleep 4
               # Drop stale daemon runtime files so the FIRST dockerd in WSL2 does
@@ -73,7 +75,7 @@ jobs:
             ')
           docker logs -f "$cid" || true
           rc=$(docker wait "$cid"); echo "inner exit=$rc"
-          # Export the whole container filesystem (incl. /var/lib/docker) = the WSL rootfs.
+          # Export the container filesystem = the WSL rootfs (Ubuntu + Docker, no image).
           docker export "$cid" | gzip > cicy-wsl.tar.gz
           ls -lh cicy-wsl.tar.gz
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.172",
+  "version": "2.1.174",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -137,14 +137,14 @@
     "zod": "3.25",
     "electron-updater": "6.6.2"
   },
-  "//optionalDependencies": "Runtime Bundle v1 (主人指令): platform binaries delivered by `npm i -g cicy-desktop` itself — npm installs only the current-platform subpackage (os/cpu pinned in each), so first start seeds the runtime store with ZERO network, ZERO npx. Windows packages are named *-windows-* (npm spam filter 403s new names containing win32). cicy-msys2 added once published.",
+  "//optionalDependencies": "docker-only(主人): host cicy-code/mihomo 二进制不再内置 —— cicy-code + mihomo 都只在 docker 容器里跑(npm 装/镜像预装),host 永远不起,所以去掉了 cicy-code-<plat> / cicy-mihomo-<plat> 子包。只留 electron。",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.20",
-    "cicy-code-darwin-arm64": "2.3.20",
-    "cicy-code-linux-x64": "2.3.20",
-    "cicy-code-linux-arm64": "2.3.20",
-    "cicy-code-windows-x64": "2.3.20",
+    "cicy-code-darwin-x64": "2.3.21",
+    "cicy-code-darwin-arm64": "2.3.21",
+    "cicy-code-linux-x64": "2.3.21",
+    "cicy-code-linux-arm64": "2.3.21",
+    "cicy-code-windows-x64": "2.3.21",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",
     "cicy-mihomo-linux-x64": "1.10.4",

package/src/sidecar/cicy-code.js

@@ -126,14 +126,8 @@ async function start({ logPath, port = DEFAULT_PORT, force = false, version = nu
   }
   if (!exe) { console.warn("[cicy-code-sidecar] no cicy-code binary available"); return null; }
 
-  // cicy-desktop ALSO owns the mihomo binary (same npm/localbin model). Seed it
-  // into ~/.local/bin/mihomo from the bundle (zero network) BEFORE the cicy-code
-  // daemon boots, so cicy-code's own startup finds it already present and skips
-  // its GitHub/COS download. Best-effort — never block cicy-code on it.
-  try {
-    const r = await localbin.ensure({ name: "mihomo" });
-    if (r?.exe) console.log(`[cicy-code-sidecar] mihomo ready at ${r.exe} (v${r.version || "?"})`);
-  } catch (e) { console.warn(`[cicy-code-sidecar] mihomo seed skipped: ${e.message}`); }
+  // 主人: 不再 seed host mihomo —— docker-only 后 mihomo 只在容器里跑(host 不用)。
+  // 内置的 cicy-mihomo-<plat> 依赖已从 package.json 移除。
 
   let stdio = ["ignore", "ignore", "ignore"];
   if (logPath) {

package/src/sidecar/colima-docker.js

@@ -262,8 +262,12 @@ async function runContainer({ port = 8009, container = "cicy-code-docker-8009",
     .filter(([, v]) => v != null && v !== "")
     .map(([k, v]) => `-e ${k}='${String(v).replace(/'/g, "'\\''")}'`)
     .join(" ");
+  // 主人(A 方案): 映射 mihomo 的 per-Chrome-profile 监听口段(约定 20000+N)回主机回环。
+  // docker-only 后 mihomo 只在容器里,这些口不暴露则主机系统 Chrome 的代理 127.0.0.1:(20000+N)
+  // 连不上。默认 20001-20032(32 个 profile),CICY_CHROME_PROXY_PORTS 可调。
+  const CHROME_PROXY_PORTS = process.env.CICY_CHROME_PROXY_PORTS || "20001-20032";
   const cmd = `run -d --name ${container} --restart unless-stopped ${PLATFORM_FLAG} ` +
-    `-p 127.0.0.1:${port}:8008 -e CICY_PUBLIC=1 -v ${volume}:/home/cicy ${shareMountArg()} ${envArgs} ${IMAGE}`;
+    `-p 127.0.0.1:${port}:8008 -p 127.0.0.1:${CHROME_PROXY_PORTS}:${CHROME_PROXY_PORTS} -e CICY_PUBLIC=1 -v ${volume}:/home/cicy ${shareMountArg()} ${envArgs} ${IMAGE}`;
   await dk(cmd, { timeout: 90000 });
   return { started: true };
 }

package/src/sidecar/localbin.js

@@ -44,7 +44,6 @@ const MANIFEST = path.join(LOCAL_BIN, ".cicy-localbin.json");
 // cicy-code, so the legacy single-component callers keep working unchanged.
 const COMPONENTS = {
   "cicy-code": { pkgPrefix: "cicy-code", base: "cicy-code" },
-  "mihomo": { pkgPrefix: "cicy-mihomo", base: "mihomo" },
 };
 const DEFAULT = "cicy-code";
 function comp(name) {

package/src/sidecar/wsl-docker.js

@@ -425,7 +425,10 @@ async function runContainer({ port = 8009, container = "cicy-code-docker", volum
   // bridge container → every lookup is EAI_AGAIN and cicy-code's startup `npm i`
   // crash-loops the container (:8009 never comes up). Pin public resolvers: Aliyun
   // 223.5.5.5 (CN-fast) first, Google 8.8.8.8 as the overseas fallback.
-  const cmd = `docker run -d --name ${container} --restart unless-stopped --dns 223.5.5.5 --dns 8.8.8.8 -p 127.0.0.1:${port}:8008 -e CICY_PUBLIC=1 -v ${volume}:/home/cicy ${shareMountArg()} ${envArgs} ${IMAGE}`;
+  // 主人(A 方案): 映射 mihomo 的 per-Chrome-profile 监听口段(约定 20000+N)回主机回环 —— docker-only
+  // 后这些口只在容器里,不暴露则主机系统 Chrome 的代理 127.0.0.1:(20000+N) 连不上. 默认 20001-20032.
+  const CHROME_PROXY_PORTS = process.env.CICY_CHROME_PROXY_PORTS || "20001-20032";
+  const cmd = `docker run -d --name ${container} --restart unless-stopped --dns 223.5.5.5 --dns 8.8.8.8 -p 127.0.0.1:${port}:8008 -p 127.0.0.1:${CHROME_PROXY_PORTS}:${CHROME_PROXY_PORTS} -e CICY_PUBLIC=1 -v ${volume}:/home/cicy ${shareMountArg()} ${envArgs} ${IMAGE}`;
   await wslRun(cmd, { timeout: 60000 });
   ensureDesktopShortcut(volume, port).catch(() => {});
   return { started: true };