cicy-desktop 2.1.254 → 2.1.256

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.254",
+  "version": "2.1.256",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -139,10 +139,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.311",
-    "cicy-code-darwin-arm64": "2.3.311",
-    "cicy-code-linux-x64": "2.3.311",
-    "cicy-code-linux-arm64": "2.3.311",
+    "cicy-code-darwin-x64": "2.3.315",
+    "cicy-code-darwin-arm64": "2.3.315",
+    "cicy-code-linux-x64": "2.3.315",
+    "cicy-code-linux-arm64": "2.3.315",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/backends/sidecar-ipc.js

@@ -150,13 +150,24 @@ function register({ sidecarLogPath } = {}) {
     _dockerDaemonBusy = true;
     try {
       const s = await refreshDockerStatus();
-      // 没启动的给我启动: distro installed but :8008 not healthy (and WSL not unknown)
-      // → bring it up. bootstrap is idempotent: it skips done steps and just runs
-      // startEngine + the container. Skip when not installed (would silently pull
-      // the 444MB rootfs) or unknown (WSL not answering — let the next tick retry).
-      if (s.installed && !s.running && !s.unknown) {
-        log.info("[docker-daemon] installed but :8008 down → auto-starting (bootstrap idempotent)");
-        try { await appDocker.bootstrap(await appOpts()); } catch (e) { log.warn(`[docker-daemon] auto-start failed: ${e.message}`); }
+      // 打开 cicy-desktop 就保证 Windows/WSL 的 :8008 可用:
+      //   - 已安装但停止 → 启动 WSL、dockerd 和容器;
+      //   - 从未安装 → bootstrap 自动启用 WSL2、导入专用 distro、安装 Docker
+      //     Engine、拉取镜像并启动 cicy-code。
+      // bootstrap 幂等且可续跑;首次启用 WSL 若要求重启 Windows,下次登录 Desktop
+      // 会再次进入这里并从已完成的步骤继续。unknown 表示 WSL 正卡住/未响应,
+      // 此时不并发安装,留给下一轮检测或显式「修复 WSL」。
+      if (!s.running && !s.unknown) {
+        log.info(`[docker-daemon] :8008 down (${s.installed ? "installed" : "not installed"}) → auto-bootstrapping WSL cicy-code`);
+        try {
+          await ensureDockerTeam().catch(() => {});
+          const result = await appDocker.bootstrap(await appOpts());
+          if (result && result.ok) {
+            try { await registerAppTeam(); } catch {}
+          } else if (result && result.reason) {
+            log.warn(`[docker-daemon] auto-bootstrap paused: ${result.reason}`);
+          }
+        } catch (e) { log.warn(`[docker-daemon] auto-bootstrap failed: ${e.message}`); }
         await refreshDockerStatus();
       } else if (s.running) {
         // 自愈:容器在跑,但很可能是「首次启动时还没登录 / key 还没就位就建好了」的没 key 容器

package/src/main.js

@@ -939,30 +939,39 @@ electronApp.whenReady().then(async () => {
     const lt = require("./backends/local-teams");
 
     // 占位卡("先有一个 :8008 占位"): 开机**立刻无条件**注册本地团队,homepage 永远有
-    // 这张卡 —— :8008 没起来时显示「未运行」+ 启动/安装入口(不会再空首页);起来后下面的
-    // probe 循环 upsert 一次,状态翻 running + 触发 gateway key/teamId 注入。addTeam 幂等。
+    // 这张卡 —— :8008 启动期间显示「未运行」;起来后下面的自动启动流程 upsert 一次,
+    // 状态翻 running + 触发 gateway key/teamId 注入。addTeam 幂等。
     lt.addTeam({ base_url: `http://127.0.0.1:${sidecarPort}`, name: i18n.t("localTeams.defaultName") })
       .then((r) => { if (r && r.id) log.info(`[Sidecar] local team placeholder registered (${r.id})`); })
       .catch((e) => log.warn(`[Sidecar] placeholder register failed: ${e.message}`));
 
-    // **不在 boot 静默 start**(bug 修复): 首次启动要装 Node/brew/tmux 等依赖,必须让
-    // 用户在点「启动并打开」时**看着 drawer 装**(命令/进度/错误/重试)。boot 静默装会:① 用户
-    // 看不到卡在哪 ② 和用户点击重复 spawn 抢锁。所以这里只:① 注册占位卡 ② 若 cicy-code 已在
-    // 跑(上次保活留下的)就 adopt 刷新状态 + 拿 key/teamId。真正的启动/安装由 sidecar:start
-    // (点「启动并打开」)驱动,带 drawer。
+    // 打开 cicy-desktop 就保证本地 :8008 自动启动。start() 自带 child 去重:
+    // 自动启动仍在准备依赖时,用户点击「启动并打开」只会复用同一个 child,不会重复
+    // spawn 或抢安装锁。若上次退出后 daemon 仍在,则直接 adopt,不启动第二份。
     (async () => {
-      for (let i = 0; i < 40; i++) {
-        try {
-          if (await cicyCodeSidecar.probeExisting(sidecarPort)) {
-            const r = await lt.addTeam({ base_url: `http://127.0.0.1:${sidecarPort}`, name: i18n.t("localTeams.defaultName") });
-            if (r && r.id) log.info(`[Sidecar] adopted running cicy-code → local team ready (${r.id})`);
-            startSidecarWatchdog(); // 已在跑 → 起 watchdog 保活(崩了重起,此时依赖已装、起得快)
-            return;
+      try {
+        let running = await cicyCodeSidecar.probeExisting(sidecarPort);
+        if (!running) {
+          log.info(`[Sidecar] :${sidecarPort} 未运行 — 随 cicy-desktop 自动启动`);
+          await cicyCodeSidecar.start({
+            logPath: path.join(os.homedir(), "logs", "cicy-code-sidecar.log"),
+          });
+          // 首次启动可能要准备运行环境和恢复 agent 面板;等待端口真正监听。
+          for (let i = 0; i < 360 && !running; i++) {
+            await new Promise((res) => setTimeout(res, 500));
+            running = await cicyCodeSidecar.probeExisting(sidecarPort);
           }
-        } catch (e) { log.warn(`[Sidecar] adopt probe error: ${e.message}`); }
-        await new Promise((res) => setTimeout(res, 3000));
+        }
+        if (!running) {
+          log.warn(`[Sidecar] 自动启动后 :${sidecarPort} 在 180s 内仍未就绪`);
+          return;
+        }
+        const r = await lt.addTeam({ base_url: `http://127.0.0.1:${sidecarPort}`, name: i18n.t("localTeams.defaultName") });
+        if (r && r.id) log.info(`[Sidecar] running cicy-code adopted → local team ready (${r.id})`);
+        startSidecarWatchdog();
+      } catch (e) {
+        log.warn(`[Sidecar] 自动启动失败: ${e.message}`);
       }
-      log.info(`[Sidecar] :${sidecarPort} 未在跑 — 占位卡显示「未运行」,等用户点「启动并打开」(带安装 drawer)`);
     })();
   }
 

package/src/tabbrowser/panel-cells.js

@@ -136,10 +136,16 @@ class PanelCells {
     const push = () => {
       let url = "", title = "";
       try { url = wc.getURL(); title = wc.getTitle(); } catch (e) {}
-      this.sendState({ id: cellId, url, title, loading: false, wcId: wc.id });
+      // did-navigate / page-title-updated commonly fire while the document is
+      // still loading. Hard-coding false here hid the spinner immediately after
+      // did-start-loading; report the BrowserView's actual state instead.
+      let loading = false;
+      try { loading = wc.isLoading(); } catch (e) {}
+      this.sendState({ id: cellId, url, title, loading, wcId: wc.id });
     };
     wc.on("did-start-loading", () => this.sendState({ id: cellId, loading: true, wcId: wc.id }));
     wc.on("did-stop-loading", push);
+    wc.on("did-fail-load", push);
     wc.on("did-navigate", push);
     wc.on("did-navigate-in-page", push);
     wc.on("page-title-updated", push);

package/src/tabbrowser/split-panel.html

@@ -26,8 +26,12 @@
   .native-cells .cell,.native-cells .divider{transition:none}
   .cell.dragging-layout{transition:none}
   .cell__head{flex:0 0 34px;display:flex;align-items:center;gap:6px;padding:0 6px 0 10px;background:var(--head);border-bottom:1px solid var(--line);-webkit-user-select:none;user-select:none}
-  .cell__spin{flex:0 0 12px;width:12px;height:12px;border:2px solid rgba(255,255,255,.18);border-top-color:var(--accent);border-radius:50%;animation:sp .7s linear infinite;display:none}
-  .cell.loading .cell__spin{display:block}
+  /* Reload and loading share one fixed button slot: loading swaps the glyph in
+     place, so no toolbar element moves and no extra padding is needed. */
+  .reload-btn{position:relative}
+  .reload-btn .cell__spin{position:absolute;width:12px;height:12px;border:2px solid rgba(255,255,255,.18);border-top-color:var(--accent);border-radius:50%;animation:sp .7s linear infinite;visibility:hidden}
+  .cell.loading .reload-btn>svg{visibility:hidden}
+  .cell.loading .reload-btn .cell__spin{visibility:visible}
   @keyframes sp{to{transform:rotate(360deg)}}
   .cell__url{flex:1;min-width:0;height:24px;padding:0 10px;background:#101012;border:1px solid var(--line);border-radius:12px;color:var(--fg);font-size:12px;outline:none;-webkit-user-select:text;user-select:text}
   .cell__url:focus{border-color:var(--accent);background:#0d0d10}
@@ -639,18 +643,25 @@
     url.value = leaf.url || '';
     url.addEventListener('keydown', (e) => {
       if (e.key !== 'Enter') return;
+      // Enter during an IME composition commits the composing text; navigating
+      // and blurring in that same event makes Chromium commit it a second time
+      // (e.g. "chatgpt" → "chatgptchatgpt"). Let the IME finish first; the
+      // following Enter performs navigation, matching a normal browser omnibox.
+      if (e.isComposing || e.keyCode === 229) return;
+      e.preventDefault();
       const u = normalizeUrl(url.value);
       if (u) { setCellUrl(leaf.id, u); url.blur(); }
     });
     url.addEventListener('focus', () => url.select());
-    head.appendChild(spin);
     head.appendChild(service);
     head.appendChild(profile);
     head.appendChild(url);
-    head.appendChild(btn(I.reload, '刷新', '', () => {
+    const reload = btn(I.reload, '刷新', 'reload-btn', () => {
       if (NATIVE) { try { window.panelAPI.reload(leaf.id); } catch (e) {} return; }
       const c = cells.get(leaf.id); try { c && c.wv && c.wv.reload(); } catch (e) {}
-    }));
+    });
+    reload.appendChild(spin);
+    head.appendChild(reload);
     head.appendChild(btn(I.splitR, '右分屏', '', () => splitLeaf(leaf.id, 'row')));
     head.appendChild(btn(I.splitD, '下分屏', '', () => splitLeaf(leaf.id, 'col')));
     head.appendChild(btn(I.close, '关闭', 'close', () => closeLeaf(leaf.id)));