cicy-desktop 2.1.321 → 2.1.323

package/bin/preinstall.sh

@@ -1,32 +1,32 @@
-#!/bin/bash
-
-set -e
-
-echo "Installing electron globally..."
-
-if [ "$(uname)" = "Linux" ]; then
-  sudo npm install -g electron
-else
-  npm install -g electron
-fi
-
-if [ "$(uname)" = "Linux" ]; then
-  echo "Fixing chrome-sandbox permissions on Linux..."
-  ELECTRON_PATH=$(which electron)
-  ELECTRON_DIR=$(dirname "$ELECTRON_PATH")
-  SANDBOX_PATH="$ELECTRON_DIR/../lib/node_modules/electron/dist/chrome-sandbox"
-  
-  if [ -f "$SANDBOX_PATH" ]; then
-    if command -v sudo &> /dev/null; then
-      sudo chown root:root "$SANDBOX_PATH"
-      sudo chmod 4755 "$SANDBOX_PATH"
-      echo "chrome-sandbox permissions fixed"
-    else
-      echo "Warning: sudo not available, skipping chrome-sandbox permissions"
-    fi
-  else
-    echo "Warning: chrome-sandbox not found at $SANDBOX_PATH"
-  fi
-fi
-
+#!/bin/bash
+
+set -e
+
+echo "Installing electron globally..."
+
+if [ "$(uname)" = "Linux" ]; then
+  sudo npm install -g electron
+else
+  npm install -g electron
+fi
+
+if [ "$(uname)" = "Linux" ]; then
+  echo "Fixing chrome-sandbox permissions on Linux..."
+  ELECTRON_PATH=$(which electron)
+  ELECTRON_DIR=$(dirname "$ELECTRON_PATH")
+  SANDBOX_PATH="$ELECTRON_DIR/../lib/node_modules/electron/dist/chrome-sandbox"
+  
+  if [ -f "$SANDBOX_PATH" ]; then
+    if command -v sudo &> /dev/null; then
+      sudo chown root:root "$SANDBOX_PATH"
+      sudo chmod 4755 "$SANDBOX_PATH"
+      echo "chrome-sandbox permissions fixed"
+    else
+      echo "Warning: sudo not available, skipping chrome-sandbox permissions"
+    fi
+  else
+    echo "Warning: chrome-sandbox not found at $SANDBOX_PATH"
+  fi
+fi
+
 echo "Electron setup complete"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.321",
+  "version": "2.1.323",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -144,10 +144,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.589",
-    "cicy-code-darwin-arm64": "2.3.589",
-    "cicy-code-linux-x64": "2.3.589",
-    "cicy-code-linux-arm64": "2.3.589",
+    "cicy-code-darwin-x64": "2.3.592",
+    "cicy-code-darwin-arm64": "2.3.592",
+    "cicy-code-linux-x64": "2.3.592",
+    "cicy-code-linux-arm64": "2.3.592",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/scripts/deploy-exe-fleet.sh

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
+# Superseded by the cicy-exe-deploy skill (cicy-skills/skills/cicy-exe-deploy) — kept as a plain-ssh fallback.
 # Push a locally built CiCy Desktop installer to every Windows node and install
 # it there — no CDN, no auto-update wait.
 #
 #   scripts/deploy-exe-fleet.sh [path/to/CiCy Desktop Setup X.Y.Z.exe] [node...]
 #
 # Per node (ssh alias from ~/.ssh/config, e.g. xs-1001 — frp via ws-hub):
-#   1. scp the exe into the node's ~/projects (= C:\ of its Windows host)
+#   1. scp the exe into the node's ~/projects (= C:\projects of its Windows host)
 #   2. ssh -L tunnel to the node's cicy-code :8008, ask it for connected
 #      cicy-desktop clients (agent-desktop clients)
 #   3. agent-desktop exec-file a tiny .bat on each Windows client that runs the
@@ -24,12 +25,12 @@ fi
 shift || true
 VER=$(basename "$EXE" | sed -E 's/.*Setup ([0-9.]+)\.exe/\1/')
 REMOTE_NAME="CiCy-Desktop-Setup-$VER.exe"
-WIN_PATH="C:\\$REMOTE_NAME"
+WIN_PATH="C:\\projects\\$REMOTE_NAME"
 
 if [ $# -gt 0 ]; then NODES="$*"; fi
 if [ -z "${NODES:-}" ]; then
   # every xs-* alias in ~/.ssh/config (Windows hosts); mac-local etc. are not exe targets
-  NODES=$(awk '/^Host xs-/{print $2}' ~/.ssh/config | sort -V)
+  NODES=$(awk '/^Host xs-/ && $2 !~ /[*?]/{print $2}' ~/.ssh/config | sort -V)
 fi
 PORT=${LOCAL_PORT_BASE:-18100}
 SCRATCH=$(mktemp -d)

package/src/backends/hub-client.js

@@ -62,20 +62,72 @@ function desktopInstanceId() {
   return id;
 }
 
-async function hubFetch(route, { method = "GET", token = "", body = null } = {}) {
+// Electron's net.fetch goes through Chromium's network stack — it honours the
+// OS proxy settings (PAC / system proxy) like the renderer does. Node's global
+// fetch ignores them, which showed up as "fetch failed" on PCs that can only
+// reach the hub through a proxy. Falls back to global fetch outside Electron.
+function pickFetch() {
+  try { const { net, app } = require("electron"); if (net && typeof net.fetch === "function" && app && app.isReady()) return net.fetch.bind(net); } catch {}
+  return fetch;
+}
+
+async function hubFetch(route, { method = "GET", token = "", body = null, tries = 2 } = {}) {
+  let lastErr;
+  for (let attempt = 0; attempt < tries; attempt++) {
+    const ctrl = new AbortController();
+    const t = setTimeout(() => ctrl.abort(), FETCH_TIMEOUT_MS);
+    try {
+      const headers = { accept: "application/json" };
+      if (token) headers.authorization = "Bearer " + token;
+      if (body != null) headers["content-type"] = "application/json";
+      const r = await pickFetch()(hubOrigin() + route, { method, headers, body: body == null ? undefined : JSON.stringify(body), signal: ctrl.signal, cache: "no-store" });
+      const text = await r.text();
+      let json = null;
+      try { json = text ? JSON.parse(text) : null; } catch {}
+      return { status: r.status, ok: r.ok, json, text };
+    } catch (e) {
+      lastErr = e;
+      log.warn(`[hub] ${method} ${route} failed (${attempt + 1}/${tries}): ${e.message}`);
+      if (attempt + 1 < tries) await new Promise((r) => setTimeout(r, 1500));
+    } finally { clearTimeout(t); }
+  }
+  const msg = String((lastErr && lastErr.message) || lastErr || "fetch failed");
+  throw new Error(/fetch failed|ECONN|ENOTFOUND|abort/i.test(msg) ? `hub unreachable (${hubOrigin()}): ${msg}` : msg);
+}
+
+// ── fallback: the local cicy-code sidecar ───────────────────────────────────
+// Some PCs cannot reach the hub directly at all (no proxy on Windows) while the
+// cicy-code container on the same PC can (it carries its own proxy) and is
+// signed in to the same hub account. Its /api/im/cicy-cloud/* routes give us
+// the same instance list and one-time open grants, so use them when the direct
+// call dies with a network error.
+const SIDECAR_PORT = Number(process.env.CICY_SIDECAR_PORT || 8008);
+let _sidecarTok = { value: "", at: 0 };
+async function sidecarToken() {
+  if (_sidecarTok.value && Date.now() - _sidecarTok.at < 5 * 60 * 1000) return _sidecarTok.value;
+  let tok = "";
+  try { tok = String(readGlobalConfig(GLOBAL_JSON)?.api_token || "").trim(); } catch {}
+  if (!tok && process.platform === "win32") {
+    try { tok = String(await require("../sidecar/wsl-docker").readContainerToken(SIDECAR_PORT) || "").trim(); } catch (e) { log.warn(`[hub] sidecar token: ${e.message}`); }
+  }
+  if (tok) _sidecarTok = { value: tok, at: Date.now() };
+  return tok;
+}
+async function sidecarFetch(route, { method = "GET", body = null } = {}) {
+  const tok = await sidecarToken();
+  if (!tok) throw new Error("local cicy-code token unavailable");
   const ctrl = new AbortController();
   const t = setTimeout(() => ctrl.abort(), FETCH_TIMEOUT_MS);
   try {
-    const headers = { accept: "application/json" };
-    if (token) headers.authorization = "Bearer " + token;
+    const headers = { accept: "application/json", authorization: "Bearer " + tok };
     if (body != null) headers["content-type"] = "application/json";
-    const r = await fetch(hubOrigin() + route, { method, headers, body: body == null ? undefined : JSON.stringify(body), signal: ctrl.signal, cache: "no-store" });
+    const r = await fetch(`http://127.0.0.1:${SIDECAR_PORT}${route}`, { method, headers, body: body == null ? undefined : JSON.stringify(body), signal: ctrl.signal, cache: "no-store" });
     const text = await r.text();
-    let json = null;
-    try { json = text ? JSON.parse(text) : null; } catch {}
+    let json = null; try { json = text ? JSON.parse(text) : null; } catch {}
     return { status: r.status, ok: r.ok, json, text };
   } finally { clearTimeout(t); }
 }
+const isNetErr = (e) => /unreachable|fetch failed|ECONN|ENOTFOUND|abort/i.test(String((e && e.message) || e));
 
 function errorOf(res, fallback) {
   return (res && res.json && (res.json.error || res.json.message)) || fallback || `HTTP ${res && res.status}`;
@@ -168,18 +220,27 @@ function clearAuth() {
 async function instances() {
   const a = readAuth();
   if (!a) return { ok: false, error: "not_logged_in", instances: [] };
-  const res = await hubFetch("/api/instances", { token: a.token });
-  if (res.status === 401) { clearAuth(); return { ok: false, error: "unauthorized", instances: [] }; }
+  let res, viaSidecar = false;
+  try { res = await hubFetch("/api/instances", { token: a.token }); }
+  catch (e) {
+    if (!isNetErr(e)) return { ok: false, error: e.message, instances: [] };
+    log.warn(`[hub] direct instance list failed (${e.message}); trying the local cicy-code`);
+    try { res = await sidecarFetch("/api/im/cicy-cloud/instances"); viaSidecar = true; }
+    catch (e2) { return { ok: false, error: `${e.message}; sidecar: ${e2.message}`, instances: [] }; }
+  }
+  if (res.status === 401 && !viaSidecar) { clearAuth(); return { ok: false, error: "unauthorized", instances: [] }; }
   if (!res.ok || !res.json) return { ok: false, error: errorOf(res, "instances_failed"), instances: [] };
   const list = Array.isArray(res.json.instances) ? res.json.instances : [];
   const out = list
-    .filter((i) => !i.self && !String(i.platform || "").startsWith("desktop"))
+    // direct: `self` is this desktop's hidden pseudo-instance; via sidecar: `self` is the
+    // local node itself, which IS a real instance the user may want to open.
+    .filter((i) => (viaSidecar || !i.self) && !String(i.platform || "").startsWith("desktop"))
     .map((i) => ({
       id: i.instanceId,
-      name: i.name || i.proxyHost || i.instanceId,
+      name: i.name || (i.proxyHost ? String(i.proxyHost).split(".")[0] : i.instanceId),
       host: i.proxyHost || "",
       url: i.proxyHost ? "https://" + i.proxyHost : "",
-      online: !!i.online,
+      online: i.status ? i.status === "online" : !!i.online,
       reachable: !!i.proxyAvailable,
       version: i.version || "",
       platform: i.platform || "",
@@ -192,14 +253,22 @@ async function instances() {
       agents: Array.isArray(i.agents) ? i.agents.length : undefined,
     }))
     .sort((x, y) => Number(y.online) - Number(x.online) || x.name.localeCompare(y.name));
-  return { ok: true, owner: res.json.owner || a.owner, instances: out };
+  return { ok: true, owner: res.json.owner || a.owner, viaSidecar, instances: out };
 }
 
 // One-time hand-off URL for an instance (optionally one of its local ports).
 async function grantUrl({ id, port = 0, next = "/" } = {}) {
   const a = readAuth();
   if (!a) throw new Error("not_logged_in");
-  const res = await hubFetch("/api/gateway/grant", { method: "POST", token: a.token, body: { instanceId: String(id || ""), port: Number(port) || 0, next: String(next || "/") } });
+  let res;
+  try { res = await hubFetch("/api/gateway/grant", { method: "POST", token: a.token, body: { instanceId: String(id || ""), port: Number(port) || 0, next: String(next || "/") } }); }
+  catch (e) {
+    if (!isNetErr(e)) throw e;
+    log.warn(`[hub] direct grant failed (${e.message}); trying the local cicy-code`);
+    res = await sidecarFetch("/api/im/cicy-cloud/open", { method: "POST", body: { instance_id: String(id || ""), port: Number(port) || 0, next: String(next || "/") } });
+    if (!res.ok || !res.json || !res.json.url) throw new Error(errorOf(res, "grant_failed"));
+    return { url: res.json.url, host: res.json.host };
+  }
   if (res.status === 401) { clearAuth(); throw new Error("unauthorized"); }
   if (!res.ok || !res.json || !res.json.url) throw new Error(errorOf(res, "grant_failed"));
   return { url: res.json.url, host: res.json.host };

package/src/config.js

@@ -1,11 +1,11 @@
 // Copyright 2026 CiCy AI
 // SPDX-License-Identifier: Apache-2.0
 
-module.exports = {
-  config: {
-    port: null,
-    logsDir: null,
-    logFilePath: null,
-    oneWindow: false,
-  },
-};
+module.exports = {
+  config: {
+    port: null,
+    logsDir: null,
+    logFilePath: null,
+    oneWindow: false,
+  },
+};