@my-life-buddies/cli 0.17.6 → 0.18.0

package/dist/web/app.css

@@ -542,11 +542,11 @@ body[data-hosted-preview] .connection-detail-body dl > div { display:grid; grid-
 body[data-hosted-preview] .connection-detail-body dt { color:var(--color-muted); }
 body[data-hosted-preview] .connection-detail-body dd { margin:0; text-align:left; overflow-wrap:anywhere; }
 body[data-hosted-preview] .environment-note { padding:8px 0 0; margin-top:8px; border:0; border-top:1px solid var(--color-rule); }
-body[data-hosted-preview] #connect-instructions { padding:16px 20px; border-top:1px solid var(--color-rule); background:var(--color-paper); max-height:240px; overflow:auto; }
+body[data-hosted-preview] :is(#connect-instructions, #disconnect-result) { padding:16px 20px; border-top:1px solid var(--color-rule); background:var(--color-paper); max-height:240px; overflow:auto; }
 body[data-hosted-preview] .command-heading { display:flex; justify-content:space-between; align-items:center; gap:16px; }
 body[data-hosted-preview] .command-heading strong { font-size:13px; font-weight:600; }
-body[data-hosted-preview] #connect-instructions pre { padding:12px 14px; margin:12px 0 8px; white-space:pre-wrap; overflow-wrap:anywhere; border:1px solid var(--color-rule); border-radius:8px; background:var(--color-paper-raised); line-height:1.7; font-size:12px; }
-body[data-hosted-preview] #connect-instructions p { margin:0; color:var(--color-muted); font-size:12px; line-height:1.6; }
+body[data-hosted-preview] :is(#connect-instructions, #disconnect-result) pre { padding:12px 14px; margin:12px 0 8px; white-space:pre-wrap; overflow-wrap:anywhere; border:1px solid var(--color-rule); border-radius:8px; background:var(--color-paper-raised); line-height:1.7; font-size:12px; }
+body[data-hosted-preview] :is(#connect-instructions, #disconnect-result) p { margin:0; color:var(--color-muted); font-size:12px; line-height:1.6; }
 body[data-hosted-preview] .workspace { flex:1; min-height:0; grid-template-columns:minmax(350px,1fr) clamp(380px,43%,580px); overflow:hidden; }
 body[data-hosted-preview] .debugger { display:flex; flex-direction:column; min-height:0; overflow:hidden; background:var(--color-paper-raised); }
 body[data-hosted-preview] .hosted-page-heading { flex:none; padding:0 20px 20px; }
@@ -719,3 +719,6 @@ body[data-hosted-preview] .pairing-panel { top:80px; }
   .diagnostic-entry time { font-size:10px; }
   .diagnostic-source { display:none; }
 }
+
+body[data-hosted-preview] #disconnect-message { color:var(--color-ink); font-weight:600; margin-bottom:8px; }
+body[data-hosted-preview] #copy-stop-command { margin:8px 0; }

package/dist/web/app.js

@@ -5,6 +5,7 @@
   const hostedBuddyId = hosted ? new URL(location.href).searchParams.get("buddyId") : "";
   const connectionUrl = hosted ? new URL(`../api/buddies/${encodeURIComponent(hostedBuddyId)}/preview`, location.href) : undefined;
   let connectionInstance = "", connectionReady = !hosted, connectionBusy = false, devPollBusy = false;
+  let disconnectBusy = false, connectionEpoch = 0;
   let connectionChecked = false, connectionFailure = "", devAction = "";
   let eventSource, eventSourceInstance = "", liveEventsActive = false, pollingInterval = 0;
   function previewApiUrl(path) {
@@ -112,7 +113,7 @@
       },
     });
     const value = await response.json().catch(() => ({}));
-    if (hosted && (!connectionReady || instance !== connectionInstance)) throw Object.assign(new Error("本地连接已改变，请等待重新连接"), {status:409, code:"PREVIEW_CONNECTION_CHANGED"});
+    if (hosted && (disconnectBusy || !connectionReady || instance !== connectionInstance)) throw Object.assign(new Error("本地连接已改变，请等待重新连接"), {status:409, code:"PREVIEW_CONNECTION_CHANGED"});
     if (!response.ok) {
       const error = new Error((typeof value?.error === "string" ? value.error : value?.error?.message) || `请求失败（HTTP ${response.status}）`);
       error.code = value?.error?.code || "PREVIEW_REQUEST_FAILED";
@@ -256,7 +257,7 @@
     if (!elements.pairingPanel.hidden && pairingRevision !== state.dev.revision) void togglePairing(true);
     elements.connectionState.dataset.phase = phase;
     elements.connectionLabel.textContent = phase === "disconnected" ? "未连接本地工程" : phaseCopy(phase);
-    elements.devControl.disabled = !connectionReady || Boolean(devAction) || phase === "starting" || phase === "stopping";
+    elements.devControl.disabled = disconnectBusy || !connectionReady || Boolean(devAction) || phase === "starting" || phase === "stopping";
     elements.devControl.dataset.action = ["ready", "reloading", "reload_failed"].includes(phase) ? "stop" : "start";
     elements.devControl.textContent = devAction === "start" ? "正在启动…" : devAction === "stop" ? "正在停止…" : phase === "failed" ? "重试启动" : ["ready", "reloading", "reload_failed"].includes(phase) ? "停止 DEV" : phase === "starting" ? "正在启动…" : phase === "stopping" ? "正在停止…" : "启动 DEV";
     elements.environmentAgent.textContent = phase === "ready"
@@ -317,6 +318,9 @@
     $("#workbench-state-title").textContent = copy[0];
     $("#workbench-state-copy").textContent = copy[1];
     $("#connection-description").textContent = !connectionChecked ? "检查中" : phase === "disconnected" ? "等待连接" : "保存自动重载，可能中断回复；Widget 数据不自动迁移。";
+    $("#force-disconnect").hidden = !connectionInstance;
+    $("#force-disconnect").disabled = disconnectBusy;
+    $("#force-disconnect").textContent = disconnectBusy ? "正在断开…" : "强制断连";
     const connectButton = $("#get-connect-command");
     connectButton.className = `button ${connectionReady ? "button-secondary" : "button-primary"}`;
     connectButton.textContent = connectionReady ? "连接指令" : connectionInstance ? "重新连接" : "连接工程";
@@ -692,7 +696,7 @@
   }
 
   async function controlDev() {
-    if (!connectionReady || state.dev.phase === "starting" || state.dev.phase === "stopping") return;
+    if (disconnectBusy || !connectionReady || state.dev.phase === "starting" || state.dev.phase === "stopping") return;
     if (devAction) return;
     devAction = ["ready", "reloading", "reload_failed"].includes(state.dev.phase) ? "stop" : "start";
     elements.errorBanner.hidden = true;
@@ -712,7 +716,7 @@
   }
 
   function updateSendButton() {
-    const ready = connectionReady && !devAction && state.simulatorLoaded && state.dev.phase === "ready" && !state.resetting && !state.sending;
+    const ready = connectionReady && !disconnectBusy && !devAction && state.simulatorLoaded && state.dev.phase === "ready" && !state.resetting && !state.sending;
     elements.sendMessage.disabled = !ready || !elements.messageInput.value.trim();
   }
 
@@ -948,18 +952,23 @@
   }
 
   async function refreshConnection() {
-    if (connectionBusy) return;
+    if (connectionBusy || disconnectBusy) return;
     connectionBusy = true;
+    const epoch = connectionEpoch;
     try {
       const response = await fetch(connectionUrl, { signal: AbortSignal.timeout(5000) });
       const value = await response.json();
       if (!response.ok) throw new Error(value.error || "连接状态读取失败");
+      if (epoch !== connectionEpoch) return;
       connectionChecked = true; connectionFailure = "";
       $("#connect-command").textContent = value.command;
       $("#copy-connect-command").disabled = false;
-      if (!value.connected) { disconnected(); return; }
+      $("#stop-command").textContent = value.stopCommand || "buddy-cli dev stop";
+      if (value.projectRoot) $("#project-root").textContent = value.projectRoot;
+      if (value.machineName) $("#machine-name").textContent = value.machineName;
+      if (!value.connected) { connectionInstance = value.instanceId || ""; disconnected(); return; }
       const changed = connectionInstance !== value.instanceId;
-      if (changed) closeEvents();
+      if (changed) { closeEvents(); $("#disconnect-result").hidden = true; }
       const newlyConnected = !connectionReady || changed;
       connectionInstance = value.instanceId;
       connectionReady = true;
@@ -982,6 +991,7 @@
       }
       if (value.liveEvents) connectEvents();
     } catch (cause) {
+      if (epoch !== connectionEpoch) return;
       const message = cause.message || "连接已中断，正在重试…";
       connectionChecked = true; connectionFailure = message;
       disconnected(message);
@@ -990,8 +1000,31 @@
     finally { connectionBusy = false; }
   }
 
+  async function forceDisconnect() {
+    if (disconnectBusy || !connectionInstance) return;
+    if (!window.confirm("强制断开此工程并停止 DEV？若本机无法响应，需要在对应电脑的工程目录执行停止指令。")) return;
+    disconnectBusy = true; connectionEpoch++;
+    const url = previewApiUrl("/api/connection/disconnect");
+    closeEvents(); renderDev();
+    try {
+      const response = await fetch(url, { method: "POST", signal: AbortSignal.timeout(35_000) });
+      const value = await response.json();
+      if (!response.ok) throw new Error(value.error || "断连请求失败，请刷新状态后重试");
+      connectionInstance = "";
+      disconnected();
+      $("#disconnect-result").hidden = false;
+      $("#disconnect-message").textContent = value.localStopped
+        ? "已断开后台连接，并确认当前工程的本地 DEV 已停止。"
+        : "已断开后台连接，但无法确认本机 Runtime 已停止。请到原电脑的工程目录执行下面的停止指令。";
+    } catch (cause) {
+      $("#disconnect-result").hidden = false;
+      $("#disconnect-message").textContent = "尚未确认断连和停止结果，请检查终端或执行下面的停止指令，再刷新连接状态。";
+      showError(cause);
+    } finally { disconnectBusy = false; renderDev(); void refreshConnection(); }
+  }
+
   async function pollHostedDev() {
-    if (!connectionReady || devPollBusy) return;
+    if (!connectionReady || devPollBusy || disconnectBusy) return;
     devPollBusy = true;
     try {
       const [dev, debug] = await Promise.all([api("/api/dev"), api("/api/debug")]);
@@ -1017,13 +1050,18 @@
         engineeringDetails.querySelector("summary").focus();
       }
     });
+    $("#force-disconnect").addEventListener("click", () => void forceDisconnect());
+    $("#copy-stop-command").addEventListener("click", async () => {
+      try { await navigator.clipboard.writeText($("#stop-command").textContent); toast("停止指令已复制，请在原电脑的工程目录执行"); }
+      catch { showError(new Error("请手动复制停止指令")); }
+    });
     $("#get-connect-command").addEventListener("click", () => {
       $("#connect-instructions").hidden = !$("#connect-instructions").hidden;
       $("#get-connect-command").setAttribute("aria-expanded", String(!$("#connect-instructions").hidden));
       void refreshConnection();
     });
     $("#copy-connect-command").addEventListener("click", async () => {
-      try { await navigator.clipboard.writeText($("#connect-command").textContent); toast("连接指令已复制，请在当前搭子的工程目录执行"); }
+      try { await navigator.clipboard.writeText($("#connect-command").textContent); toast("连接指令已复制，在工程目录执行后返回当前页面即可"); }
       catch { showError(new Error("请手动复制下方的完整连接指令")); }
     });
     const statusTimer = window.setInterval(() => void refreshConnection(), 2000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@my-life-buddies/cli",
-  "version": "0.17.6",
+  "version": "0.18.0",
   "type": "module",
   "description": "搭搭 Developer Platform 命令行工具",
   "publishConfig": {
@@ -39,7 +39,7 @@
     "ws": "8.21.3"
   },
   "devDependencies": {
-    "@buddy/cli-core": "0.17.6",
-    "@buddy/preview": "0.17.6"
+    "@buddy/cli-core": "0.18.0",
+    "@buddy/preview": "0.18.0"
   }
 }