agent-loft 0.2.33 → 0.2.35

package/web/css/terminal.css

@@ -0,0 +1,243 @@
+/* ---------- 终端（views/terminal.js） ---------- */
+
+/* 底部面板：在输入框下面，高度可拖动 */
+.term-dock {
+  --term-h: 38vh;
+  display: flex;
+  flex-direction: column;
+  height: var(--term-h);
+  min-height: 120px;
+  flex-shrink: 0;
+  border-top: 1px solid var(--border);
+  background: var(--bg);
+  position: relative;
+  z-index: 6;
+}
+
+.term-dock[hidden] {
+  display: none;
+}
+
+.term-resizer {
+  position: absolute;
+  top: -3px;
+  left: 0;
+  right: 0;
+  height: 6px;
+  cursor: row-resize;
+  z-index: 1;
+}
+
+body.resizing-v {
+  cursor: row-resize;
+  user-select: none;
+}
+
+.term-head {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  padding: 4px 8px 0;
+  min-height: 36px;
+}
+
+.term-head .grow {
+  flex: 1;
+}
+
+.term-act {
+  width: 30px;
+  height: 30px;
+}
+
+.term-act[hidden] {
+  display: none;
+}
+
+.term-act svg {
+  width: 16px;
+  height: 16px;
+}
+
+.term-tabs {
+  display: flex;
+  gap: 2px;
+  min-width: 0;
+  overflow-x: auto;
+  scrollbar-width: none;
+}
+
+.term-tab {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  max-width: 200px;
+  padding: 5px 6px 5px 10px;
+  border-radius: 7px;
+  font-size: 13px;
+  color: var(--fg-soft);
+  cursor: pointer;
+  white-space: nowrap;
+  flex-shrink: 0;
+}
+
+.term-tab:hover {
+  background: var(--bg-hover);
+}
+
+.term-tab.on {
+  background: var(--bg-soft);
+  color: var(--fg);
+}
+
+.term-tab.ended .term-tab-name {
+  text-decoration: line-through;
+  color: var(--fg-faint);
+}
+
+.term-tab-name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.term-tab-x {
+  display: grid;
+  place-items: center;
+  width: 18px;
+  height: 18px;
+  padding: 0;
+  border: none;
+  border-radius: 4px;
+  background: transparent;
+  color: inherit;
+  opacity: 0;
+  cursor: pointer;
+}
+
+.term-tab-x svg {
+  width: 12px;
+  height: 12px;
+}
+
+.term-tab:hover .term-tab-x,
+.term-tab.on .term-tab-x {
+  opacity: 0.7;
+}
+
+/* 触屏上没有悬停：× 一直显示 */
+@media (hover: none) {
+  .term-tab .term-tab-x {
+    opacity: 0.7;
+  }
+}
+
+.term-tab-x:hover {
+  opacity: 1;
+  background: var(--bg-hover);
+}
+
+.term-panes {
+  flex: 1;
+  min-height: 0;
+  position: relative;
+  padding: 4px 4px 4px 10px;
+}
+
+.term-pane {
+  position: absolute;
+  inset: 4px 4px 4px 10px;
+}
+
+.term-pane[hidden] {
+  display: none;
+}
+
+.term-pane .xterm {
+  height: 100%;
+}
+
+.term-pane .xterm-viewport {
+  background: transparent !important;
+}
+
+.term-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 12px;
+  height: 100%;
+  padding: 16px;
+  text-align: center;
+}
+
+/* 手机上的快捷键行 */
+.term-keys {
+  display: flex;
+  gap: 6px;
+  padding: 6px 8px calc(6px + env(safe-area-inset-bottom));
+  overflow-x: auto;
+  scrollbar-width: none;
+  border-top: 1px solid var(--border);
+}
+
+.term-key {
+  flex-shrink: 0;
+  min-width: 40px;
+  height: 34px;
+  padding: 0 10px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-soft);
+  color: var(--fg);
+  font: 14px var(--mono);
+}
+
+.term-key.on {
+  background: var(--accent);
+  border-color: var(--accent);
+  color: var(--accent-fg);
+}
+
+/* 放在远程控制页里：占满那一块，不能拖高度 */
+.term-dock.embedded {
+  flex: 1;
+  height: auto;
+  min-height: 0;
+  border-top: none;
+}
+
+.term-dock.embedded .term-resizer {
+  display: none;
+}
+
+/* 手机上长按选了字：上面一条「复制 / 全选 / 取消」（views/terminal-touch.js） */
+.term-selbar {
+  position: absolute;
+  top: 6px;
+  right: 6px;
+  z-index: 5;
+  display: flex;
+  gap: 1px;
+  border-radius: 10px;
+  overflow: hidden;
+  box-shadow: var(--shadow);
+  background: var(--border);
+}
+
+.term-selbar[hidden] {
+  display: none;
+}
+
+.term-selbar button {
+  padding: 8px 14px;
+  border: none;
+  background: var(--bg-input);
+  color: var(--fg);
+  font: 14px var(--font);
+}
+
+/* 手指翻历史时别让浏览器去滚页面 */
+.term-pane {
+  touch-action: none;
+}

package/web/index.html

@@ -26,6 +26,8 @@
     <link rel="stylesheet" href="/css/schedule.css" />
     <link rel="stylesheet" href="/css/tasks.css" />
     <link rel="stylesheet" href="/css/skills.css" />
+    <link rel="stylesheet" href="/css/terminal.css" />
+    <link rel="stylesheet" href="/css/remote.css" />
     <link rel="stylesheet" href="/css/mobile.css" />
   </head>
   <body>

package/web/lib/dom.js

@@ -46,6 +46,19 @@ export const ICON = {
   trash: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6h18"/><path d="M8 6V4h8v2"/><path d="M19 6l-1 14H6L5 6"/><path d="M10 11v6M14 11v6"/></svg>',
   folder: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M3 7.5A2.5 2.5 0 0 1 5.5 5h3.6l2 2.2h7.4A2.5 2.5 0 0 1 21 9.7v7.8a2.5 2.5 0 0 1-2.5 2.5h-13A2.5 2.5 0 0 1 3 17.5Z"/><path d="M3 10h18"/></svg>',
   folderOpen: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M3 17.5V7.5A2.5 2.5 0 0 1 5.5 5h3.6l2 2.2h6.4A2.5 2.5 0 0 1 20 9.7V11"/><path d="M3 17.5 5.6 12a2 2 0 0 1 1.8-1.1h13a1 1 0 0 1 .9 1.4l-2.4 6.2a2.2 2.2 0 0 1-2 1.5H5.5A2.5 2.5 0 0 1 3 17.5Z"/></svg>',
+  terminal: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="4" width="18" height="16" rx="2"/><path d="m7 9 3 3-3 3M13 15h4"/></svg>',
+  monitor: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>',
+  keyboard: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="5" width="20" height="14" rx="2"/><path d="M6 9h.01M10 9h.01M14 9h.01M18 9h.01M6 13h.01M18 13h.01M10 13h4M7 16h10"/></svg>',
+  clipboard: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="8" y="2" width="8" height="4" rx="1"/><path d="M16 4h2a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2"/></svg>',
+  command: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 6v12a3 3 0 1 0 3-3H6a3 3 0 1 0 3 3V6a3 3 0 1 0-3 3h12a3 3 0 1 0-3-3"/></svg>',
+  eye: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 12s3.6-7 10-7 10 7 10 7-3.6 7-10 7S2 12 2 12Z"/><circle cx="12" cy="12" r="3"/></svg>',
+  expand: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M8 3H5a2 2 0 0 0-2 2v3M21 8V5a2 2 0 0 0-2-2h-3M3 16v3a2 2 0 0 0 2 2h3M16 21h3a2 2 0 0 0 2-2v-3"/></svg>',
+  power: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 2v10"/><path d="M18.4 6.6a9 9 0 1 1-12.8 0"/></svg>',
+  pointer: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M5 3l14 7-6 2-2 6Z"/></svg>',
+  hand: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 11V5a1.5 1.5 0 0 1 3 0v5"/><path d="M12 10V4a1.5 1.5 0 0 1 3 0v6"/><path d="M15 10V6a1.5 1.5 0 0 1 3 0v8a7 7 0 0 1-7 7h-.5a6 6 0 0 1-4.6-2.2L3.4 15a1.6 1.6 0 0 1 2.4-2.1L9 15.5V11"/></svg>',
+  help: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="9"/><path d="M9.5 9.2a2.6 2.6 0 0 1 5 .9c0 1.7-2.5 2.3-2.5 3.9M12 17h.01"/></svg>',
+  maximize: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h6v6M9 21H3v-6M21 3l-7 7M3 21l7-7"/></svg>',
+  restore: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 14h6v6M20 10h-6V4M14 10l7-7M3 21l7-7"/></svg>',
   laptop: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="5" width="16" height="11" rx="1.5"/><path d="M2 19h20"/></svg>',
   logo: '<svg viewBox="0 0 48 48" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M17.5 8.5a8 8 0 0 1 13.2 0 8 8 0 0 1 9 9.4 8 8 0 0 1 0 12.2 8 8 0 0 1-9 9.4 8 8 0 0 1-13.2 0 8 8 0 0 1-9-9.4 8 8 0 0 1 0-12.2 8 8 0 0 1 9-9.4Z"/><path d="m17 18 5 5-5 5M25 30h7"/></svg>',
   feishu:

package/web/lib/ws.js

@@ -98,7 +98,8 @@ export const WS = {
    */
   presence() {
     const visible = document.visibilityState === "visible" && document.hasFocus() && Date.now() - lastInput < IDLE_MS;
-    this.raw({ t: "presence", visible, key: S.current ?? "" });
+    // 在定时任务、远程控制页上：没在看哪条对话（远程控制页不清 S.current，回来时对话还在）
+    this.raw({ t: "presence", visible, key: S.view ? "" : (S.current ?? "") });
   },
 };
 
@@ -241,6 +242,10 @@ function onWsMessage(msg) {
       // 自己的定时任务变了：定时任务页开着的话会去重新拉（views/tasks.js）
       document.dispatchEvent(new Event("aim:tasks"));
       return;
+    case "remote":
+      // 自己的终端开了 / 关了，或者远程控制的权限、设置变了：重新问一下（views/layout.js）
+      document.dispatchEvent(new Event("aim:remote"));
+      return;
     case "skills":
       // 技能变了：设置里的技能页开着就重新拉，@ 补全的缓存作废
       document.dispatchEvent(new Event("aim:skills"));

package/web/settings/general.js

@@ -98,6 +98,102 @@ export function generalTab(cfg, panel) {
         ),
       ),
     ),
+    remoteSection(cfg),
+  );
+}
+
+/** 远程控制：终端、桌面各自的开关，没人连着多久结束，桌面从哪来。成员能不能用在「用户」里一个个开 */
+function remoteSection(cfg) {
+  const r = cfg.remote ?? {};
+  const termOn = h("input", { type: "checkbox", checked: r.terminal !== false });
+  const deskOn = h("input", { type: "checkbox", checked: r.desktop !== false });
+  const keep = h("input", { type: "number", min: 1, max: 1440, value: r.keepAliveMin ?? 30 });
+  const source = h(
+    "select",
+    {},
+    h("option", { value: "auto" }, "共享这台机器当前的桌面（Linux，用 x11vnc）"),
+    h("option", { value: "vnc" }, "连已有的 VNC 服务（macOS 屏幕共享等）"),
+  );
+  source.value = r.desktopSource ?? "auto";
+  const display = h("input", { value: r.display ?? "", placeholder: "留空自动找，如 :0", autocapitalize: "off", spellcheck: "false" });
+  const host = h("input", { value: r.vncHost ?? "127.0.0.1", autocapitalize: "off", spellcheck: "false" });
+  const port = h("input", { type: "number", min: 1, max: 65535, value: r.vncPort ?? 5900 });
+  const password = h("input", { type: "password", value: r.vncPassword ?? "", autocomplete: "new-password", placeholder: "VNC 密码" });
+  const autoBox = h("div", { class: "field-group" }, field("X 显示", display, "一台机器上有好几个桌面（比如登录界面 :0、登录后的桌面 :1）时可以指定"));
+  const vncBox = h(
+    "div",
+    { class: "field-group" },
+    field("地址", host),
+    field("端口", port),
+    field(
+      "密码",
+      password,
+      "macOS：屏幕共享 →「电脑设置…」里勾选「VNC 显示程序可以使用密码控制屏幕」并设这个密码。开通了远程控制的成员连桌面时，页面会拿到这个密码",
+    ),
+  );
+  const sync = () => {
+    autoBox.hidden = source.value !== "auto";
+    vncBox.hidden = source.value !== "vnc";
+  };
+  source.addEventListener("change", sync);
+  sync();
+  // 终端、桌面用不了时的原因（没装 node-pty、没有图形桌面、没装 x11vnc…）
+  const status = h("div", { class: "error-text", hidden: true });
+  const loadStatus = () =>
+    api("/api/remote").then(
+      (st) => {
+        const lines = [
+          st.terminal.available ? null : `终端：${st.terminal.reason ?? "用不了"}`,
+          st.desktop.available ? null : `桌面：${st.desktop.reason ?? "这台机器没有桌面"}（远程控制里只有终端）`,
+        ].filter(Boolean);
+        fill(status, lines.map((l, i) => [i ? h("br") : null, l]));
+        status.hidden = !lines.length;
+      },
+      () => {},
+    );
+  void loadStatus();
+  return h(
+    "div",
+    { class: "section" },
+    h("h4", {}, "远程控制"),
+    h(
+      "div",
+      { class: "muted" },
+      "侧栏「远程控制」里直接操作这台机器的桌面和终端，切回对话时连接留在后台。以运行 agent-loft 的系统用户执行，没有授权卡。管理员能用；成员要在「用户」里单独开通。",
+    ),
+    status,
+    h("label", { class: "check" }, termOn, "网页终端"),
+    h("label", { class: "check" }, deskOn, "远程桌面"),
+    field("桌面来源", source),
+    autoBox,
+    vncBox,
+    field("没有页面连着多久后结束（分钟）", keep, "关掉页面、断线后 shell 继续运行，重新打开能接着用；共享桌面用的 x11vnc 也是这么久没人连就停掉"),
+    h(
+      "div",
+      { class: "row" },
+      h(
+        "button",
+        {
+          class: "btn primary",
+          onclick: async () => {
+            const ok = await saveConfig(cfg, {
+              remote: {
+                terminal: termOn.checked,
+                desktop: deskOn.checked,
+                keepAliveMin: Number(keep.value),
+                desktopSource: source.value,
+                display: display.value.trim(),
+                vncHost: host.value.trim(),
+                vncPort: Number(port.value),
+                vncPassword: password.value,
+              },
+            });
+            if (ok) void loadStatus();
+          },
+        },
+        "保存",
+      ),
+    ),
   );
 }
 

package/web/settings/index.js

@@ -10,6 +10,7 @@ import { feishuTab } from "./feishu.js";
 import { authTab, securityTab } from "./security.js";
 import { memoryTab } from "./memory.js";
 import { skillsTab } from "./skills.js";
+import { usageTab } from "./usage.js";
 import { systemTab, usersTab } from "./users.js";
 
 // ---------- 设置 ----------
@@ -20,11 +21,12 @@ export async function openSettings(tab) {
   const panel = h("div", { class: "settings-body" });
   // 设置弹窗高度固定，切标签页时不跟着内容一伸一缩
   modal({ title: "设置", wide: true, tall: true, body: h("div", { class: "settings" }, nav, panel) });
-  // 普通成员只能管自己的通知、密码和登录设备；其余设置都是管理员的
+  // 普通成员只能管自己的记忆、技能、用量、通知、密码和登录设备；其余设置都是管理员的
   if (!isAdmin()) {
     const tabs = [
       ["记忆", () => memoryTab(panel)],
       ["技能", () => skillsTab(panel)],
+      ["用量", () => usageTab(panel)],
       ["通知", () => notifyTab(panel)],
       ["账号", () => securityTab(panel)],
     ];
@@ -52,6 +54,7 @@ export async function openSettings(tab) {
     ["飞书机器人", () => feishuTab(cfg, panel)],
     ["授权", () => authTab(panel)],
     ["记忆", () => memoryTab(panel)],
+    ["用量", () => usageTab(panel)],
     ["通知", () => notifyTab(panel)],
     ["账号", () => securityTab(panel)],
     ["用户", () => usersTab(panel)],