@michengai/dsh-automation 0.1.6 → 0.1.7

package/lib/index.js

@@ -123,6 +123,8 @@ async function snapshotValue(service, payload, signal) {
     models: snapshot.models,
     defaultModel: snapshot.defaultModel,
     skills: snapshot.skills,
+    permissions: snapshot.permissions,
+    defaultPermission: snapshot.defaultPermission,
     automations: snapshot.definitions.map((definition) => ({
       id: definition.id,
       revision: definition.revision,
@@ -21570,7 +21572,7 @@ var automationScheduleSchema = external_exports.discriminatedUnion("kind", [
     timeZone
   })
 ]);
-var permissionPreset = external_exports.enum(["read-only", "workspace-write", "full-access"]);
+var permissionPreset = nonBlank;
 var creator = external_exports.object({ kind: external_exports.enum(["agent", "web"]), sessionId: nonBlank });
 var targetSnapshot = external_exports.object({
   workspaceId: nonBlank,
@@ -21756,7 +21758,6 @@ function positiveInteger(value, field) {
 // src/executor.ts
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { setSandboxMode } from "@deepseek-ai/dsh-sandbox-policy";
 import { SessionId } from "@deepseek-ai/dsh-session";
 import { setApprovalPolicy } from "@deepseek-ai/dsh-user-approval";
 import { WorkspaceId } from "@deepseek-ai/dsh-workspace";
@@ -21801,8 +21802,9 @@ function unattendedToolGuardReason(name2, args) {
   }
   return UNATTENDED_TOOL_ALLOWLIST.has(name2) ? void 0 : `\u5DE5\u5177 '${name2}' \u4E0D\u5728\u65E0\u4EBA\u503C\u5B88\u81EA\u52A8\u5316\u5141\u8BB8\u5217\u8868\u4E2D\u3002`;
 }
-function sandboxModeForPermission(permission) {
-  return permission === "full-access" ? "danger-full-access" : permission;
+function applyUnattendedPermission(presets, session, permission) {
+  presets.set(session, permission);
+  setApprovalPolicy(session, "never");
 }
 function summarizeRun(events, firstSeq) {
   let started = false;
@@ -21873,8 +21875,7 @@ async function executeAutomationRun(ctx, definition, run, config2) {
         installModelSelection(agentCtx, { current: selection, assembled: void 0 });
         const agent = agentCtx.agent;
         if (agent === void 0) throw new Error("automation setup has no scoped Agent");
-        setSandboxMode(agent.session, sandboxModeForPermission(target.permissionPreset));
-        setApprovalPolicy(agent.session, "never");
+        applyUnattendedPermission(ctx.permissionPresets, agent.session, target.permissionPreset);
         agentCtx.tools.guard((exec) => unattendedToolGuardReason(exec.name, exec.arguments));
       }
     }));
@@ -21974,6 +21975,15 @@ function pinAutomationSessionTitle(ctx, session, title) {
   }
 }
 
+// src/permission-presets.ts
+function normalizePermissionPreset(input, names) {
+  if (typeof input !== "string") return void 0;
+  const raw = input.trim();
+  if (raw === "") return void 0;
+  const value = raw === "full-access" ? "danger-full-access" : raw;
+  return names.includes(value) ? value : void 0;
+}
+
 // src/service.ts
 var MAX_TIMER_DELAY_MS = 2147483647;
 var AUTOMATION_SESSION_PREFIX = "dsh-automation-session-";
@@ -22010,6 +22020,7 @@ var AutomationService = class _AutomationService {
       const service = new _AutomationService(ctx, domain2, config2);
       service.definitions = domain2.table("definitions");
       service.runs = domain2.table("runs");
+      await service.migratePermissionPresets();
       await service.recoverInterruptedRuns();
       await service.reconcileMissingSessions();
       await service.pruneAllHistory();
@@ -22034,6 +22045,19 @@ var AutomationService = class _AutomationService {
       return typeof source === "object" && source !== null && source.kind === "automation";
     });
   }
+  permissionNames() {
+    return this.permissionPresets().names;
+  }
+  permissionOptions() {
+    const presets = this.permissionPresets();
+    return presets.names.map((name2) => presets.optionOf(name2));
+  }
+  defaultPermission() {
+    const presets = this.permissionPresets();
+    const value = normalizePermissionPreset(presets.defaultPreset, presets.names);
+    if (value === void 0) throw new Error("Host \u7684\u9ED8\u8BA4\u6743\u9650\u9884\u8BBE\u4E0D\u5728\u5B98\u65B9\u6743\u9650\u5217\u8868\u4E2D\u3002");
+    return value;
+  }
   async dispose() {
     this.stopping = true;
     this.clearTimer();
@@ -22061,6 +22085,8 @@ var AutomationService = class _AutomationService {
         models: options.models,
         defaultModel: options.defaultModel,
         skills: options.skills,
+        permissions: this.permissionOptions(),
+        defaultPermission: this.defaultPermission(),
         definitions: definitions.map((definition) => ({
           ...definition,
           nextRunAt: definition.status === "active" ? nextOccurrence(definition.schedule, now2) : null,
@@ -22089,7 +22115,7 @@ var AutomationService = class _AutomationService {
         provider: target.provider,
         model: target.model,
         ...request.reasoningEffort === void 0 ? {} : { reasoningEffort: request.reasoningEffort },
-        permissionPreset: request.permissionPreset ?? "read-only",
+        permissionPreset: this.requirePermission(request.permissionPreset),
         createdBy: { kind: scope.creatorKind, sessionId: scope.sessionId },
         now: now2
       });
@@ -22105,11 +22131,12 @@ var AutomationService = class _AutomationService {
       throwIfCancelled(signal);
       const now2 = toIso();
       const { status, ...fields } = input;
+      const normalizedFields = fields.permissionPreset === void 0 ? fields : { ...fields, permissionPreset: this.requirePermission(fields.permissionPreset) };
       if (fields.schedule?.kind === "once" && nextOccurrence(fields.schedule, now2) === null) {
         throw new Error("\u4E00\u6B21\u6027\u81EA\u52A8\u5316\u5FC5\u987B\u5B89\u6392\u5728\u672A\u6765\u65F6\u95F4\u3002");
       }
       const statusChanged = status !== void 0 && status !== current.status;
-      const value = Object.keys(fields).length === 0 && !statusChanged ? current : updateDefinition(current, { ...fields, ...status === void 0 ? {} : { status }, now: now2 });
+      const value = Object.keys(normalizedFields).length === 0 && !statusChanged ? current : updateDefinition(current, { ...normalizedFields, ...status === void 0 ? {} : { status }, now: now2 });
       if (value !== current) await this.definitions.put(id, value);
       return value;
     }, signal);
@@ -22466,6 +22493,34 @@ var AutomationService = class _AutomationService {
     });
     return result;
   }
+  permissionPresets() {
+    return this.ctx.permissionPresets;
+  }
+  requirePermission(input) {
+    const presets = this.permissionPresets();
+    if (input === void 0) return this.defaultPermission();
+    const value = normalizePermissionPreset(input, presets.names);
+    if (value === void 0) throw new Error(`unknown permission preset '${input}'`);
+    return value;
+  }
+  /** 把旧版 full-access 及已移除的预设收敛到 Host 当前可用列表。 */
+  async migratePermissionPresets() {
+    const presets = this.permissionPresets();
+    const fallback = this.defaultPermission();
+    for (const [id, definition] of this.definitions.entries()) {
+      const permissionPreset2 = normalizePermissionPreset(definition.permissionPreset, presets.names) ?? fallback;
+      if (permissionPreset2 === definition.permissionPreset) continue;
+      await this.definitions.put(id, { ...definition, permissionPreset: permissionPreset2 });
+    }
+    for (const [id, run] of this.runs.entries()) {
+      const permissionPreset2 = normalizePermissionPreset(run.targetSnapshot.permissionPreset, presets.names) ?? fallback;
+      if (permissionPreset2 === run.targetSnapshot.permissionPreset) continue;
+      await this.runs.put(id, {
+        ...run,
+        targetSnapshot: { ...run.targetSnapshot, permissionPreset: permissionPreset2 }
+      });
+    }
+  }
   async recoverInterruptedRuns() {
     const finishedAt = toIso();
     for (const [id, run] of this.runs.entries()) {
@@ -22633,6 +22688,7 @@ function scheduleFromArgs(args, now2) {
 }
 function registerAutomationTools(service, agent) {
   const scope = { sessionId: agent.id, creatorKind: "agent" };
+  const permissionNames = [...service.permissionNames()];
   const disposers = [];
   const register = (definition) => {
     disposers.push(agent.ctx.tools.register(definition));
@@ -22650,7 +22706,7 @@ function registerAutomationTools(service, agent) {
         every_minutes: { type: "integer", description: "\u95F4\u9694\u8BA1\u5212\u7684\u5206\u949F\u6570\uFF0C\u6700\u5C0F 5\u3002" },
         time: { type: "string", description: "\u6BCF\u5929\u6216\u6BCF\u5468\u8BA1\u5212\u7684\u672C\u5730 HH:mm\u3002" },
         weekdays: { type: "array", items: { type: "string", enum: WEEKDAYS2 } },
-        permission: { type: "string", enum: ["read-only", "workspace-write", "full-access"] }
+        permission: { type: "string", enum: permissionNames }
       },
       output: JSON_OUTPUT,
       async execute(args, exec) {
@@ -22706,7 +22762,7 @@ function registerAutomationTools(service, agent) {
         every_minutes: { type: "integer" },
         time: { type: "string" },
         weekdays: { type: "array", items: { type: "string", enum: WEEKDAYS2 } },
-        permission: { type: "string", enum: ["read-only", "workspace-write", "full-access"] }
+        permission: { type: "string", enum: permissionNames }
       },
       output: JSON_OUTPUT,
       async execute(args, exec) {
@@ -22796,6 +22852,7 @@ var inject = [
   "workspaceRegistry",
   "agentDefaultModel",
   "agentPresets",
+  "permissionPresets",
   "tools",
   "connection",
   "llm"

package/lib/types/client/AutomationView.d.ts

@@ -1,2 +1,2 @@
 import type { AutomationViewProps } from './contracts.js';
-export declare function AutomationView({ t, runtime, closeSettings, pickWorkspaceDirectory }: AutomationViewProps): JSX.Element;
+export declare function AutomationView({ t, permissionT, runtime, closeSettings, pickWorkspaceDirectory }: AutomationViewProps): JSX.Element;

package/lib/types/client/contracts.d.ts

@@ -1,9 +1,11 @@
 import type { ComponentType, ReactNode } from 'react';
 import type { AutomationLocaleKey } from './locales.js';
 import type { AutomationRuntime } from './runtime.js';
+import type { PermissionTranslate } from './permissions.js';
 export type Translate = (key: AutomationLocaleKey, params?: Record<string, unknown>) => string;
 export interface AutomationViewProps {
     readonly t: Translate;
+    readonly permissionT: PermissionTranslate;
     readonly runtime: AutomationRuntime;
     readonly closeSettings?: () => void;
     readonly pickWorkspaceDirectory?: () => Promise<string | null>;
@@ -49,7 +51,7 @@ export interface ClientContext {
             readonly zh: Record<string, string>;
             readonly en: Record<string, string>;
         }): () => void;
-        bind(namespace: string): Translate;
+        bind(namespace: string): (key: string, params?: Record<string, unknown>) => string;
     };
     slots: {
         inject(name: string, register: () => void | (() => void)): void;

package/lib/types/client/create-modal.d.ts

@@ -1,7 +1,10 @@
 import type { Translate } from './contracts.js';
+import type { PermissionOption } from './protocol.js';
+import { type PermissionTranslate } from './permissions.js';
 import { type AutomationFormState } from './helpers.js';
-export declare function CreateModal({ t, busy, workspaces, models, defaultModel, skills, draft, editing, onClose, onSubmit, onAddWorkspace, pickWorkspaceDirectory, }: {
+export declare function CreateModal({ t, permissionT, busy, workspaces, models, defaultModel, skills, permissions, defaultPermission, draft, editing, onClose, onSubmit, onAddWorkspace, pickWorkspaceDirectory, }: {
     readonly t: Translate;
+    readonly permissionT: PermissionTranslate;
     readonly busy: boolean;
     readonly workspaces: readonly {
         id: string;
@@ -22,6 +25,8 @@ export declare function CreateModal({ t, busy, workspaces, models, defaultModel,
         id: string;
         name: string;
     }[];
+    readonly permissions: readonly PermissionOption[];
+    readonly defaultPermission: string;
     readonly draft?: Partial<AutomationFormState>;
     readonly editing?: boolean;
     readonly onClose: () => void;

package/lib/types/client/helpers.d.ts

@@ -35,7 +35,7 @@ export declare function insertSkillGesture(prompt: string, token: string, caret:
     readonly caret: number;
 };
 export declare function localDateTimeValue(date?: Date): string;
-export declare function defaultFormState(now?: Date, workspaces?: readonly WorkspaceOption[], defaultModel?: ModelOption | null): AutomationFormState;
+export declare function defaultFormState(now?: Date, workspaces?: readonly WorkspaceOption[], defaultModel?: ModelOption | null, defaultPermission?: string): AutomationFormState;
 export declare function buildCreateInput(form: AutomationFormState, workspaces: readonly WorkspaceOption[], models: readonly ModelOption[], now?: Date, options?: {
     readonly allowPastOnce?: boolean;
 }): CreateAutomationInput;
@@ -63,5 +63,5 @@ export interface HistoryGroup {
     readonly items: readonly import('./protocol.js').AutomationRunViewModel[];
 }
 export declare function groupHistory(runs: readonly import('./protocol.js').AutomationRunViewModel[], range: HistoryRange, now: Date, t: Translate): HistoryGroup[];
-export declare function formFromAutomation(item: import('./protocol.js').AutomationViewModel, workspaces?: readonly WorkspaceOption[], defaultModel?: ModelOption | null): AutomationFormState;
+export declare function formFromAutomation(item: import('./protocol.js').AutomationViewModel, workspaces?: readonly WorkspaceOption[], defaultModel?: ModelOption | null, defaultPermission?: string): AutomationFormState;
 export declare function prettyModelName(model: string): string;

package/lib/types/client/locales.d.ts

@@ -134,16 +134,6 @@ export declare const en: {
     readonly 'form.days': "Weekdays";
     readonly 'form.timeZone': "Time zone";
     readonly 'form.permission': "Permission boundary";
-    readonly 'form.readOnly': "Read Only";
-    readonly 'form.readOnlyHint': "Inspect the workspace without changing files.";
-    readonly 'form.workspaceWrite': "Workspace Write";
-    readonly 'form.fullAccess': "Full access";
-    readonly 'form.workspaceWriteHint': "May change files in this workspace; past approvals are not reused.";
-    readonly 'access.confirm.title': "Enable Full access?";
-    readonly '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.";
-    readonly 'access.confirm.acknowledge': "I understand the risks and want to continue";
-    readonly 'access.confirm.cancel': "Cancel";
-    readonly 'access.confirm.enable': "Enable Full access";
     readonly 'form.cancel': "Cancel";
     readonly 'form.submit': "Create automation";
     readonly 'form.submitting': "Creating…";
@@ -171,9 +161,6 @@ export declare const en: {
     readonly 'card.nextRun': "Next";
     readonly 'card.lastRun': "Last";
     readonly 'card.never': "Not yet run";
-    readonly 'card.permission.read-only': "Read-only";
-    readonly 'card.permission.workspace-write': "Workspace write";
-    readonly 'card.permission.full-access': "Full access";
     readonly 'schedule.onceAt': "Once · {time}";
     readonly 'schedule.everyMinutes': "Every {count} minutes";
     readonly 'schedule.dailyAt': "Daily · {time}";

package/lib/types/client/permissions.d.ts

@@ -0,0 +1,4 @@
+import type { PermissionOption } from './protocol.js';
+export type PermissionTranslate = (key: string, params?: Record<string, unknown>) => string;
+/** 与 Chat 一致：只本地化官方内置原名，自定义预设保留 Host 提供的名称。 */
+export declare function permissionLabel(option: PermissionOption, t: PermissionTranslate): string;

package/lib/types/client/protocol.d.ts

@@ -1,7 +1,12 @@
 /** Web 客户端与 Host RPC 共享的 JSON 契约。 */
 export type AutomationStatus = 'active' | 'paused';
 export type AutomationRunStatus = 'queued' | 'running' | 'succeeded' | 'failed' | 'skipped' | 'cancelled' | 'interrupted';
-export type AutomationPermission = 'read-only' | 'workspace-write' | 'full-access';
+export type AutomationPermission = string;
+export interface PermissionOption {
+    readonly value: string;
+    readonly name: string;
+    readonly description?: string;
+}
 export type AutomationSchedule = {
     readonly kind: 'once';
     readonly at: string;
@@ -93,6 +98,8 @@ export interface AutomationSnapshot {
         readonly id: string;
         readonly name: string;
     }[];
+    readonly permissions: readonly PermissionOption[];
+    readonly defaultPermission: string;
     readonly automations: readonly AutomationViewModel[];
     readonly runs: readonly AutomationRunViewModel[];
     readonly serverNow: string;

package/lib/types/executor.d.ts

@@ -1,5 +1,6 @@
 /** 已认领 run 的独立 Agent 执行边界。 */
 import type { Context } from '@deepseek-ai/cordis';
+import type { PermissionPresetService } from './permission-presets.ts';
 import type { AutomationDefinition, AutomationRun } from './types.ts';
 interface SessionEventLike {
     readonly seq: number;
@@ -21,8 +22,8 @@ export interface ExecutorConfig {
     readonly sessionId: string;
     readonly signal?: AbortSignal;
 }
-/** 自动化权限名称与 DSH 沙箱事件名称不同，必须在写入会话前转换。 */
-export declare function sandboxModeForPermission(permission: AutomationDefinition['permissionPreset']): 'read-only' | 'workspace-write' | 'danger-full-access';
+/** 先应用官方预设的完整语义，再让无人值守审批 fail-closed。 */
+export declare function applyUnattendedPermission(presets: PermissionPresetService, session: unknown, permission: AutomationDefinition['permissionPreset']): void;
 export declare function summarizeRun(events: readonly SessionEventLike[], firstSeq: number): {
     readonly text: string;
     readonly reason?: Record<string, any>;

package/lib/types/index.d.ts

@@ -16,14 +16,10 @@ export interface ApprovalPolicyReader {
     };
     overrideOf?(session: unknown): SessionApprovalPolicy | undefined;
 }
-/**
- * 读会话审批策略。官方三档对应：
- * Read Only / Workspace Write → ask
- * Full access → never
- */
+/** 读取当前会话实际审批策略；自定义权限预设也以 Host 投影结果为准。 */
 export declare function sessionApprovalPolicy(approval: ApprovalPolicyReader | undefined, session: unknown): SessionApprovalPolicy | undefined;
 /**
- * 只在官方 ask 策略下二次确认。never（Full access）再 ask，
+ * 只在实际 ask 策略下二次确认。never 策略再 ask，
  * 会被映射成 “the user rejected tool”，且不会弹窗。
  */
 export declare function needsHumanApproval(exec: {

package/lib/types/permission-presets.d.ts

@@ -0,0 +1,14 @@
+/** Host 官方权限预设服务的最小结构契约。 */
+export interface PermissionOption {
+    readonly value: string;
+    readonly name: string;
+    readonly description?: string;
+}
+export interface PermissionPresetService {
+    readonly names: readonly string[];
+    readonly defaultPreset: string;
+    optionOf(name: string): PermissionOption;
+    set(session: unknown, name: string): void;
+}
+/** 兼容旧版插件曾保存的 full-access 名称，其余值必须来自 Host 当前列表。 */
+export declare function normalizePermissionPreset(input: unknown, names: readonly string[]): string | undefined;

package/lib/types/service.d.ts

@@ -1,5 +1,6 @@
 /** 持久化定义、occurrence 认领、时钟与执行调度。 */
 import type { Context } from '@deepseek-ai/cordis';
+import { type PermissionOption } from './permission-presets.ts';
 import type { AutomationDefinition, AutomationRun, AutomationSchedule, PermissionPreset, UpdateAutomationInput } from './types.ts';
 export declare const AUTOMATION_SESSION_PREFIX = "dsh-automation-session-";
 export interface AutomationConfig {
@@ -45,6 +46,8 @@ export interface AutomationSnapshot {
         readonly id: string;
         readonly name: string;
     }[];
+    readonly permissions: readonly PermissionOption[];
+    readonly defaultPermission: string;
     readonly definitions: readonly AutomationDefinitionView[];
     readonly runs: readonly AutomationRun[];
 }
@@ -73,6 +76,9 @@ export declare class AutomationService {
     static open(ctx: Context, config: AutomationConfig): Promise<AutomationService>;
     start(): void;
     ownsSession(sessionId: string, events?: readonly SessionEventLike[]): boolean;
+    permissionNames(): readonly string[];
+    permissionOptions(): readonly PermissionOption[];
+    defaultPermission(): string;
     dispose(): Promise<void>;
     snapshot(scope: AutomationScope, signal?: AbortSignal): Promise<AutomationSnapshot>;
     create(scope: AutomationScope, request: CreateRequest, signal?: AbortSignal): Promise<AutomationDefinition>;
@@ -105,6 +111,10 @@ export declare class AutomationService {
     private armRetryTimer;
     private clearTimer;
     private serialize;
+    private permissionPresets;
+    private requirePermission;
+    /** 把旧版 full-access 及已移除的预设收敛到 Host 当前可用列表。 */
+    private migratePermissionPresets;
     private recoverInterruptedRuns;
     private pruneWorkspaceHistory;
     private pruneAllHistory;

package/lib/types/types.d.ts

@@ -1,7 +1,8 @@
 export type AutomationStatus = 'active' | 'paused';
 export type AutomationRunStatus = 'queued' | 'running' | 'succeeded' | 'failed' | 'skipped' | 'cancelled';
 export type Weekday = 'MO' | 'TU' | 'WE' | 'TH' | 'FR' | 'SA' | 'SU';
-export type PermissionPreset = 'read-only' | 'workspace-write' | 'full-access';
+/** 权限预设名称由 Host 的 permissionPresets 服务动态提供。 */
+export type PermissionPreset = string;
 export interface OnceSchedule {
     readonly kind: 'once';
     readonly at: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-automation",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "在独立 DSH Session 中按计划执行编码任务，支持 Web 设置页与 Agent 双入口管理。",
   "type": "module",
   "main": "./lib/index.js",
@@ -74,7 +74,7 @@
     "@deepseek-ai/dsh-client-ui-conversation": ">=0.1.0-rc.5 <0.2.0",
     "@deepseek-ai/dsh-client-ui-settings": ">=0.1.0-rc.5 <0.2.0",
     "@deepseek-ai/dsh-llm": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-sandbox-policy": ">=0.1.0-rc.5 <0.2.0",
+    "@deepseek-ai/dsh-permission-presets": ">=0.1.0-rc.5 <0.2.0",
     "@deepseek-ai/dsh-session": ">=0.1.0-rc.5 <0.2.0",
     "@deepseek-ai/dsh-storage-domain": ">=0.1.0-rc.5 <0.2.0",
     "@deepseek-ai/dsh-tools": ">=0.1.0-rc.5 <0.2.0",
@@ -110,4 +110,3 @@
     "registry": "https://registry.npmjs.org/"
   }
 }
-