cicy-desktop 2.1.173 → 2.1.175

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.173",
+  "version": "2.1.175",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -137,7 +137,7 @@
     "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.21",

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

@@ -247,10 +247,18 @@ Drop files here for CiCy agents to read; files agents write to Share show up her
 
 function shareMountArg() {
   try {
-    const share = path.join(os.homedir(), "Desktop", "Share");
+    // 主人: Share 真实目录放 ~/cicy-ai/Share —— 不能用 ~/Desktop:macOS TCC 挡着 colima(VM)
+    // 访问 Desktop/Documents/Downloads,docker 建挂载源时报 'mkdir …/Desktop: operation not
+    // permitted' → 容器起不来。~/cicy-ai 非 TCC、colima 能挂。再在 Desktop 放个软链(桌面可见;
+    // 失败无所谓,真实目录已可用)。
+    const share = path.join(os.homedir(), "cicy-ai", "Share");
     fs.mkdirSync(share, { recursive: true });
     const readme = path.join(share, "readme.md");
     if (!fs.existsSync(readme)) { try { fs.writeFileSync(readme, SHARE_README); } catch {} }
+    try {
+      const link = path.join(os.homedir(), "Desktop", "Share");
+      if (!fs.existsSync(link)) fs.symlinkSync(share, link);
+    } catch {}
     return `-v '${share}':/home/cicy/cicy-ai/Share`;
   } catch { return ""; }
 }
@@ -266,9 +274,19 @@ async function runContainer({ port = 8009, container = "cicy-code-docker-8009",
   // 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 -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 });
+  const mk = (s) => `run -d --name ${container} --restart unless-stopped ${PLATFORM_FLAG} ` +
+    `-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 ${s} ${envArgs} ${IMAGE}`;
+  const share = shareMountArg();
+  try {
+    await dk(mk(share), { timeout: 90000 });
+  } catch (e) {
+    if (!share) throw e;
+    // 兜底: 带 Share 启动失败(如 macOS TCC 挡 colima 访问挂载源)→ 去掉 Share 重试,保证容器
+    // 一定能起(Share 只是附加共享目录,不该挡住整个服务). 主人: '容器起不来' 的修复.
+    console.warn(`[colima] 带 Share 启动失败,去掉 Share 重试: ${e.message}`);
+    try { await dk(`rm -f ${container}`, { timeout: 20000 }); } catch {}
+    await dk(mk(""), { 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) {