cicy-desktop 2.1.368 → 2.1.370

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,7 +7,6 @@ import "./App.css";
7
7
  import { TERMS_VERSION, termsForDisplay } from "./termsText";
8
8
  import { mdToHtml } from "./mdLite";
9
9
  import { buildCustomTeamEditPatch } from "./custom-team-edit";
10
- import DEB_CTL_SCRIPT from "../../../src/sidecar/qemu-vm.cjs?raw"; // 和 desktop 的 QEMU 版 Docker 共用同一份
11
10
 
12
11
  // i18n bridge exposed by homepage-preload (window.cicyI18n.t, locale from
13
12
  // app.getLocale()). Returns the localized string, or `fallback` when the key
@@ -552,7 +551,7 @@ export default function App() {
552
551
  // early return(termsOk / !token 等),把 hook 放到它们后面会让登录前后 hook 数量不一致,
553
552
  // React 直接抛 #310 "Rendered more hooks than during the previous render",整页白屏。
554
553
  // 2026-09-13 我就是这么把全车队首页打崩的。
555
- const dshFleet = useDshFleet();
554
+ // (2026-10-22 dsh 全车队下线:useDshFleet / DSH tab / DshCard 都已拿掉,别再加回来。)
556
555
  // CiCy Hub: email sign-in → every cicy-code instance of that account (no local
557
556
  // cicy-code needed). State + cards live in useHub / HubInstanceCard below.
558
557
  const hub = useHub();
@@ -1177,9 +1176,6 @@ export default function App() {
1177
1176
  const showCloud = false; // 首页只用 CiCy Hub 账号,云端团队不再展示
1178
1177
  const showHub = tab === "all" || tab === "hub";
1179
1178
  const hubCount = hub.instances ? hub.instances.length : 0;
1180
- // 「全部」只放真能打开的 dsh;DSH tab 里才把未就绪的一并列出来看状态。
1181
- const dshReady = (dshFleet.list || []).filter((m) => m.ready);
1182
- const showDshAll = (tab === "all" || tab === "dsh") && !!hub.loggedIn; // 未登录不展示车队机器
1183
1179
  // 首次打开:本地或云端团队任一还没拉到(为 null)→ grid 显示 skeleton 占位卡,直到两边都
1184
1180
  // resolve(出错也 resolve 成 []),再显示真实内容 —— 避免一个先回来另一个还空的露馅。
1185
1181
  const firstLoading = localTeams === null || teams === null;
@@ -1197,11 +1193,10 @@ export default function App() {
1197
1193
  <div className="app__tabsrow">
1198
1194
  <div className="app__tabs">
1199
1195
  {[
1200
- { k: "all", label: tr("teamFilter.all", "全部"), n: localCount + customCount + hubCount + dshReady.length },
1196
+ { k: "all", label: tr("teamFilter.all", "全部"), n: localCount + customCount + hubCount },
1201
1197
  { k: "local", label: tr("teamFilter.local", "本地"), n: localCount },
1202
1198
  { k: "hub", label: tr("teamFilter.hub", "CiCy Hub"), n: hubCount },
1203
1199
  { k: "custom", label: tr("teamFilter.custom", "自定义"), n: customCount },
1204
- { k: "dsh", label: tr("teamFilter.dsh", "DSH"), n: dshReady.length },
1205
1200
  ].map(({ k, label, n }) => (
1206
1201
  <button
1207
1202
  key={k}
@@ -1214,15 +1209,6 @@ export default function App() {
1214
1209
  </button>
1215
1210
  ))}
1216
1211
  </div>
1217
- {/* DSH tab 的手动刷新:token 会随 dsh 重启而变,但不值得轮询 —— 要新的自己点。 */}
1218
- {tab === "dsh" && (
1219
- <button type="button" className="btn-ghost" data-id="DshFleetRefresh" disabled={dshFleet.busy}
1220
- title={tr("dshFleet.refresh", "刷新 dsh 中继状态")}
1221
- style={{ marginLeft: 8, width: 28, height: 28, padding: 0, display: "inline-flex", alignItems: "center", justifyContent: "center" }}
1222
- onClick={() => dshFleet.refresh()}>
1223
- {dshFleet.busy ? <Spinner /> : <RefreshIcon />}
1224
- </button>
1225
- )}
1226
1212
  {/* DesktopIdBadge 已移入用户头像下拉菜单(受信任站点上面)。此处仅留占位撑开右侧布局。 */}
1227
1213
  <span style={{ marginLeft: "auto" }} aria-hidden />
1228
1214
  {/* 行尾:新加团队 → 直接去云端团队中心添加(私有云)。自定义入口已删。 */}
@@ -1305,12 +1291,6 @@ export default function App() {
1305
1291
  {!firstLoading && showHub && hub.loggedIn && (hub.instances || []).filter((it) => it.reachable || it.online).map((it) => (
1306
1292
  <HubInstanceCard key={"hub:" + it.id} inst={it} onOpen={(next, title) => hub.open(it, next, title)} />
1307
1293
  ))}
1308
- {showDshAll && (tab === "dsh" ? (dshFleet.list || []) : dshReady).map((m) => <DshFleetCard key={"dsh:" + m.name} m={m} />)}
1309
- {tab === "dsh" && dshFleet.list !== null && dshFleet.list.length === 0 && !dshFleet.busy && (
1310
- <div className="empty" data-id="DshFleetEmpty" style={{ gridColumn: "1 / -1" }}>
1311
- {tr("dshFleet.empty", "还没有机器的 dsh 中继连上来。")}
1312
- </div>
1313
- )}
1314
1294
  {!firstLoading && showLocal && localList.map((t) => (
1315
1295
  <LocalTeamCard key={"local:" + t.id} team={t} cloudCode={cloudCodeFor(t.cloud_team_id)} onOpen={() => openLocalTeam(t.id)} onRename={renameLocalTeam} onRefresh={fetchLocalTeams} />
1316
1296
  ))}
@@ -1335,8 +1315,6 @@ export default function App() {
1335
1315
  />
1336
1316
  )}
1337
1317
  {/* 首页第二块:DeepSeek Harness(开源 Agent 框架),homepage 自装自启,和 cicy-code 卡并列 */}
1338
- {!firstLoading && showLocal && <DshCard />}
1339
- {!firstLoading && showLocal && <DebianCard />}
1340
1318
  {!firstLoading && showCustom && customList.map((t) => (
1341
1319
  <LocalTeamCard key={"custom:" + t.id} team={t} cloudCode={cloudCodeFor(t.cloud_team_id)} onOpen={() => openLocalTeam(t.id)} onRename={renameLocalTeam} onRefresh={fetchLocalTeams} />
1342
1320
  ))}
@@ -3149,7 +3127,7 @@ function DockerInstallDrawerHost() {
3149
3127
  const isOpen = st.kind === "open"; // 打开失败报告:无安装 stepper、标题/失败标签用「打开」
3150
3128
  const phaseIdx = DOCKER_PHASES.findIndex(([k]) => k === st.phase);
3151
3129
  const dlBars = isOpen ? [] : ["install-docker", "image"].filter((k) => st.bars?.[k]);
3152
- const drawerTitle = st.title || (isOpen ? tr("docker.openTitle", "打开 Docker 团队") : tr("docker.setupTitle", "安装 Docker cicy-code"));
3130
+ const drawerTitle = st.title || (isOpen ? `打开${LOCAL_TEAM_NAME}` : `安装${LOCAL_TEAM_NAME}`);
3153
3131
  const drawerSub = st.sub || `127.0.0.1:${dockerAppPort}`;
3154
3132
  // Minimized → a floating restore chip (op keeps running in the background).
3155
3133
  if (st.minimized) {
@@ -4034,294 +4012,25 @@ function DshCard() {
4034
4012
  );
4035
4013
  }
4036
4014
 
4037
- // ---------------------------------------------------------------------------
4038
- // Debian card —— 不靠 WSL 的开箱 Linux:QEMU 便携版 + Debian 13 官方云镜像,网页终端(ttyd)开成 tab。
4039
- // 和 DshCard 同构:全部只靠 homepage(exec_shell 跑 debian-ctl.js,脚本见 ./debian-ctl.cjs),
4040
- // 不改 desktop。有 WHPX 就硬件加速,没有退回软件模拟(慢但免管理员);「开启硬件加速」弹 UAC + 重启。
4041
- // 不自动安装(首次要下 ~390MB);装过之后开机自动启动(可在菜单关)。
4042
- const DEB_RED = "#d70a53";
4043
- const DEB_AUTO_KEY = "debian.auto"; // localStorage:"off" = 关闭开机自启
4044
- const DEB_PHASE = { qemu: "install-docker", extract: "install-docker", image: "image", verify: "image", disk: "image" };
4045
- const DEB_PHASE_MSG = {
4046
- qemu: "下载 QEMU 便携版(约 47MB)…", extract: "解压 QEMU…",
4047
- image: "下载 Debian 13 云镜像(约 343MB)…", verify: "校验镜像 SHA512…", disk: "创建虚拟磁盘(40G,按需增长)…",
4048
- };
4049
- const DEB_ERR = {
4050
- qemu_download: "QEMU 下载失败(网络)", qemu_checksum: "QEMU 包校验失败", qemu_extract: "QEMU 解压失败",
4051
- image_download: "Debian 镜像下载失败(网络)", image_checksum: "Debian 镜像校验失败", disk_create: "创建虚拟磁盘失败",
4052
- port_in_use: "端口被占用", not_installed: "还没安装", qemu_not_started: "QEMU 没能启动", spawn_failed: "后台进程起不来",
4053
- };
4054
- const debErr = (r) => [DEB_ERR[r?.error] || r?.error || "failed", r?.detail].filter(Boolean).join(":");
4055
- const debSleep = (ms) => new Promise((r) => setTimeout(r, ms));
4056
- let _debWritten = false;
4057
- async function debCtl(op, opts = {}) {
4058
- const env = await dshEnv(opts);
4059
- if (!env.node) return { ok: false, error: "no_node", detail: env.error || "" };
4060
- const ctl = `${env.home}\\cicy-ai\\db\\debian-ctl.js`;
4061
- if (!_debWritten) {
4062
- const w = parseRpcText(await window.electronRPC?.("file_write", { path: ctl, content: DEB_CTL_SCRIPT }));
4063
- if (!w.ok) return { ok: false, error: "ctl_write_failed", detail: w.stderr || w.stdout };
4064
- _debWritten = true;
4065
- }
4066
- const r = await dshShell(`"${env.node}" "${ctl}" ${op}`);
4067
- const m = String(r.stdout || "").trim().match(/\{[\s\S]*\}$/);
4068
- if (m) { try { return JSON.parse(m[0]); } catch {} }
4069
- return { ok: false, error: "ctl_no_output", detail: (r.stderr || r.stdout || "").trim().slice(-400) };
4070
- }
4071
- function DebianIcon() {
4072
- return (
4073
- <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden>
4074
- <path d="M14.5 19.5c-4.4 0-8-3.4-8-7.6 0-4 3.2-7.4 7.3-7.4 3.6 0 6.2 2.6 6.2 5.8 0 2.7-2 4.7-4.5 4.7-2 0-3.5-1.4-3.5-3.2 0-1.5 1.1-2.6 2.5-2.6" />
4075
- </svg>
4076
- );
4077
- }
4078
-
4079
- function DebianCard() {
4080
- const [st, setSt] = useState(null);
4081
- const [busy, setBusy] = useState(""); // "" | install | start | stop | open | accel
4082
- const [menuOpen, setMenuOpen] = useState(false);
4083
- const [menuPos, setMenuPos] = useState({ top: 0, left: 0 });
4084
- const [auto, setAuto] = useState(() => { try { return localStorage.getItem(DEB_AUTO_KEY) !== "off"; } catch { return true; } });
4085
- const kebabRef = useRef(null);
4086
- const menuRef = useRef(null);
4087
- const autoRan = useRef(false);
4088
- const busyRef = useRef("");
4089
- useEffect(() => { busyRef.current = busy; }, [busy]);
4090
- const MENU_W = 196;
4091
-
4092
- const refresh = useCallback(async () => {
4093
- try { const s = await debCtl("status"); setSt(s); return s; }
4094
- catch (e) { console.warn("[DebianCard] status", e); return null; }
4095
- }, []);
4096
- // 开机中(running 但终端还没起来)轮询快一点,好让「启动中」及时变「打开终端」
4097
- const booting = !!(st?.running && !st?.ready);
4098
- useEffect(() => {
4099
- if (!dshIsWin()) return;
4100
- refresh();
4101
- const id = setInterval(() => { if (!busyRef.current) refresh(); }, booting ? 5000 : 20000);
4102
- return () => clearInterval(id);
4103
- }, [refresh, booting]);
4104
-
4105
- // 等虚拟机里的网页终端起来:首次开机 cloud-init 要建用户/装 ttyd;软件模拟下要几分钟。
4106
- const waitReady = async (push) => {
4107
- let lastBoot = "";
4108
- for (let i = 0; i < 180; i++) { // 180 × 5s = 15 分钟
4109
- const s = await debCtl("status");
4110
- setSt(s);
4111
- if (s.ready) return s;
4112
- if (!s.running) return { ...s, error: "vm_exited" };
4113
- if (push && s.boot && s.boot !== lastBoot) { lastBoot = s.boot; push("container", s.boot); }
4114
- await debSleep(5000);
4115
- }
4116
- return { error: "boot_timeout" };
4117
- };
4118
-
4119
- const openTerm = async () => {
4120
- const r = await debCtl("open");
4121
- if (!r.ok) { toast.show({ id: "deb-open", status: "error", ttl: 6000, message: tr("debian.notReady", "Debian 还没启动好") }); return false; }
4122
- await window.cicy?.tabs?.open?.(r.url, "Debian", "", true);
4123
- return true;
4124
- };
4125
-
4126
- // 安装 + 启动 + 打开终端,全程走 Docker 同款抽屉。
4127
- const runSetup = useCallback(async () => {
4128
- if (busyRef.current) return;
4129
- setBusy("install");
4130
- dockerDrawer.open({ kind: "debian", title: tr("debian.setupTitle", "安装 Debian 13"), sub: tr("debian.setupSub", "QEMU 虚拟机 · 不需要 WSL"), onRetry: () => runSetup() });
4131
- const push = (phase, message, status) => dockerDrawer.push({ phase, message, status: status || "running" });
4132
- try {
4133
- push("install-docker", tr("debian.checkNode", "检查 Node.js…"));
4134
- let env = await dshEnv();
4135
- if (!env.node) {
4136
- push("install-docker", tr("dsh.installingNode", "这台机器没有 Node.js,下载便携版 {{v}}(约 37MB,免管理员)…", { v: DSH_NODE_VERSION }));
4137
- env = await dshEnv({ installNode: true });
4138
- if (!env.node) { dockerDrawer.finish({ ok: false, message: tr("dsh.nodeFailed", "Node.js 便携版安装失败:{{why}}", { why: env.error || "download" }) }); return; }
4139
- }
4140
- let s = await debCtl("status");
4141
- if (!s.ok) { dockerDrawer.finish({ ok: false, message: tr("dsh.ctlFailed", "控制脚本无法运行:{{why}}", { why: debErr(s) }) }); return; }
4142
- if (!s.installed) {
4143
- const r = await debCtl("install");
4144
- if (!r.ok) { dockerDrawer.finish({ ok: false, message: debErr(r) }); return; }
4145
- let lastPhase = "";
4146
- for (;;) {
4147
- await debSleep(2000);
4148
- s = await debCtl("status");
4149
- if (s.installed && !s.installing) break;
4150
- if (!s.installing) { dockerDrawer.finish({ ok: false, message: tr("debian.installFailed", "安装失败:{{why}}", { why: s.installError || "stopped" }) }); return; }
4151
- const ph = DEB_PHASE[s.phase] || "install-docker";
4152
- if (s.phase !== lastPhase) { lastPhase = s.phase; push(ph, tr(`debian.phase.${s.phase}`, DEB_PHASE_MSG[s.phase] || s.phase)); }
4153
- if ((s.phase === "qemu" || s.phase === "image") && s.total) {
4154
- dockerDrawer.push({ phase: ph, status: "running", progress: Math.min(99, Math.round(s.bytes * 100 / s.total)), received: s.bytes, total: s.total, url: s.src, label: s.phase === "qemu" ? "QEMU" : "Debian 13" });
4155
- }
4156
- }
4157
- push("image", tr("debian.installed", "QEMU + Debian 13 就绪"), "done");
4158
- }
4159
- push("container", s.whpxFeature ? tr("debian.startingWhpx", "启动虚拟机(尝试 WHPX 硬件加速)…") : tr("debian.startingTcg", "启动虚拟机(软件模拟,首次开机要几分钟)…"));
4160
- const r2 = await debCtl("start");
4161
- if (!r2.ok) { dockerDrawer.finish({ ok: false, message: tr("debian.startFailed", "启动失败:{{why}}", { why: debErr(r2) + (r2.tail ? " · " + String(r2.tail).trim().split(/\r?\n/).slice(-2).join(" · ") : "") }) }); return; }
4162
- const s2 = await waitReady(push);
4163
- if (!s2.ready) { dockerDrawer.finish({ ok: false, message: s2.error === "boot_timeout" ? tr("debian.bootTimeout", "15 分钟内终端没起来,看 ~/cicy-ai/logs/debian-console.log") : tr("debian.vmExited", "虚拟机退出了,看 ~/cicy-ai/logs/debian-qemu.log") }); return; }
4164
- push("container", s2.accel === "whpx" ? tr("debian.accelWhpx", "硬件加速:WHPX") : tr("debian.accelTcg", "软件模拟(较慢)—— 菜单里可「开启硬件加速」"), "done");
4165
- dockerDrawer.finish({ ok: true, message: tr("debian.ready", "Debian 已就绪,正在打开终端") });
4166
- await openTerm();
4167
- } catch (e) { dockerDrawer.finish({ ok: false, message: e.message }); }
4168
- finally { setBusy(""); refresh(); }
4169
- }, [refresh]);
4170
-
4171
- const runOp = async (kind, fn, okMsg) => {
4172
- if (busyRef.current) return;
4173
- setMenuOpen(false); setBusy(kind);
4174
- try {
4175
- const r = await fn();
4176
- if (r && r.ok === false) toast.show({ id: "deb-op", status: "error", ttl: 6000, message: debErr(r) });
4177
- else if (okMsg) toast.show({ id: "deb-op", status: "ok", ttl: 3000, message: okMsg });
4178
- } catch (e) { toast.show({ id: "deb-op", status: "error", ttl: 6000, message: e.message }); }
4179
- finally { setBusy(""); refresh(); }
4180
- };
4181
- const startSilent = () => runOp("start", () => debCtl("start"));
4182
- const openUi = () => runOp("open", async () => { await openTerm(); });
4183
- // 新机器(QEMU 后端)上 Docker 版 cicy-code 也跑在这台虚拟机里:关机/重启会把它一起停,先问一句。
4184
- const confirmVmDown = async () => {
4185
- let s = null; try { s = await window.cicy?.docker?.appStatus?.(); } catch {}
4186
- if (!(s && s.running && Number(s.port) === 8009)) return true;
4187
- return window.confirm(tr("debian.vmDownConfirm", "Docker 版 cicy-code(:8009)也跑在这台 Debian 虚拟机里,关机/重启会让它一起停(重启后自动恢复)。继续?"));
4188
- };
4189
- const enableAccel = () => {
4190
- if (!window.confirm(tr("debian.accelConfirm", "开启「Windows 虚拟机监控程序平台」(WHPX)需要管理员权限,开启后要重启电脑才生效。继续?"))) return;
4191
- runOp("accel", async () => {
4192
- const r = await debCtl("accel");
4193
- if (r.ok) toast.show({ id: "deb-op", status: "ok", ttl: 10000, message: tr("debian.accelDone", "已开启,重启电脑后 Debian 自动用硬件加速") });
4194
- return r.ok ? null : r;
4195
- });
4196
- };
4197
-
4198
- // 开机自启:装过的才自启;首页每次加载只跑一次。
4199
- useEffect(() => {
4200
- if (autoRan.current || !st) return;
4201
- autoRan.current = true;
4202
- if (auto && st.ok && st.installed && !st.running && !st.installing) startSilent();
4203
- }, [st, auto]); // eslint-disable-line react-hooks/exhaustive-deps
4204
-
4205
- const toggleAuto = () => {
4206
- const next = !auto; setAuto(next); setMenuOpen(false);
4207
- try { if (next) localStorage.removeItem(DEB_AUTO_KEY); else localStorage.setItem(DEB_AUTO_KEY, "off"); } catch {}
4208
- };
4209
- const toggleMenu = (e) => {
4210
- e.stopPropagation();
4211
- if (!menuOpen && kebabRef.current) {
4212
- const r = kebabRef.current.getBoundingClientRect();
4213
- const left = Math.max(8, Math.min(r.right - MENU_W, window.innerWidth - MENU_W - 8));
4214
- setMenuPos({ top: Math.round(r.bottom + 4), left: Math.round(left) });
4215
- }
4216
- setMenuOpen((v) => !v);
4217
- };
4218
- useEffect(() => {
4219
- if (!menuOpen) return;
4220
- const onDoc = (e) => { if (kebabRef.current?.contains(e.target) || menuRef.current?.contains(e.target)) return; setMenuOpen(false); };
4221
- const onKey = (e) => { if (e.key === "Escape") setMenuOpen(false); };
4222
- document.addEventListener("mousedown", onDoc); document.addEventListener("keydown", onKey);
4223
- return () => { document.removeEventListener("mousedown", onDoc); document.removeEventListener("keydown", onKey); };
4224
- }, [menuOpen]);
4225
-
4226
- if (typeof window !== "undefined" && !window.electronRPC) return null;
4227
- if (!dshIsWin()) return null; // QEMU 便携包目前只打了 Windows x64
4228
-
4229
- const running = !!st?.running, ready = !!st?.ready, installed = !!st?.installed;
4230
- const isBusy = !!busy;
4231
- const tone = ready ? "ok" : installed || st?.installing ? "warn" : "off";
4232
- const pct = st?.installing && st?.total ? Math.min(99, Math.round(st.bytes * 100 / st.total)) : null;
4233
- const ctaLabel = busy === "open" ? tr("docker.opening", "打开中…")
4234
- : busy === "install" || st?.installing ? tr("dsh.installingShort", "安装中…")
4235
- : busy === "start" || booting ? tr("dsh.startingShort", "启动中…")
4236
- : isBusy ? tr("docker.working", "处理中…")
4237
- : !st ? tr("docker.probing", "检测中…")
4238
- : ready ? tr("debian.openTerm", "打开终端")
4239
- : installed ? tr("docker.start", "启动")
4240
- : tr("dsh.install", "安装");
4241
- const onCta = () => {
4242
- if (isBusy || !st || booting) return;
4243
- if (ready) return openUi();
4244
- return runSetup(); // 未装 → 装;已装未跑 → 抽屉里启动 + 等终端
4245
- };
4246
- const accelText = st?.accel === "whpx" ? tr("debian.accelWhpxShort", "硬件加速") : st?.accel === "tcg" ? tr("debian.accelTcgShort", "软件模拟") : "";
4247
- const stateText = !st ? ""
4248
- : st.error === "no_node" ? tr("debian.stateNoNode", "未安装 · 约 390MB")
4249
- : st.error ? tr("dsh.stateNoNode", "未就绪:{{why}}", { why: debErr(st) })
4250
- : st.installing ? tr("debian.stateInstalling", "安装中 {{p}}", { p: pct != null ? pct + "%" : "…" })
4251
- : ready ? tr("debian.stateReady", "运行中 · {{a}} · {{m}}G 内存", { a: accelText, m: Math.round(st.mem / 1024) })
4252
- : running ? (st.boot || tr("debian.stateBooting", "开机中…"))
4253
- : st.installError && !installed ? tr("debian.stateFailed", "上次安装失败:{{why}}", { why: st.installError })
4254
- : installed ? tr("dsh.stateStopped", "已安装,未运行")
4255
- : tr("debian.stateMissing", "未安装 · 约 390MB");
4256
-
4257
- return (
4258
- <div data-id="DebianCard" className={`bcard bcard--debian${ready ? " bcard--online" : ""}`}>
4259
- <div className="bcard__accent" />
4260
- <div className="bcard__top">
4261
- <div className="bcard__pill" style={{ color: DEB_RED }}>
4262
- <span className="bcard__dot" data-tone={tone} />
4263
- <DebianIcon />
4264
- </div>
4265
- {installed && (
4266
- <div className="bcard__menuwrap" onClick={(e) => e.stopPropagation()}>
4267
- <button type="button" ref={kebabRef} data-id="DebianCard-menu-btn" className="bcard__kebab" title={tr("debian.manage", "管理 Debian")} disabled={isBusy} onClick={toggleMenu}>
4268
- {isBusy ? <Spinner /> : <KebabIcon />}
4269
- </button>
4270
- {menuOpen && createPortal(
4271
- <div className="bcard__menu bcard__menu--portal" data-id="DebianCard-menu" role="menu" ref={menuRef}
4272
- style={{ position: "fixed", top: menuPos.top, left: menuPos.left, width: MENU_W }}
4273
- onClick={(e) => e.stopPropagation()}>
4274
- {running && (
4275
- <button type="button" data-id="DebianCard-restart" className="bcard__menu-item is-accent"
4276
- onClick={async () => { if (await confirmVmDown()) runOp("start", async () => { await debCtl("stop"); return debCtl("start"); }, tr("debian.restarted", "已重启,稍等终端起来")); }}>
4277
- {tr("debian.restart", "重启虚拟机")}
4278
- </button>
4279
- )}
4280
- {running && (
4281
- <button type="button" data-id="DebianCard-stop" className="bcard__menu-item is-danger"
4282
- onClick={async () => { if (await confirmVmDown()) runOp("stop", () => debCtl("stop"), tr("debian.stopped", "已关机")); }}>
4283
- {tr("debian.stop", "关机")}
4284
- </button>
4285
- )}
4286
- {(st?.accel === "tcg" || !st?.whpxFeature) && (
4287
- <button type="button" data-id="DebianCard-accel" className="bcard__menu-item"
4288
- title={tr("debian.accelHint", "开启 Windows 虚拟机监控程序平台(要管理员 + 重启)")} onClick={enableAccel}>
4289
- {tr("debian.accel", "开启硬件加速")}
4290
- </button>
4291
- )}
4292
- <div className="bcard__menu-sep" role="separator" aria-hidden />
4293
- <button type="button" data-id="DebianCard-auto" className="bcard__menu-item" onClick={toggleAuto}>
4294
- {auto ? tr("dsh.autoOn", "✓ 开机自动启动") : tr("dsh.autoOff", "开机自动启动:关")}
4295
- </button>
4296
- </div>,
4297
- document.body
4298
- )}
4299
- </div>
4300
- )}
4301
- </div>
4302
- <div className="bcard__body">
4303
- <div style={{ height: 28, display: "flex", alignItems: "center", gap: 8 }}>
4304
- <h3 className="bcard__name" title="Debian 13" style={{ margin: 0, flex: 1, minWidth: 0, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>Debian 13</h3>
4305
- </div>
4306
- <div className="bcard__meta">
4307
- <span className="bcard__chip">Linux</span>
4308
- <span className="bcard__ver" style={{ marginLeft: 8, fontSize: 11, opacity: 0.6 }}>QEMU</span>
4309
- </div>
4310
- {stateText && <div data-id="DebianCard-state" title={stateText} style={{ marginTop: 6, fontSize: 12, color: "#9aa4b2", whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" }}>{stateText}</div>}
4311
- </div>
4312
- <button type="button" className="bcard__cta" data-id="DebianCard-cta" disabled={isBusy || !st || booting || !!st?.installing} onClick={onCta}
4313
- style={!ready ? { background: DEB_RED, color: "white" } : undefined}>
4314
- {isBusy || booting ? <Spinner /> : <ArrowIcon />}
4315
- <span>{ctaLabel}</span>
4316
- </button>
4317
- </div>
4318
- );
4319
- }
4320
-
4321
4015
  // Docker-版 cicy-code card (Windows only): a SECOND cicy-code instance running
4322
4016
  // in Docker on :8008, alongside the native local daemon (:8008). If Docker
4323
4017
  // Desktop is missing, the install flow downloads its installer to the user's
4324
4018
  // Desktop and runs it, streaming progress through the drawer above.
4019
+ // 本机 cicy-code(WSL 或 QEMU 里的 Docker 容器)的团队名:2026-10-21 起统一叫「本机团队」。
4020
+ const LOCAL_TEAM_NAME = "本机团队";
4021
+ const isDefaultLocalTeamTitle = (t) => !t || /^\s*docker\s*(团队|team)?\s*(:\s*\d+)?\s*$/i.test(String(t));
4022
+
4023
+ // QEMU 机器(本机团队在 :8009,跑在 Debian 虚拟机里)的虚拟机操作:跑 desktop(2.1.368+)写好的
4024
+ // ~/cicy-ai/db/qemu-vm-ctl.js(源码 src/sidecar/qemu-vm.cjs),node 用 dsh 同款找法。只打一行 JSON。
4025
+ async function vmCtl(op) {
4026
+ const env = await dshEnv();
4027
+ if (!env.node || !env.home) return { ok: false, error: "no_node" };
4028
+ const r = await dshShell(`"${env.node}" "${env.home}\\cicy-ai\\db\\qemu-vm-ctl.js" ${op}`);
4029
+ const m = String(r.stdout || "").trim().match(/\{[\s\S]*\}$/);
4030
+ if (m) { try { return JSON.parse(m[0]); } catch {} }
4031
+ return { ok: false, error: "ctl_no_output", detail: (r.stderr || r.stdout || "").trim().slice(-300) };
4032
+ }
4033
+
4325
4034
  function DockerCard({ dockerTeam, cloudTitle, cloudCode, onOpen, onRename, onRefresh }) {
4326
4035
  const [status, setStatus] = useState(null);
4327
4036
  const [busy, setBusy] = useState(""); // "" | bootstrap | restart | stop | upgrade | probe
@@ -4336,8 +4045,21 @@ function DockerCard({ dockerTeam, cloudTitle, cloudCode, onOpen, onRename, onRef
4336
4045
  const [editing, setEditing] = useState(false);
4337
4046
  const [draft, setDraft] = useState("");
4338
4047
  // 标题 = 云端 team 的 title(和其它团队同一套;refreshCloudTeams 周期刷新 → 自动跟随
4339
- // 云端改名)。还没建好云端 team 时回退 "Docker 团队"。
4340
- const displayName = cloudTitle || "Docker 团队";
4048
+ // 云端改名)。没建好云端 team、或标题还是系统默认名(老的「Docker 团队」/ 云端缺省「Docker :<port>」)
4049
+ // 时显示「本机团队」;用户自己改过的名字原样显示。
4050
+ const displayName = isDefaultLocalTeamTitle(cloudTitle) ? LOCAL_TEAM_NAME : cloudTitle;
4051
+ // 本地团队节点(teams.json)里的名字还是默认名 → 一次性改成「本机团队」。tab 标题取的是这个名字;
4052
+ // localTeams.update 会同时刷新已打开的 tab 标题并把名字同步到云端。addTeam 再次注册时保留已有
4053
+ // 名字,所以改一次就稳定。用户自己起的名字不碰。
4054
+ const renamedRef = useRef(false);
4055
+ useEffect(() => {
4056
+ if (renamedRef.current || !dockerTeam?.id || !isDefaultLocalTeamTitle(dockerTeam.name)) return;
4057
+ if (!isDefaultLocalTeamTitle(cloudTitle)) return; // 云端已有用户起的名字 → 以它为准,不覆盖
4058
+ renamedRef.current = true;
4059
+ Promise.resolve(window.cicy?.localTeams?.update?.(dockerTeam.id, { name: LOCAL_TEAM_NAME }))
4060
+ .then((r) => { if (r?.ok) onRefresh?.(); })
4061
+ .catch((e) => console.warn("[DockerCard] rename to 本机团队", e));
4062
+ }, [dockerTeam?.id, dockerTeam?.name, cloudTitle, onRefresh]);
4341
4063
  const startEdit = (e) => { e?.stopPropagation?.(); setDraft(displayName); setEditing(true); };
4342
4064
  const commitName = async () => {
4343
4065
  setEditing(false);
@@ -4520,7 +4242,7 @@ function DockerCard({ dockerTeam, cloudTitle, cloudCode, onOpen, onRename, onRef
4520
4242
  // update() 返回时 :8008 已健康(waitUntil probeHealth)。立刻:① reload 已打开的
4521
4243
  // docker tab(reloadIgnoringCache,拿新版 SPA)② 强制重探,卡片版本马上更新(不等
4522
4244
  // 60s reconcile / 缓存)。
4523
- try { window.cicy?.tabs?.reloadIfOpen?.(dockerAppUrl(), tr("docker.teamTab", "Docker 团队")); } catch {}
4245
+ try { window.cicy?.tabs?.reloadIfOpen?.(dockerAppUrl(), LOCAL_TEAM_NAME); } catch {}
4524
4246
  try { const s = await window.cicy?.docker?.appRedetect?.(); if (s) setStatus(s); } catch {}
4525
4247
  }
4526
4248
  } catch (e) {
@@ -4532,6 +4254,27 @@ function DockerCard({ dockerTeam, cloudTitle, cloudCode, onOpen, onRename, onRef
4532
4254
  }, [checkStatus, onRefresh]);
4533
4255
 
4534
4256
  // Restart / stop: quick lifecycle ops with a toast (no full drawer needed).
4257
+ // QEMU 机器:菜单打开时顺手查一下虚拟机(加速方式),决定要不要显示「开启硬件加速」。
4258
+ const isQemu = Number(status?.port) === 8009;
4259
+ const [vmSt, setVmSt] = useState(null);
4260
+ useEffect(() => { if (menuOpen && isQemu) vmCtl("status").then(setVmSt).catch(() => {}); }, [menuOpen, isQemu]);
4261
+ const openVmTerminal = async () => {
4262
+ setMenuOpen(false);
4263
+ const r = await vmCtl("open");
4264
+ if (!r.ok) { toast.show({ id: "docker-op", status: "error", ttl: 6000, message: tr("docker.vmTermNotReady", "虚拟机终端还没就绪,稍等再试") }); return; }
4265
+ await window.cicy?.tabs?.open?.(r.url, tr("docker.vmTermTab", "Debian 终端"), "", true);
4266
+ };
4267
+ const enableAccel = async () => {
4268
+ setMenuOpen(false);
4269
+ if (!window.confirm(tr("docker.accelConfirm", "开启「Windows 虚拟机监控程序平台」(WHPX)需要管理员权限,开启后要重启电脑才生效。继续?"))) return;
4270
+ setBusy("accel");
4271
+ try {
4272
+ const r = await vmCtl("accel");
4273
+ toast.show({ id: "docker-op", status: r.ok ? "done" : "error", ttl: r.ok ? 10000 : 6000,
4274
+ message: r.ok ? tr("docker.accelDone", "已开启,重启电脑后虚拟机自动用硬件加速") : (r.error || tr("docker.opFailed", "操作失败")) });
4275
+ } finally { setBusy(""); }
4276
+ };
4277
+
4535
4278
  const runOp = useCallback(async (op, fn, okMsg) => {
4536
4279
  setMenuOpen(false); setBusy(op);
4537
4280
  toast.show({ id: "docker-op", message: tr(`docker.${op}ing`, op === "restart" ? "重启中…" : op === "reload" ? "刷新中…" : "停止中…"), status: "running" });
@@ -4709,17 +4452,33 @@ function DockerCard({ dockerTeam, cloudTitle, cloudCode, onOpen, onRename, onRef
4709
4452
  </button>
4710
4453
  {/* 常用 */}
4711
4454
  <button type="button" data-id="DockerCard-reload" className="bcard__menu-item"
4712
- onClick={(e) => { e.stopPropagation(); setMenuOpen(false); window.cicy?.tabs?.reloadIfOpen?.(dockerAppUrl(), "Docker 团队"); }}>
4455
+ onClick={(e) => { e.stopPropagation(); setMenuOpen(false); window.cicy?.tabs?.reloadIfOpen?.(dockerAppUrl(), LOCAL_TEAM_NAME); }}>
4713
4456
  {tr("docker.reloadWindow", "刷新窗口")}
4714
4457
  </button>
4715
- <button type="button" data-id="DockerCard-open-dir" className="bcard__menu-item"
4716
- onClick={(e) => { e.stopPropagation(); setMenuOpen(false); window.cicy?.docker?.openDir?.(); }}>
4717
- {tr("docker.openWslDir", "打开 WSL 目录")}
4718
- </button>
4719
- <button type="button" data-id="DockerCard-open-projects" className="bcard__menu-item"
4720
- onClick={(e) => { e.stopPropagation(); setMenuOpen(false); window.cicy?.docker?.openDir?.("projects"); }}>
4721
- {tr("docker.openProjectsDir", "打开项目目录")}
4722
- </button>
4458
+ {/* QEMU 机器:没有宿主共享目录(WSL/项目目录打不开),换成虚拟机的终端 + 硬件加速 */}
4459
+ {isQemu ? (<>
4460
+ <button type="button" data-id="DockerCard-vm-terminal" className="bcard__menu-item"
4461
+ title={tr("docker.vmTermHint", "本机团队所在的 Debian 虚拟机的命令行(用户 cicy,sudo 免密;sudo docker ps 可看到容器)")}
4462
+ onClick={(e) => { e.stopPropagation(); openVmTerminal(); }}>
4463
+ {tr("docker.vmTerm", "打开终端")}
4464
+ </button>
4465
+ {!(vmSt && vmSt.accel === "whpx") && (
4466
+ <button type="button" data-id="DockerCard-vm-accel" className="bcard__menu-item"
4467
+ title={tr("docker.accelHint", "开启 Windows 虚拟机监控程序平台(要管理员 + 重启)")}
4468
+ onClick={(e) => { e.stopPropagation(); enableAccel(); }}>
4469
+ {tr("docker.accel", "开启硬件加速")}
4470
+ </button>
4471
+ )}
4472
+ </>) : (<>
4473
+ <button type="button" data-id="DockerCard-open-dir" className="bcard__menu-item"
4474
+ onClick={(e) => { e.stopPropagation(); setMenuOpen(false); window.cicy?.docker?.openDir?.(); }}>
4475
+ {tr("docker.openWslDir", "打开 WSL 目录")}
4476
+ </button>
4477
+ <button type="button" data-id="DockerCard-open-projects" className="bcard__menu-item"
4478
+ onClick={(e) => { e.stopPropagation(); setMenuOpen(false); window.cicy?.docker?.openDir?.("projects"); }}>
4479
+ {tr("docker.openProjectsDir", "打开项目目录")}
4480
+ </button>
4481
+ </>)}
4723
4482
  <button type="button" data-id="DockerCard-dood" className="bcard__menu-item"
4724
4483
  title={tr("dood.hint", "把宿主 Docker + docker 客户端挂进容器,容器内 agent 能直接跑 docker(切换会重建容器,秒生效、无需下载)")}
4725
4484
  onClick={(e) => { e.stopPropagation(); setMenuOpen(false); setDoodOpen(true); }}>