cicy-desktop 2.1.174 → 2.1.176

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.174",
+  "version": "2.1.176",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {

package/src/sidecar/cicy-code.js

@@ -82,12 +82,6 @@ async function startFromRuntime({ logPath, port }) {
     CICY_CODE_PORT: String(port),
     PORT: String(port),
   };
-  if (process.platform === "win32") {
-    try {
-      const msys = runtime.binPath("msys2") || runtime.ensureFromBundle("msys2");
-      if (msys) env.CICY_MSYS_ROOT = msys; // w-10084 exe 探测约定
-    } catch {}
-  }
   const c = spawn(exe, ["--desktop"], { stdio, detached: false, windowsHide: true, env });
   console.log(`[cicy-code-sidecar] spawned runtime ${exe} --desktop (v${runtime.currentVersion("cicy-code")}) pid=${c.pid} port=${port}`);
   c.on("exit", (code, signal) => {
@@ -141,8 +135,8 @@ async function start({ logPath, port = DEFAULT_PORT, force = false, version = nu
     PORT: String(port),
   };
   // --helper removed (主人指令): Windows now runs cicy-code in normal mode (full
-  // tmux-based multi-agent via the bundled MSYS2 runtime), same as mac/linux —
-  // no longer the single headless 团队助手.
+  // tmux-based multi-agent), same as mac/linux — no longer the single headless
+  // 团队助手.
   const args = ["--desktop"];
   child = spawn(exe, args, { stdio, detached: false, windowsHide: true, env });
   console.log(`[cicy-code-sidecar] spawned ${exe} ${args.join(" ")} pid=${child.pid} port=${port} log=${logPath || "(none)"}`);

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/native.js

@@ -2,10 +2,8 @@
 // WSL. (2026-06 方向变更: the Docker route in docker.js is transitional and
 // being retired; this module replaces it once stable.)
 //
-// The exe is a native Go build (w-10084's line). It shells out to a slim
-// bundled MSYS2 (bash/tmux/coreutils…) which it locates itself via
-// CICY_MSYS_ROOT probing — nothing to do here beyond optionally passing the
-// env through. Known exe-side behaviors we rely on:
+// The exe is a native Go build (w-10084's line). Known exe-side behaviors we
+// rely on:
 //   - reads PORT / CICY_CODE_PORT for the listen port
 //   - missing optional deps degrade to warnings (never os.Exit)
 //   - cold tmux-server start may need ConPTY (w-10084's ensureTmuxServer, WIP)

package/src/sidecar/runtime.js

@@ -1,12 +1,11 @@
 // Runtime Bundle v1 — versioned component store for everything cicy-desktop
-// runs locally (cicy-code, mihomo, and on Windows the slim MSYS2 tree).
+// runs locally (cicy-code, mihomo).
 //
 // Layout:
 //   ~/cicy-ai/runtime/
 //     versions.json                  { "<comp>": { "current": "<ver>" }, ... }
 //     cicy-code/<ver>/cicy-code(.exe)
 //     mihomo/<ver>/mihomo(.exe)
-//     msys2/<ver>/usr/bin/bash.exe   (win32 only, directory component)
 //
 // Sourcing order:
 //   1. first run: copy out of cicy-desktop's own node_modules — the platform
@@ -32,8 +31,8 @@ const IS_WIN = process.platform === "win32";
 
 // npm subpackage platform suffix. NOTE: Windows is "windows" not "win32" —
 // npm's spam filter 403s NEW package names containing 'win32', so EVERY cicy
-// subpackage (code/mihomo/msys2) is published as *-windows-*. This must match
-// the published names exactly or both the bundled-dir lookup AND the npm-pull
+// subpackage (code/mihomo) is published as *-windows-*. This must match the
+// published names exactly or both the bundled-dir lookup AND the npm-pull
 // fallback fail (a 404 that stranded first start on Windows).
 function plat() {
   const osStr = IS_WIN ? "windows" : process.platform === "darwin" ? "darwin" : "linux";
@@ -42,7 +41,6 @@ function plat() {
 }
 
 // kind "bin": single executable at the package root.
-// kind "dir": a directory tree (msys2) — `check` is the file proving it's intact.
 const COMPONENTS = {
   "cicy-code": {
     kind: "bin",
@@ -54,12 +52,6 @@ const COMPONENTS = {
     pkg: () => `cicy-mihomo-${plat()}`,
     bin: () => (IS_WIN ? "mihomo.exe" : "mihomo"),
   },
-  "msys2": {
-    kind: "dir",
-    winOnly: true,
-    pkg: () => "cicy-msys2-windows-x64",
-    check: path.join("usr", "bin", "bash.exe"),
-  },
 };
 
 function readVersions() {
@@ -83,19 +75,13 @@ function versionDir(comp, ver) {
   return path.join(RUNTIME_DIR, comp, ver);
 }
 
-// Absolute path of the component's current payload — the executable for "bin"
-// components, the root dir for "dir" components. null when not installed.
+// Absolute path of the component's current executable. null when not installed.
 function binPath(comp) {
   const c = COMPONENTS[comp];
   const ver = currentVersion(comp);
   if (!c || !ver) return null;
-  const p = c.kind === "dir" ? versionDir(comp, ver) : path.join(versionDir(comp, ver), c.bin());
-  const probe = c.kind === "dir" ? path.join(p, c.check) : p;
-  return fs.existsSync(probe) ? p : null;
-}
-
-function cpDirSync(src, dst) {
-  fs.cpSync(src, dst, { recursive: true });
+  const p = path.join(versionDir(comp, ver), c.bin());
+  return fs.existsSync(p) ? p : null;
 }
 
 // Install a payload directory as <comp>@<ver> and return the version dir.
@@ -108,31 +94,10 @@ function installPayload(comp, ver, payloadDir) {
   const staging = dst + ".staging";
   fs.rmSync(staging, { recursive: true, force: true });
   fs.mkdirSync(staging, { recursive: true });
-  if (c.kind === "dir") {
-    // The 118MB+ MSYS2 tree ships as a single .tar.gz inside the npm package
-    // (npm handles one big file far better than 10k tiny ones). Extract it;
-    // otherwise the payload is already an unpacked tree → copy.
-    const tgz = (() => { try { return fs.readdirSync(payloadDir).find((f) => /\.tar\.gz$/i.test(f)); } catch { return null; } })();
-    if (tgz) {
-      require("child_process").execFileSync("tar", ["-xzf", path.join(payloadDir, tgz), "-C", staging], { windowsHide: true });
-    } else {
-      cpDirSync(payloadDir, staging);
-    }
-    if (!fs.existsSync(path.join(staging, c.check))) {
-      // the tree may be nested one level (package/msys64/usr/... or root/usr/...)
-      const sub = fs.readdirSync(staging).find((d) =>
-        fs.existsSync(path.join(staging, d, c.check)));
-      if (!sub) { fs.rmSync(staging, { recursive: true, force: true }); throw new Error(`${comp}: ${c.check} missing in package`); }
-      fs.renameSync(path.join(staging, sub), staging + ".inner");
-      fs.rmSync(staging, { recursive: true, force: true });
-      fs.renameSync(staging + ".inner", staging);
-    }
-  } else {
-    const src = path.join(payloadDir, c.bin());
-    if (!fs.existsSync(src)) { fs.rmSync(staging, { recursive: true, force: true }); throw new Error(`${comp}: ${c.bin()} missing in package`); }
-    fs.copyFileSync(src, path.join(staging, c.bin()));
-    if (!IS_WIN) fs.chmodSync(path.join(staging, c.bin()), 0o755);
-  }
+  const src = path.join(payloadDir, c.bin());
+  if (!fs.existsSync(src)) { fs.rmSync(staging, { recursive: true, force: true }); throw new Error(`${comp}: ${c.bin()} missing in package`); }
+  fs.copyFileSync(src, path.join(staging, c.bin()));
+  if (!IS_WIN) fs.chmodSync(path.join(staging, c.bin()), 0o755);
   fs.renameSync(staging, dst);
   return dst;
 }
@@ -175,7 +140,7 @@ function bundledPkgDir(comp) {
 // sourcing from the bundled subpackage. Never touches the network.
 function ensureFromBundle(comp) {
   const c = COMPONENTS[comp];
-  if (!c || (c.winOnly && !IS_WIN)) return null;
+  if (!c) return null;
   const existing = binPath(comp);
   if (existing) return existing;
   const pkgDir = bundledPkgDir(comp);