@michengai/dsh-automation 0.1.10 → 0.1.11

package/docs/01-/345/275/223/345/211/215/345/267/245/344/275/234/I001-/344/273/273/345/212/241/350/207/252/345/212/250/345/214/226/346/217/222/344/273/266/00-/350/277/255/344/273/243/346/200/273/350/247/210.md

@@ -17,7 +17,7 @@
 - [x] 原生侧栏定时页签：包裹官方任务树，不依赖 dsh-codex-ui
 - [x] 单测与包契约
 - [x] 定时侧栏会话菜单互斥，避免点第二条时与第一条重叠
-- [x] 新建弹窗工作区改为官方目录选择，点旁边不关闭
+- [x] 新建弹窗只允许选择 Host 已注册工作区，新增目录统一从 Host 工作区入口完成
 - [x] 修复任务树过滤导致的 Loading plugins / 点任务卡死
 - [x] 会话创建定时任务按官方审批策略分流，并补系统提示避免走 crontab
 - [x] 工作区标题栏对齐官方位置与搜索点击
@@ -36,7 +36,7 @@
 
 ## 已完成内容
 
-仓库内已落地 Host 插件、Web 客户端、原生侧栏定时页签、文档和单测。定时会话更多菜单改为列表级互斥，并用固定定位弹出，避免两条菜单叠在一起。新建弹窗添加工作区改为和 Chat 一样的目录选择，点遮罩不再关闭。
+仓库内已落地 Host 插件、Web 客户端、原生侧栏定时页签、文档和单测。定时会话更多菜单改为列表级互斥，并用固定定位弹出，避免两条菜单叠在一起。新建弹窗只消费 Host 已注册工作区，避免插件 RPC 自行扩大目录边界；点遮罩不再关闭。
 
 ## 待处理事项
 

package/lib/client.js

@@ -193,19 +193,13 @@ function groupHistory(runs, range, now, t) {
     const at = new Date(run.finishedAt ?? run.startedAt ?? run.scheduledFor);
     if (Number.isNaN(at.getTime())) continue;
     let key;
-    let label;
     if (range === "month") {
       key = `${at.getFullYear()}-${String(at.getMonth() + 1).padStart(2, "0")}`;
-      label = t("history.month", { month: `${at.getFullYear()}/${at.getMonth() + 1}` });
     } else if (range === "week") {
       const start = startOfWeek(at);
-      key = start.toISOString().slice(0, 10);
-      label = t("history.week", { date: `${start.getMonth() + 1}/${start.getDate()}` });
+      key = localDayKey(start);
     } else {
       key = localDayKey(at);
-      const today = localDayKey(now);
-      const yesterday = localDayKey(new Date(now.getTime() - 864e5));
-      label = key === today ? t("history.today") : key === yesterday ? t("history.yesterday") : t("history.date", { date: `${at.getMonth() + 1}/${at.getDate()}` });
     }
     const existing = buckets.get(key) ?? [];
     existing.push(run);
@@ -411,16 +405,6 @@ function permissionLabel(option, t) {
   return option.name || option.value;
 }
 
-// src/client/create-modal-logic.ts
-function shouldConfirmFullAccess(current, next) {
-  return current !== next && next === "danger-full-access";
-}
-async function adoptPickedWorkspace(input) {
-  const path = await input.pick();
-  if (path == null || path.trim() === "") return null;
-  return input.add(path.trim());
-}
-
 // src/client/menu.tsx
 var import_react = require("react");
 var import_react_dom = require("react-dom");
@@ -647,36 +631,17 @@ function CreateModal({
   draft,
   editing,
   onClose,
-  onSubmit,
-  onAddWorkspace,
-  pickWorkspaceDirectory
+  onSubmit
 }) {
   const [form, setForm] = (0, import_react2.useState)(() => ({ ...defaultFormState(/* @__PURE__ */ new Date(), workspaces, defaultModel, defaultPermission), ...draft }));
   const [validationError, setValidationError] = (0, import_react2.useState)();
-  const [confirmingPermission, setConfirmingPermission] = (0, import_react2.useState)();
-  const [fullAccessAcknowledged, setFullAccessAcknowledged] = (0, import_react2.useState)(false);
   const update = (patch) => {
     setForm((current) => ({ ...current, ...patch }));
     setValidationError(void 0);
   };
   const choosePermission = (permission) => {
-    if (shouldConfirmFullAccess(form.permission, permission)) {
-      setFullAccessAcknowledged(false);
-      setConfirmingPermission(permission);
-      return;
-    }
     update({ permission });
   };
-  const cancelFullAccessConfirmation = () => {
-    setFullAccessAcknowledged(false);
-    setConfirmingPermission(void 0);
-  };
-  const confirmFullAccess = () => {
-    if (!fullAccessAcknowledged) return;
-    if (confirmingPermission === void 0) return;
-    update({ permission: confirmingPermission });
-    cancelFullAccessConfirmation();
-  };
   (0, import_react2.useEffect)(() => {
     const onKey = (event) => {
       if (event.key !== "Escape") return;
@@ -819,30 +784,7 @@ function CreateModal({
                     onClick: () => update({ workspaceId: item.id })
                   },
                   item.id
-                )),
-                pickWorkspaceDirectory !== void 0 && onAddWorkspace !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "dsh-st-menu-split" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-                    MenuRow,
-                    {
-                      icon: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(PlusIcon, { width: 14, height: 14 }),
-                      label: t("form.addWorkspace"),
-                      onClick: () => {
-                        void (async () => {
-                          try {
-                            const id = await adoptPickedWorkspace({
-                              pick: pickWorkspaceDirectory,
-                              add: onAddWorkspace
-                            });
-                            if (id !== null) update({ workspaceId: id });
-                          } catch (caught) {
-                            setValidationError(caught instanceof Error ? caught.message : t("error.action"));
-                          }
-                        })();
-                      }
-                    }
-                  )
-                ] })
+                ))
               ] }),
               /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(MenuPanel, { ghost: true, up: true, label: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
                 /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(SparkleIcon, { width: 14, height: 14 }),
@@ -895,22 +837,7 @@ function CreateModal({
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("button", { type: "submit", className: "dsh-st-btn dsh-st-btn--primary", disabled: busy, children: t("modal.save") })
       ] })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "dsh-st-flyout-root", ref: setMenuHost }),
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-      import_dsh_client_ui_primitives.RiskConfirmation,
-      {
-        open: confirmingPermission !== void 0,
-        title: permissionT("confirm.title"),
-        description: permissionT("confirm.description"),
-        acknowledgeLabel: permissionT("confirm.acknowledge"),
-        cancelLabel: permissionT("confirm.cancel"),
-        confirmLabel: permissionT("confirm.enable"),
-        acknowledged: fullAccessAcknowledged,
-        onAcknowledgedChange: setFullAccessAcknowledged,
-        onCancel: cancelFullAccessConfirmation,
-        onConfirm: confirmFullAccess
-      }
-    )
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "dsh-st-flyout-root", ref: setMenuHost })
   ] }) });
 }
 function ModelPicker({
@@ -1157,6 +1084,7 @@ function unwrapRpcResult(value) {
 
 // src/client/runtime.ts
 var CHANNEL = "/dsh-automation";
+var POLL_INTERVAL_MS = 15e3;
 function isTransportError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return /failed to fetch|networkerror|load failed|network request failed/i.test(message);
@@ -1164,6 +1092,7 @@ function isTransportError(error) {
 function createAutomationRuntime(rpc) {
   let state = { phase: "idle" };
   let refreshPromise;
+  let pollTimer;
   const listeners2 = /* @__PURE__ */ new Set();
   const publish = (next) => {
     state = next;
@@ -1173,8 +1102,20 @@ function createAutomationRuntime(rpc) {
     getSnapshot: () => state,
     subscribe: (listener) => {
       listeners2.add(listener);
+      if (listeners2.size === 1) {
+        queueMicrotask(() => {
+          if (listeners2.size > 0) void refresh().catch(() => void 0);
+        });
+        pollTimer = setInterval(() => {
+          void refresh().catch(() => void 0);
+        }, POLL_INTERVAL_MS);
+      }
       return () => {
         listeners2.delete(listener);
+        if (listeners2.size === 0 && pollTimer !== void 0) {
+          clearInterval(pollTimer);
+          pollTimer = void 0;
+        }
       };
     }
   };
@@ -1274,25 +1215,18 @@ function createAutomationRuntime(rpc) {
           return rest;
         })
       }));
-    },
-    async addWorkspace(path) {
-      const payload = { sessionId: "settings", path };
-      const value = unwrapRpcResult(await rpc.call(CHANNEL, "add-workspace", payload));
-      await refresh();
-      return value;
     }
   };
 }
 
 // src/client/AutomationView.tsx
 var import_jsx_runtime4 = require("react/jsx-runtime");
-var POLL_INTERVAL_MS = 15e3;
 var EXAMPLES = [
   { name: "\u6BCF\u65E5\u56DE\u5F52\u68C0\u67E5", scheduleKind: "daily", time: "09:00", weekdays: [1, 2, 3, 4, 5] },
   { name: "\u6BCF\u5468\u4F9D\u8D56\u5DE1\u68C0", scheduleKind: "weekly", time: "10:00", weekdays: [1] },
   { name: "\u5DE5\u4F5C\u65E5\u65E9\u62A5", scheduleKind: "weekly", time: "08:00", weekdays: [1, 2, 3, 4, 5] }
 ];
-function AutomationView({ t, permissionT, modelT, runtime, closeSettings, pickWorkspaceDirectory }) {
+function AutomationView({ t, permissionT, modelT, runtime, closeSettings }) {
   const state = (0, import_react3.useSyncExternalStore)(runtime.source.subscribe, runtime.source.getSnapshot, runtime.source.getSnapshot);
   const [tab, setTab] = (0, import_react3.useState)("mine");
   const [query, setQuery] = (0, import_react3.useState)("");
@@ -1305,15 +1239,6 @@ function AutomationView({ t, permissionT, modelT, runtime, closeSettings, pickWo
   const [historyTask, setHistoryTask] = (0, import_react3.useState)("all");
   const [historyStatus, setHistoryStatus] = (0, import_react3.useState)("all");
   const now = (0, import_react3.useMemo)(() => new Date(state.snapshot?.serverNow ?? Date.now()), [state.snapshot?.serverNow, state.refreshedAt]);
-  (0, import_react3.useEffect)(() => {
-    void runtime.refresh().catch(() => void 0);
-    const timer = window.setInterval(() => {
-      void runtime.refresh().catch(() => void 0);
-    }, POLL_INTERVAL_MS);
-    return () => {
-      window.clearInterval(timer);
-    };
-  }, [runtime]);
   const snapshot = state.snapshot;
   const workspaces = snapshot?.workspaces ?? [];
   const models = snapshot?.models ?? [];
@@ -1474,8 +1399,6 @@ function AutomationView({ t, permissionT, modelT, runtime, closeSettings, pickWo
         skills: snapshot?.skills ?? [],
         permissions,
         defaultPermission,
-        onAddWorkspace: async (path) => runtime.addWorkspace(path).then((value) => value.id),
-        ...pickWorkspaceDirectory === void 0 ? {} : { pickWorkspaceDirectory },
         editing: editingId !== void 0,
         ...draft === void 0 ? {} : { draft },
         onClose: closeModal,
@@ -1637,7 +1560,6 @@ var en = {
   "tabs.runs": "Run history",
   "sort.created": "Newest first",
   "form.workspace": "Workspace",
-  "form.addWorkspace": "Add workspace...",
   "form.workspacePath": "Folder path",
   "form.workspacePathPlaceholder": "D:\\work\\project",
   "form.model": "Model",
@@ -1829,7 +1751,6 @@ var zh = {
   "tabs.runs": "\u6267\u884C\u8BB0\u5F55",
   "sort.created": "\u6309\u521B\u5EFA\u65F6\u95F4\u5012\u5E8F",
   "form.workspace": "\u5DE5\u4F5C\u76EE\u5F55",
-  "form.addWorkspace": "\u6DFB\u52A0\u5DE5\u4F5C\u533A...",
   "form.workspacePath": "\u76EE\u5F55\u8DEF\u5F84",
   "form.workspacePathPlaceholder": "D:\\work\\project",
   "form.model": "\u6A21\u578B",
@@ -2486,15 +2407,6 @@ function NativeScheduleSessionList(props) {
   const [query, setQuery] = (0, import_react5.useState)("");
   const [sort, setSort] = (0, import_react5.useState)("time");
   const [groupMode, setGroupMode] = (0, import_react5.useState)("workspace");
-  (0, import_react5.useEffect)(() => {
-    void runtime.refresh().catch(() => void 0);
-    const timer = window.setInterval(() => {
-      void runtime.refresh().catch(() => void 0);
-    }, 15e3);
-    return () => {
-      window.clearInterval(timer);
-    };
-  }, [runtime]);
   const archived = (0, import_react5.useMemo)(() => new Set(archivedIds), [archivedIds]);
   const listedIds = useSessions ? useSessions((snap) => Array.isArray(snap?.ids) ? snap.ids : void 0) : void 0;
   const presentIds = (0, import_react5.useMemo)(() => {
@@ -2729,15 +2641,6 @@ function ScheduleRail({
 }) {
   const state = (0, import_react6.useSyncExternalStore)(runtime.source.subscribe, runtime.source.getSnapshot, runtime.source.getSnapshot);
   const [folded, setFolded] = (0, import_react6.useState)({});
-  (0, import_react6.useEffect)(() => {
-    void runtime.refresh().catch(() => void 0);
-    const timer = window.setInterval(() => {
-      void runtime.refresh().catch(() => void 0);
-    }, 15e3);
-    return () => {
-      window.clearInterval(timer);
-    };
-  }, [runtime]);
   const groups = (0, import_react6.useMemo)(() => {
     const snapshot = state.snapshot;
     if (snapshot === void 0) return [];
@@ -3068,20 +2971,30 @@ var name = "dsh-automation-client";
 var inject = ["slots", "locale", "connection", "sessions"];
 var SETTINGS_CLOCK_SVG = '<svg viewBox="0 0 16 16" width="16" height="16" fill="none" aria-hidden="true" data-dsh-schedule-icon="1"><path fill="currentColor" d="M8 1.15A6.85 6.85 0 1 0 8 14.85 6.85 6.85 0 0 0 8 1.15Zm0 1.4a5.45 5.45 0 1 1 0 10.9 5.45 5.45 0 0 1 0-10.9Z"/><path fill="currentColor" d="M8.62 4.35H7.28v4.2l3.02 1.78.67-1.13-2.35-1.39V4.35Z"/></svg>';
 function installSettingsNavIcon(labels) {
-  const apply2 = () => {
-    const wanted = new Set(labels().map((item) => item.trim()).filter((item) => item !== ""));
-    const buttons = document.querySelectorAll("button");
-    for (const button of buttons) {
-      const text = (button.textContent ?? "").replace(/\s+/g, " ").trim();
-      if (!wanted.has(text)) continue;
-      const svg = button.querySelector("svg");
-      if (svg === null || svg.getAttribute("data-dsh-schedule-icon") === "1") continue;
-      svg.outerHTML = SETTINGS_CLOCK_SVG;
-    }
+  const wanted = new Set(labels().map((item) => item.trim()).filter((item) => item !== ""));
+  const applyButton = (button) => {
+    const text = (button.textContent ?? "").replace(/\s+/g, " ").trim();
+    if (!wanted.has(text)) return;
+    const svg = button.querySelector("svg");
+    if (svg === null || svg.getAttribute("data-dsh-schedule-icon") === "1") return;
+    svg.outerHTML = SETTINGS_CLOCK_SVG;
+  };
+  const scan = (root) => {
+    if (root instanceof HTMLButtonElement) applyButton(root);
+    for (const button of root.querySelectorAll?.("button") ?? []) applyButton(button);
   };
-  apply2();
-  const observer = new MutationObserver(apply2);
-  observer.observe(document.documentElement, { childList: true, subtree: true });
+  scan(document);
+  const observer = new MutationObserver((mutations) => {
+    for (const mutation of mutations) {
+      const target = mutation.target instanceof Element ? mutation.target : mutation.target.parentElement;
+      const owner = target?.closest("button");
+      if (owner instanceof HTMLButtonElement) applyButton(owner);
+      for (const node of mutation.addedNodes) {
+        if (node instanceof Element) scan(node);
+      }
+    }
+  });
+  observer.observe(document.documentElement, { childList: true, characterData: true, subtree: true });
   return () => {
     observer.disconnect();
   };
@@ -3102,8 +3015,7 @@ function apply(ctx) {
     label: () => t("tab"),
     icon: "schedule"
   }, function ScheduledTasksSettings(props) {
-    const workspacesApi = readOptionalWorkspaces(ctx);
-    return (0, import_react7.createElement)(AutomationView, { t, permissionT, modelT, runtime, ...props.close === void 0 ? {} : { closeSettings: props.close }, ...workspacesApi === void 0 ? {} : { pickWorkspaceDirectory: () => workspacesApi.pickDirectory() } });
+    return (0, import_react7.createElement)(AutomationView, { t, permissionT, modelT, runtime, ...props.close === void 0 ? {} : { closeSettings: props.close } });
   }));
   ctx.slots.inject("sidebar.schedule", () => ctx.slots.register({
     name: "sidebar.schedule",
@@ -3311,12 +3223,5 @@ function readSlotEntries(ctx, name2) {
 function slotHasEntries(ctx, name2) {
   return readSlotEntries(ctx, name2).length > 0;
 }
-function readOptionalWorkspaces(ctx) {
-  try {
-    return ctx.workspaces;
-  } catch {
-    return void 0;
-  }
-}
 return module.exports; } });
 //# sourceMappingURL=client.js.map