cicy-desktop 2.1.31 → 2.1.33

package/bin/cicy-desktop

@@ -13,6 +13,11 @@ const GLOBAL_CONFIG_FILE = path.join(HOME, "global.json");
 const STATE_FILE = path.join(HOME, ".cicy-cluster.json");
 const LOGS_DIR = path.join(HOME, "logs");
 const PACKAGE_ROOT = path.join(__dirname, "..");
+// CN defaults: a fresh machine has no cached electron binary, so npx's electron
+// postinstall would hit GitHub releases and fail (ECOMPROMISED). Mirror it +
+// the npm registry to npmmirror (overridable via the same-named env vars).
+const ELECTRON_MIRROR = process.env.ELECTRON_MIRROR || "https://npmmirror.com/mirrors/electron/";
+const NPM_REGISTRY = process.env.CICY_NPM_REGISTRY || process.env.npm_config_registry || "https://registry.npmmirror.com";
 const MASTER_ENTRY = path.join(PACKAGE_ROOT, "src", "master", "master-main.js");
 
 // Resolve the electron binary to spawn. Prefers the project-local copy
@@ -346,14 +351,97 @@ function executeCommand(cmd) {
   }
 }
 
+// Drop a double-clickable, CiCy-icon desktop shortcut that relaunches via
+// `npx cicy-desktop`. GUI-launched shortcuts get a minimal PATH (no node), so
+// we bake the dir of the node running this launcher (process.execPath) in.
+function nodeBinDir() {
+  try { return path.dirname(process.execPath); } catch { return ""; }
+}
+
 function ensureDesktopCommandFile() {
-  if (!fs.existsSync(PROJECT_COMMAND_FILE)) {
-    return;
+  try {
+    if (process.platform === "darwin") return ensureMacDesktopApp();
+    if (process.platform === "linux")  return ensureLinuxDesktopEntry();
+    if (process.platform === "win32")  return ensureWindowsShortcut();
+  } catch (e) {
+    console.warn(`[shortcut] failed: ${e.message}`);
+  }
+}
+
+function ensureMacDesktopApp() {
+  // Build a REAL AppleScript .app via osacompile. A hand-crafted .app whose
+  // executable is a shell script triggers "CiCy Desktop is not responding"
+  // (LaunchServices waits for the script to register as a Cocoa app and times
+  // out). An osacompile applet's executable IS the AppleScript runtime — a
+  // proper Cocoa app — so it launches cleanly, backgrounds `npx cicy-desktop`
+  // via `do shell script`, then quits. Icon = the applet's applet.icns.
+  const { execFileSync } = require("child_process");
+  const appDir = path.join(DESKTOP_DIR, "CiCy Desktop.app");
+  const nodeDir = nodeBinDir();
+  // do shell script needs node on PATH (GUI launch has a minimal PATH); the
+  // trailing & + nohup + </dev/null lets the shell return so the applet quits.
+  // ELECTRON_MIRROR + npmmirror: a fresh CN machine has no cached electron
+  // binary, so npx's electron postinstall would try GitHub releases and fail
+  // (ECOMPROMISED / lock-compromised). Point it at npmmirror's electron mirror.
+  // Harmless elsewhere — only consulted when electron actually (re)downloads.
+  const ascript =
+    `do shell script "export PATH=\\"${nodeDir}:/usr/local/bin:/opt/homebrew/bin:$PATH\\" ; ` +
+    `export ELECTRON_MIRROR=\\"${ELECTRON_MIRROR}\\" ; export npm_config_registry=\\"${NPM_REGISTRY}\\" ; ` +
+    `nohup npx -y cicy-desktop > /tmp/cicy-desktop.log 2>&1 < /dev/null &"`;
+  const tmp = path.join(os.tmpdir(), `cicy-launch-${process.pid}.applescript`);
+  fs.writeFileSync(tmp, ascript);
+  try {
+    fs.rmSync(appDir, { recursive: true, force: true });
+    execFileSync("osacompile", ["-o", appDir, tmp], { stdio: "ignore" });
+    const icns = path.join(PACKAGE_ROOT, "build", "icon.icns");
+    if (fs.existsSync(icns)) {
+      fs.copyFileSync(icns, path.join(appDir, "Contents", "Resources", "applet.icns"));
+    }
+    try { const t = new Date(); fs.utimesSync(appDir, t, t); } catch {}
+    console.log(`📎 Desktop shortcut: ${appDir}`);
+  } finally {
+    try { fs.unlinkSync(tmp); } catch {}
+  }
+}
+
+function ensureLinuxDesktopEntry() {
+  const icon = path.join(PACKAGE_ROOT, "build", "icons", "icon-256.png");
+  const file = path.join(DESKTOP_DIR, "cicy-desktop.desktop");
+  fs.mkdirSync(DESKTOP_DIR, { recursive: true });
+  fs.writeFileSync(file,
+`[Desktop Entry]
+Type=Application
+Name=CiCy Desktop
+Exec=sh -c 'export PATH="${nodeBinDir()}:$PATH"; export ELECTRON_MIRROR="${ELECTRON_MIRROR}"; export npm_config_registry="${NPM_REGISTRY}"; exec npx -y cicy-desktop'
+Icon=${icon}
+Terminal=false
+Categories=Development;
+`);
+  fs.chmodSync(file, 0o755);
+  console.log(`📎 Desktop shortcut: ${file}`);
+}
+
+function ensureWindowsShortcut() {
+  // A .cmd is icon-less; a proper .lnk with the CiCy icon is written via a
+  // throwaway PowerShell script (WScript.Shell CreateShortcut + IconLocation).
+  const ico = path.join(PACKAGE_ROOT, "build", "icon.ico");
+  const lnk = path.join(DESKTOP_DIR, "CiCy Desktop.lnk");
+  const nodeDir = nodeBinDir();
+  const ps = path.join(require("os").tmpdir(), `cicy-shortcut-${process.pid}.ps1`);
+  fs.writeFileSync(ps,
+`$ws = New-Object -ComObject WScript.Shell
+$s = $ws.CreateShortcut('${lnk.replace(/'/g, "''")}')
+$s.TargetPath = 'cmd.exe'
+$s.Arguments = '/c set PATH=${nodeDir};%PATH%&& set ELECTRON_MIRROR=${ELECTRON_MIRROR}&& set npm_config_registry=${NPM_REGISTRY}&& npx -y cicy-desktop'
+$s.IconLocation = '${ico.replace(/'/g, "''")}'
+$s.Save()
+`);
+  try {
+    execSync(`powershell -NoProfile -ExecutionPolicy Bypass -File "${ps}"`, { stdio: "ignore" });
+    console.log(`📎 Desktop shortcut: ${lnk}`);
+  } finally {
+    try { fs.unlinkSync(ps); } catch {}
   }
-
-  fs.copyFileSync(PROJECT_COMMAND_FILE, DESKTOP_COMMAND_FILE);
-  fs.chmodSync(DESKTOP_COMMAND_FILE, 0o755);
-  console.log(`📎 Synced launcher to ${DESKTOP_COMMAND_FILE}`);
 }
 
 function prefixLines(prefix, text) {

package/package.json

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

package/src/backends/homepage-preload.js

@@ -101,19 +101,11 @@ contextBridge.exposeInMainWorld("cicy", {
     restartSidecar: ()      => logInvoke("backends:restart-sidecar"),
     resolveUrl:     (id)    => logInvoke("backends:resolve-url", id),
   },
+  // cicy-code is installed/run by the sidecar via `npx cicy-code` (mac/linux)
+  // or Docker (Windows) — no in-app downloader. Only lifecycle + status remain.
   sidecar: {
     status:      ()  => logInvoke("sidecar:status"),
-    wslStatus:   ()  => logInvoke("sidecar:wsl-status"),
-    installWsl:  ()  => logInvoke("sidecar:wsl-install"),
-    checkLatest: ()  => logInvoke("sidecar:check-latest"),
-    install:     ()  => logInvoke("sidecar:install"),
     start:       ()  => logInvoke("sidecar:start"),
-    cancel:      ()  => logInvoke("sidecar:cancel"),
-    onProgress:  (cb) => {
-      const handler = (_e, payload) => { try { cb(payload); } catch {} };
-      ipcRenderer.on("sidecar:progress", handler);
-      return () => ipcRenderer.removeListener("sidecar:progress", handler);
-    },
   },
   windows: {
     list:  ()   => logInvoke("windows:list"),