@michengai/dsh-automation 0.1.6 → 0.1.7

package/README.md

@@ -25,7 +25,7 @@
 - Create, pause, resume, run now, and delete rules from the Web UI or Agent tools.
 - Start each occurrence in a fresh root Agent and Session. Source-chat history is not inherited.
 - Support once, interval, hourly, daily, weekly, monthly, and custom-every-N-days schedules.
-- Pick workspace, model, skills, and `read-only` / `workspace-write` in the create dialog.
+- Pick workspace, model, skills, and any permission preset exposed by the Host.
 - Create from chat: describe the schedule in any conversation, then confirm with the official approval card.
 - Keep durable run history: `queued`, `running`, `succeeded`, `failed`, `skipped`, `cancelled`.
 - Add a sidebar **Scheduled** tab. Folders are task names and child sessions are run times. On stock DSH it wraps the official workspace tree and does not depend on `dsh-codex-ui`.
@@ -124,8 +124,8 @@ Each dispatched run uses the saved prompt, workspace, model, and permission boun
 
 | Item | Behavior |
 | --- | --- |
-| Permission | Default is `read-only`. File writes require an explicit `workspace-write` choice. |
-| Full access | Unattended `danger-full-access` is not offered. |
+| Permission | Options and the default come directly from the Host `permissionPresets` service, including custom presets. |
+| Full access | The official `danger-full-access` option uses the same risk confirmation and orange warning as Chat. |
 | Approval | Chat create follows the session policy. Full access (`never`) proceeds; Workspace Write / Read Only (`ask`) shows the official card. Unattended runs stay fail-closed `never`. |
 | Retry | No automatic retry after a started run. |
 | Host restart | Leftover `queued` / `running` records become `failed(host_interrupted)`. |

package/README.zh-CN.md

@@ -25,7 +25,7 @@
 - 支持 Web 设置页和 Agent 工具创建、暂停、恢复、立即运行和删除。
 - 每次到期都启动全新 root Agent 和 Session，不继承来源对话。
 - 计划类型包括不重复、间隔、每小时、每天、每周、每月和自定义间隔天数。
-- 新建弹窗可选择工作目录、模型、技能，以及 `read-only` / `workspace-write`。
+- 新建弹窗可选择工作目录、模型、技能，以及 Host 官方提供的权限预设。
 - 在任意对话里描述定时任务即可创建；Full access 直接执行，其他权限走官方授权卡。
 - 运行状态包含 `queued`、`running`、`succeeded`、`failed`、`skipped`、`cancelled`。
 - 侧栏提供「定时」页签：文件夹是任务名称，子会话是执行时间。原生下只包裹官方任务树，不依赖 `dsh-codex-ui`。
@@ -124,8 +124,8 @@ dsh --profile web --dump-config
 
 | 项目 | 行为 |
 | --- | --- |
-| 权限 | 默认 `read-only`。改文件必须显式选择 `workspace-write`。 |
-| 完全访问 | 不提供无人值守 `danger-full-access`。 |
+| 权限 | 列表和默认值直接来自 Host 官方 `permissionPresets` 服务；支持 Host 注册的自定义预设。 |
+| 完全访问 | 选择官方 `danger-full-access` 时显示与 Chat 一致的风险确认和橙色提示。 |
 | 审批 | 对话创建跟随当前会话策略。Full access（`never`）直接创建；Workspace Write / Read Only（`ask`）走官方授权卡。无人值守运行仍是 fail-closed 的 `never`。 |
 | 重试 | 已经开始的运行不会自动重试。 |
 | Host 重启 | 遗留的 `queued` / `running` 会变成 `failed(host_interrupted)`。 |

package/lib/client.js

@@ -63,7 +63,7 @@ function localDateTimeValue(date = /* @__PURE__ */ new Date()) {
   const offset = future.getTimezoneOffset() * 6e4;
   return new Date(future.getTime() - offset).toISOString().slice(0, 16);
 }
-function defaultFormState(now = /* @__PURE__ */ new Date(), workspaces = [], defaultModel) {
+function defaultFormState(now = /* @__PURE__ */ new Date(), workspaces = [], defaultModel, defaultPermission = "") {
   return {
     name: "",
     prompt: "",
@@ -76,7 +76,7 @@ function defaultFormState(now = /* @__PURE__ */ new Date(), workspaces = [], def
     monthDay: "1",
     customDays: "2",
     timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone || "Asia/Shanghai",
-    permission: "read-only",
+    permission: defaultPermission,
     workspaceId: workspaces[0]?.id ?? "",
     modelKey: defaultModel === void 0 || defaultModel === null ? "default" : `${defaultModel.provider}::${defaultModel.model}`,
     reasoningEffort: "high",
@@ -228,8 +228,8 @@ function startOfWeek(value) {
   next.setDate(next.getDate() - offset);
   return next;
 }
-function formFromAutomation(item, workspaces = [], defaultModel) {
-  const base = defaultFormState(/* @__PURE__ */ new Date(), workspaces, defaultModel);
+function formFromAutomation(item, workspaces = [], defaultModel, defaultPermission = item.permission) {
+  const base = defaultFormState(/* @__PURE__ */ new Date(), workspaces, defaultModel, defaultPermission);
   const schedule = item.schedule;
   const modelKey = item.provider && item.model ? `${item.provider}::${item.model}` : "default";
   const common = {
@@ -397,9 +397,23 @@ function RunningStateDot() {
 // src/client/create-modal.tsx
 var import_react2 = require("react");
 
+// src/client/permissions.ts
+var BUILT_IN_PERMISSION_LABELS = /* @__PURE__ */ new Map([
+  ["read-only", ["preset.readOnly", "Read Only"]],
+  ["workspace-write", ["preset.workspaceWrite", "Workspace Write"]],
+  ["danger-full-access", ["preset.fullAccess", "Full access"]]
+]);
+function permissionLabel(option, t) {
+  const builtIn = BUILT_IN_PERMISSION_LABELS.get(option.value);
+  if (builtIn !== void 0 && (option.name === option.value || option.name === builtIn[1])) {
+    return t(builtIn[0]);
+  }
+  return option.name || option.value;
+}
+
 // src/client/create-modal-logic.ts
 function shouldConfirmFullAccess(current, next) {
-  return current !== "full-access" && next === "full-access";
+  return current !== next && next === "danger-full-access";
 }
 async function adoptPickedWorkspace(input) {
   const path = await input.pick();
@@ -618,11 +632,14 @@ var MINUTES = Array.from({ length: 60 }, (_, index) => String(index).padStart(2,
 var EFFORTS = ["none", "low", "medium", "high"];
 function CreateModal({
   t,
+  permissionT,
   busy,
   workspaces,
   models,
   defaultModel,
   skills,
+  permissions,
+  defaultPermission,
   draft,
   editing,
   onClose,
@@ -630,9 +647,9 @@ function CreateModal({
   onAddWorkspace,
   pickWorkspaceDirectory
 }) {
-  const [form, setForm] = (0, import_react2.useState)(() => ({ ...defaultFormState(/* @__PURE__ */ new Date(), workspaces, defaultModel), ...draft }));
+  const [form, setForm] = (0, import_react2.useState)(() => ({ ...defaultFormState(/* @__PURE__ */ new Date(), workspaces, defaultModel, defaultPermission), ...draft }));
   const [validationError, setValidationError] = (0, import_react2.useState)();
-  const [confirmingFullAccess, setConfirmingFullAccess] = (0, import_react2.useState)(false);
+  const [confirmingPermission, setConfirmingPermission] = (0, import_react2.useState)();
   const [fullAccessAcknowledged, setFullAccessAcknowledged] = (0, import_react2.useState)(false);
   const update = (patch) => {
     setForm((current) => ({ ...current, ...patch }));
@@ -641,18 +658,19 @@ function CreateModal({
   const choosePermission = (permission) => {
     if (shouldConfirmFullAccess(form.permission, permission)) {
       setFullAccessAcknowledged(false);
-      setConfirmingFullAccess(true);
+      setConfirmingPermission(permission);
       return;
     }
     update({ permission });
   };
   const cancelFullAccessConfirmation = () => {
     setFullAccessAcknowledged(false);
-    setConfirmingFullAccess(false);
+    setConfirmingPermission(void 0);
   };
   const confirmFullAccess = () => {
     if (!fullAccessAcknowledged) return;
-    update({ permission: "full-access" });
+    if (confirmingPermission === void 0) return;
+    update({ permission: confirmingPermission });
     cancelFullAccessConfirmation();
   };
   (0, import_react2.useEffect)(() => {
@@ -843,11 +861,11 @@ function CreateModal({
                   up: true,
                   icon: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ShieldIcon, { width: 14, height: 14 }),
                   value: form.permission,
-                  options: [
-                    { value: "read-only", label: t("form.readOnly"), icon: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ShieldIcon, { width: 14, height: 14 }) },
-                    { value: "workspace-write", label: t("form.workspaceWrite"), icon: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ShieldIcon, { width: 14, height: 14 }) },
-                    { value: "full-access", label: t("form.fullAccess"), icon: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ShieldIcon, { width: 14, height: 14 }) }
-                  ],
+                  options: permissions.map((option) => ({
+                    value: option.value,
+                    label: permissionLabel(option, permissionT),
+                    icon: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ShieldIcon, { width: 14, height: 14 })
+                  })),
                   onChange: choosePermission
                 }
               )
@@ -876,12 +894,12 @@ function CreateModal({
     /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
       import_dsh_client_ui_primitives.RiskConfirmation,
       {
-        open: confirmingFullAccess,
-        title: t("access.confirm.title"),
-        description: t("access.confirm.description"),
-        acknowledgeLabel: t("access.confirm.acknowledge"),
-        cancelLabel: t("access.confirm.cancel"),
-        confirmLabel: t("access.confirm.enable"),
+        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,
@@ -1193,7 +1211,7 @@ var EXAMPLES = [
   { 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, runtime, closeSettings, pickWorkspaceDirectory }) {
+function AutomationView({ t, permissionT, runtime, closeSettings, pickWorkspaceDirectory }) {
   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)("");
@@ -1218,6 +1236,8 @@ function AutomationView({ t, runtime, closeSettings, pickWorkspaceDirectory }) {
   const snapshot = state.snapshot;
   const workspaces = snapshot?.workspaces ?? [];
   const models = snapshot?.models ?? [];
+  const permissions = snapshot?.permissions ?? [];
+  const defaultPermission = snapshot?.defaultPermission ?? "";
   const automations = (snapshot?.automations ?? []).filter((item) => query.trim() === "" || `${item.name} ${item.prompt}`.toLowerCase().includes(query.trim().toLowerCase())).slice().sort((left, right) => Date.parse(right.createdAt) - Date.parse(left.createdAt));
   const runs = (snapshot?.runs ?? []).filter((run) => {
     if (historyTask !== "all" && run.automationId !== historyTask) return false;
@@ -1242,13 +1262,14 @@ function AutomationView({ t, runtime, closeSettings, pickWorkspaceDirectory }) {
     setEditingId(void 0);
   };
   const openCreate = (partial) => {
+    if (defaultPermission === "" || permissions.length === 0) return;
     setEditingId(void 0);
     setDraft(partial);
     setCreating(true);
   };
   const openEdit = (item) => {
     setEditingId(item.id);
-    setDraft(formFromAutomation(item, workspaces, snapshot?.defaultModel ?? null));
+    setDraft(formFromAutomation(item, workspaces, snapshot?.defaultModel ?? null, snapshot?.defaultPermission ?? item.permission));
     setCreating(true);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "dsh-st-shell", children: [
@@ -1266,7 +1287,7 @@ function AutomationView({ t, runtime, closeSettings, pickWorkspaceDirectory }) {
           /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(ChatIcon, {}),
           t("action.chatCreate")
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("button", { type: "button", className: "dsh-st-btn dsh-st-btn--primary", onClick: () => openCreate(), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("button", { type: "button", className: "dsh-st-btn dsh-st-btn--primary", disabled: defaultPermission === "" || permissions.length === 0, onClick: () => openCreate(), children: [
           /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(PlusIcon, {}),
           t("action.create")
         ] }),
@@ -1286,6 +1307,7 @@ function AutomationView({ t, runtime, closeSettings, pickWorkspaceDirectory }) {
         {
           type: "button",
           className: "dsh-st-example",
+          disabled: defaultPermission === "" || permissions.length === 0,
           onClick: () => openCreate({
             name: t(`examples.${index + 1}.title`),
             prompt: t(`examples.${index + 1}.body`),
@@ -1361,11 +1383,14 @@ function AutomationView({ t, runtime, closeSettings, pickWorkspaceDirectory }) {
       CreateModal,
       {
         t,
+        permissionT,
         busy,
         workspaces,
         models,
         defaultModel: snapshot?.defaultModel ?? null,
         skills: snapshot?.skills ?? [],
+        permissions,
+        defaultPermission,
         onAddWorkspace: async (path) => runtime.addWorkspace(path).then((value) => value.id),
         ...pickWorkspaceDirectory === void 0 ? {} : { pickWorkspaceDirectory },
         editing: editingId !== void 0,
@@ -1595,16 +1620,6 @@ var en = {
   "form.days": "Weekdays",
   "form.timeZone": "Time zone",
   "form.permission": "Permission boundary",
-  "form.readOnly": "Read Only",
-  "form.readOnlyHint": "Inspect the workspace without changing files.",
-  "form.workspaceWrite": "Workspace Write",
-  "form.fullAccess": "Full access",
-  "form.workspaceWriteHint": "May change files in this workspace; past approvals are not reused.",
-  "access.confirm.title": "Enable Full access?",
-  "access.confirm.description": "Full access reduces confirmation steps and allows the Agent to directly perform more operations, including sensitive operations, file changes, or external commands. Use it only when you trust this task.",
-  "access.confirm.acknowledge": "I understand the risks and want to continue",
-  "access.confirm.cancel": "Cancel",
-  "access.confirm.enable": "Enable Full access",
   "form.cancel": "Cancel",
   "form.submit": "Create automation",
   "form.submitting": "Creating\u2026",
@@ -1632,9 +1647,6 @@ var en = {
   "card.nextRun": "Next",
   "card.lastRun": "Last",
   "card.never": "Not yet run",
-  "card.permission.read-only": "Read-only",
-  "card.permission.workspace-write": "Workspace write",
-  "card.permission.full-access": "Full access",
   "schedule.onceAt": "Once \xB7 {time}",
   "schedule.everyMinutes": "Every {count} minutes",
   "schedule.dailyAt": "Daily \xB7 {time}",
@@ -1800,16 +1812,6 @@ var zh = {
   "form.days": "\u661F\u671F",
   "form.timeZone": "\u65F6\u533A",
   "form.permission": "\u6743\u9650\u8FB9\u754C",
-  "form.readOnly": "Read Only",
-  "form.readOnlyHint": "\u53EF\u4EE5\u68C0\u67E5\u5DE5\u4F5C\u533A\uFF0C\u4F46\u4E0D\u4F1A\u4FEE\u6539\u6587\u4EF6\u3002",
-  "form.workspaceWrite": "Workspace Write",
-  "form.fullAccess": "Full access",
-  "form.workspaceWriteHint": "\u53EF\u4EE5\u4FEE\u6539\u5F53\u524D\u5DE5\u4F5C\u533A\u6587\u4EF6\uFF1B\u4E0D\u4F1A\u7EE7\u627F\u5386\u53F2\u6279\u51C6\u3002",
-  "access.confirm.title": "\u786E\u8BA4\u542F\u7528 \u5B8C\u5168\u8BBF\u95EE\uFF1F",
-  "access.confirm.description": "\u542F\u7528 \u5B8C\u5168\u8BBF\u95EE \u540E\uFF0Cagent \u5C06\u51CF\u5C11\u786E\u8BA4\u6B65\u9AA4\uFF0C\u5E76\u4E14\u53EF\u4EE5\u76F4\u63A5\u6267\u884C\u66F4\u591A\u64CD\u4F5C\uFF0C\u5305\u62EC\u654F\u611F\u64CD\u4F5C\u3001\u6587\u4EF6\u4FEE\u6539\u6216\u5916\u90E8\u547D\u4EE4\u3002\u4EC5\u5EFA\u8BAE\u5728\u4F60\u4FE1\u4EFB\u5F53\u524D\u4EFB\u52A1\u65F6\u4F7F\u7528\u3002",
-  "access.confirm.acknowledge": "\u6211\u5DF2\u4E86\u89E3\u98CE\u9669\uFF0C\u5E76\u613F\u610F\u7EE7\u7EED",
-  "access.confirm.cancel": "\u53D6\u6D88",
-  "access.confirm.enable": "\u542F\u7528 \u5B8C\u5168\u8BBF\u95EE",
   "form.cancel": "\u53D6\u6D88",
   "form.submit": "\u521B\u5EFA\u81EA\u52A8\u5316",
   "form.submitting": "\u521B\u5EFA\u4E2D\u2026",
@@ -1837,9 +1839,6 @@ var zh = {
   "card.nextRun": "\u4E0B\u6B21",
   "card.lastRun": "\u6700\u8FD1",
   "card.never": "\u5C1A\u672A\u8FD0\u884C",
-  "card.permission.read-only": "\u53EA\u8BFB",
-  "card.permission.workspace-write": "\u53EF\u5199\u5DE5\u4F5C\u533A",
-  "card.permission.full-access": "Full access",
   "schedule.onceAt": "\u5355\u6B21 \xB7 {time}",
   "schedule.everyMinutes": "\u6BCF {count} \u5206\u949F",
   "schedule.dailyAt": "\u6BCF\u5929 \xB7 {time}",
@@ -3007,6 +3006,7 @@ function apply(ctx) {
   ctx.effect(() => installStyles(), "dsh-automation: styles");
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), "dsh-automation: locale");
   const t = ctx.locale.bind(NS);
+  const permissionT = ctx.locale.bind("permission.access");
   const runtime = createAutomationRuntime(ctx.connection.rpc);
   ctx.effect(() => installSettingsNavIcon(() => [t("tab"), "Scheduled tasks", "\u5B9A\u65F6\u4EFB\u52A1"]), "dsh-automation: settings icon");
   ctx.slots.inject("settings.section", () => ctx.slots.register({
@@ -3018,7 +3018,7 @@ function apply(ctx) {
     icon: "schedule"
   }, function ScheduledTasksSettings(props) {
     const workspacesApi = readOptionalWorkspaces(ctx);
-    return (0, import_react7.createElement)(AutomationView, { t, runtime, ...props.close === void 0 ? {} : { closeSettings: props.close }, ...workspacesApi === void 0 ? {} : { pickWorkspaceDirectory: () => workspacesApi.pickDirectory() } });
+    return (0, import_react7.createElement)(AutomationView, { t, permissionT, runtime, ...props.close === void 0 ? {} : { closeSettings: props.close }, ...workspacesApi === void 0 ? {} : { pickWorkspaceDirectory: () => workspacesApi.pickDirectory() } });
   }));
   ctx.slots.inject("sidebar.schedule", () => ctx.slots.register({
     name: "sidebar.schedule",