@goodandready/dsh-cron 0.2.49 → 0.2.50

package/lib/api.js

@@ -7,7 +7,7 @@
 
 import { randomUUID, createHash } from 'node:crypto';
 import { parseScheduleExpression } from './scheduler.js';
-import { normalizeTaskType, CODE_EXECUTING_TYPES } from './runtimes.js';
+import { normalizeTaskType, CODE_EXECUTING_TYPES, EXTERNAL_RUNTIMES } from './runtimes.js';
 import { CHANNEL_IDS, unknownChannelIds } from './channels.js';
 import { applyTaskPatch } from './task-patch.js';
 import { MANAGED_BY_CONFIG, configOwnedMessage } from './config-jobs.js';
@@ -265,7 +265,7 @@ function buildTaskRecord(store, body, taskType, parsed) {
     misfirePolicy: ['skip', 'runOnce', 'catchUpAll'].includes(body.misfirePolicy) ? body.misfirePolicy : (current ? (current.misfirePolicy || 'skip') : 'skip'),
     maxRetries: body.maxRetries !== undefined ? Math.max(0, Number(body.maxRetries) || 0) : (current ? (Number(current.maxRetries) || 0) : 0),
     retryBackoffMs: body.retryBackoffMs !== undefined ? Math.max(1000, Number(body.retryBackoffMs) || 30000) : (current ? (Number(current.retryBackoffMs) || 30000) : 30000),
-    permissionPreset: ['default', 'read-only', 'workspace-write', 'full'].includes(body.permissionPreset) ? body.permissionPreset : (current ? (current.permissionPreset || 'default') : 'default'),
+    permissionPreset: !EXTERNAL_RUNTIMES.includes(taskType) && ['default', 'read-only', 'workspace-write', 'full'].includes(body.permissionPreset) ? body.permissionPreset : (current && !EXTERNAL_RUNTIMES.includes(taskType) ? (current.permissionPreset || 'default') : 'default'),
     ...mergeExecutionFields(current, body, parsed),
   };
 }

package/lib/client.js

@@ -137,6 +137,7 @@ window.__ModuleLoader__.load({
         'modal.params': 'Parameters',
         'modal.history': 'Run history ({count})',
         'modal.cancel': 'Cancel',
+        'modal.confirmDiscard': 'Discard unsaved changes?',
         'modal.save': 'Save changes',
         'modal.create': 'Create task',
         'modal.close': 'Close',
@@ -492,6 +493,7 @@ window.__ModuleLoader__.load({
         'modal.params': '配置参数',
         'modal.history': '运行历史 ({count})',
         'modal.cancel': '取消',
+        'modal.confirmDiscard': '放弃未保存的内容？',
         'modal.save': '保存修改',
         'modal.create': '创建任务',
         'history.loading': '正在加载历史记录...',
@@ -1338,6 +1340,80 @@ window.__ModuleLoader__.load({
       const [formWorkflowName, setFormWorkflowName] = React.useState('');
       const [stats, setStats] = React.useState(null);
 
+      const initialFormSnapshotRef = React.useRef(null);
+
+      const getFormSnapshot = () => JSON.stringify({
+        title: String(formTitle || '').trim(),
+        schedule: String(formSchedule || '').trim(),
+        type: String(formType || 'llm'),
+        prompt: String(formPrompt || '').trim(),
+        provider: String(formProvider || ''),
+        model: String(formModel || ''),
+        fallbackModel: String(formFallbackModel || ''),
+        silentRule: String(formSilentRule || ''),
+        inspectOnFailure: Boolean(formInspectOnFailure),
+        delivery: String(formDelivery || 'isolated'),
+        notifyTelegram: Boolean(formNotifyTelegram),
+        channels: Array.isArray(formChannels) ? [...formChannels].sort() : [],
+        template: String(formTemplate || '').trim(),
+        onlyOnFailure: Boolean(formOnlyOnFailure),
+        timeoutSeconds: Number(formTimeoutSeconds) || 1800,
+        overlapPolicy: String(formOverlapPolicy || 'skip'),
+        kanbanMode: String(formKanbanMode || 'none'),
+        onSuccess: String(formOnSuccess || '').trim(),
+        onFailure: String(formOnFailure || '').trim(),
+        heartbeatIntervalSeconds: Number(formHeartbeatIntervalSeconds) || 0,
+        gracePeriodSeconds: Number(formGracePeriodSeconds) || 300,
+        preflightType: String(formPreflightType || 'none'),
+        preflightTarget: String(formPreflightTarget || '').trim(),
+        priority: Number(formPriority) || 5,
+        concurrencyGroup: String(formConcurrencyGroup || 'default').trim(),
+        selfHealingCommand: String(formSelfHealingCommand || '').trim(),
+        autoDiagnose: Boolean(formAutoDiagnose),
+        timezone: String(formTimezone || '').trim(),
+        misfirePolicy: String(formMisfirePolicy || 'skip'),
+        maxRetries: Number(formMaxRetries) || 0,
+        permissionPreset: String(formPermissionPreset || 'default'),
+        agentPreset: String(formAgentPreset || '').trim(),
+        targetSessionId: String(formTargetSessionId || '').trim(),
+        targetSessionReset: String(formTargetSessionReset || 'never'),
+        env: String(formEnv || '').trim(),
+        cwd: String(formCwd || '').trim(),
+        workspaceId: String(formWorkspaceId || '').trim(),
+        worktree: Boolean(formWorktree),
+        keepWorktree: Boolean(formKeepWorktree),
+        httpMethod: String(formHttpMethod || 'GET'),
+        httpUrl: String(formHttpUrl || '').trim(),
+        httpHttpHeaders: String(formHttpHeaders || '').trim(),
+        httpBody: String(formHttpBody || '').trim(),
+        sshProfileId: String(formSshProfileId || '').trim(),
+        sshTarget: String(formSshTarget || '').trim(),
+        sshKeyPath: String(formSshKeyPath || '').trim(),
+        dockerImage: String(formDockerImage || '').trim(),
+        nodePath: String(formNodePath || '').trim(),
+        pythonPath: String(formPythonPath || '').trim(),
+        skillName: String(formSkillName || '').trim(),
+        workflowName: String(formWorkflowName || '').trim(),
+      });
+
+      const isFormDirty = () => {
+        if (!manualModalOpen) return false;
+        if (initialFormSnapshotRef.current !== null) {
+          return getFormSnapshot() !== initialFormSnapshotRef.current;
+        }
+        return Boolean(formTitle.trim() || formPrompt.trim());
+      };
+
+      const closeManualModalWithConfirm = () => {
+        if (isFormDirty()) {
+          if (!confirm(T_KEY(t, 'modal.confirmDiscard') || 'Discard unsaved changes?')) {
+            return;
+          }
+        }
+        initialFormSnapshotRef.current = null;
+        setManualModalOpen(false);
+      };
+
       // Live execution indicator (#35): a light 1s tick only while some task
       // is actually running.
       const tasksRef = React.useRef([]);
@@ -1379,7 +1455,7 @@ window.__ModuleLoader__.load({
         const onKey = (e) => {
           if (e.key === 'Escape') {
             if (dropdownOpen) { setDropdownOpen(false); return; }
-            if (manualModalOpen) { setManualModalOpen(false); return; }
+            if (manualModalOpen) { closeManualModalWithConfirm(); return; }
             if (settingsModalOpen) { setSettingsModalOpen(false); return; }
             if (dshModalOpen && !dshLoading) { setDshModalOpen(false); return; }
             if (onClose) onClose();
@@ -2018,6 +2094,59 @@ window.__ModuleLoader__.load({
           setFormModel(defaultModelInfo?.model || '');
           if (defaultModelInfo?.provider) loadModels(defaultModelInfo.provider);
         }
+        initialFormSnapshotRef.current = JSON.stringify({
+          title: String((preset && preset.title) || '').trim(),
+          schedule: String((preset && preset.schedule) || (preset ? '' : '0 9 * * 1-5')).trim(),
+          type: String((preset && preset.type) || 'llm'),
+          prompt: String((preset && preset.prompt) || '').trim(),
+          provider: String(defaultModelInfo?.provider || ''),
+          model: String(defaultModelInfo?.model || ''),
+          fallbackModel: String((preset && preset.fallbackModel) || '').trim(),
+          silentRule: String((preset && preset.silentRule) || '').trim(),
+          inspectOnFailure: Boolean(preset && preset.inspectOnFailure),
+          delivery: 'isolated',
+          notifyTelegram: false,
+          channels: Array.isArray(preset && preset.channels) ? [...preset.channels].filter((c) => DELIVERY_CHANNELS.includes(c)).sort() : [],
+          template: '',
+          onlyOnFailure: Boolean(preset && preset.onlyOnFailure),
+          timeoutSeconds: 1800,
+          overlapPolicy: 'skip',
+          kanbanMode: 'none',
+          onSuccess: '',
+          onFailure: '',
+          heartbeatIntervalSeconds: 0,
+          gracePeriodSeconds: 300,
+          preflightType: 'none',
+          preflightTarget: '',
+          priority: 5,
+          concurrencyGroup: 'default',
+          selfHealingCommand: '',
+          autoDiagnose: false,
+          timezone: '',
+          misfirePolicy: 'skip',
+          maxRetries: 0,
+          permissionPreset: 'default',
+          agentPreset: '',
+          targetSessionId: '',
+          targetSessionReset: 'never',
+          env: '',
+          cwd: '',
+          workspaceId: '',
+          worktree: false,
+          keepWorktree: false,
+          httpMethod: 'GET',
+          httpUrl: '',
+          httpHttpHeaders: '',
+          httpBody: '',
+          sshProfileId: '',
+          sshTarget: '',
+          sshKeyPath: '',
+          dockerImage: '',
+          nodePath: '',
+          pythonPath: '',
+          skillName: '',
+          workflowName: '',
+        });
         setManualModalOpen(true);
       };
 
@@ -2131,7 +2260,7 @@ window.__ModuleLoader__.load({
             timezone: formTimezone.trim(),
             misfirePolicy: formMisfirePolicy,
             maxRetries: Number(formMaxRetries) || 0,
-            permissionPreset: formPermissionPreset,
+            permissionPreset: isAgentType ? formPermissionPreset : 'default',
             agentPreset: formAgentPreset.trim() || undefined,
             targetSessionId: formTargetSessionId.trim() || undefined,
             targetSessionReset: formTargetSessionReset || 'never',
@@ -2179,6 +2308,7 @@ window.__ModuleLoader__.load({
             body: JSON.stringify(payload)
           });
           if (!data.ok) { alert(data.error || T_KEY(t, 'settings.saveError', { error: '' })); return; }
+          initialFormSnapshotRef.current = null;
           setManualModalOpen(false);
           fetchTasks();
         } catch (err) { alert(err.message); }
@@ -2563,7 +2693,12 @@ window.__ModuleLoader__.load({
         ),
 
         // 1. Manual creation / Edit modal
-        manualModalOpen && React.createElement('div', { className: 'dsh-cron-modal-overlay', onClick: () => setManualModalOpen(false) },
+        manualModalOpen && React.createElement('div', {
+          className: 'dsh-cron-modal-overlay',
+          onClick: (e) => {
+            if (e.target === e.currentTarget) closeManualModalWithConfirm();
+          }
+        },
           React.createElement('div', {
             className: 'dsh-cron-modal dsh-cron-modal-scroll',
             style: { maxWidth: '640px' },
@@ -2666,7 +2801,7 @@ window.__ModuleLoader__.load({
                 React.createElement('button', {
                   type: 'button',
                   className: 'dsh-cron-btn-primary',
-                  onClick: () => setManualModalOpen(false)
+                  onClick: closeManualModalWithConfirm
                 }, T_KEY(t, 'modal.close'))
               )
             ) :
@@ -2780,7 +2915,32 @@ window.__ModuleLoader__.load({
                   )
                 )
               ),
-              React.createElement('div', { className: 'dsh-cron-form-row' },
+              AGENT_FORM_TYPES.includes(formType) ? (
+                React.createElement('div', { className: 'dsh-cron-form-row' },
+                  React.createElement('div', { className: 'dsh-cron-form-group' },
+                    React.createElement('label', null, T_KEY(t, 'form.retriesLabel')),
+                    React.createElement('input', {
+                      type: 'number',
+                      min: 0,
+                      value: formMaxRetries,
+                      placeholder: '0',
+                      onChange: (e) => setFormMaxRetries(e.target.value)
+                    })
+                  ),
+                  React.createElement('div', { className: 'dsh-cron-form-group' },
+                    React.createElement('label', null, T_KEY(t, 'form.permissionLabel')),
+                    React.createElement('select', {
+                      value: formPermissionPreset,
+                      onChange: (e) => setFormPermissionPreset(e.target.value)
+                    },
+                      React.createElement('option', { value: 'default' }, T_KEY(t, 'form.permissionDefault')),
+                      React.createElement('option', { value: 'read-only' }, T_KEY(t, 'form.permissionReadonly')),
+                      React.createElement('option', { value: 'workspace-write' }, T_KEY(t, 'form.permissionWrite')),
+                      React.createElement('option', { value: 'full' }, T_KEY(t, 'form.permissionFull'))
+                    )
+                  )
+                )
+              ) : (
                 React.createElement('div', { className: 'dsh-cron-form-group' },
                   React.createElement('label', null, T_KEY(t, 'form.retriesLabel')),
                   React.createElement('input', {
@@ -2790,18 +2950,6 @@ window.__ModuleLoader__.load({
                     placeholder: '0',
                     onChange: (e) => setFormMaxRetries(e.target.value)
                   })
-                ),
-                React.createElement('div', { className: 'dsh-cron-form-group' },
-                  React.createElement('label', null, T_KEY(t, 'form.permissionLabel')),
-                  React.createElement('select', {
-                    value: formPermissionPreset,
-                    onChange: (e) => setFormPermissionPreset(e.target.value)
-                  },
-                    React.createElement('option', { value: 'default' }, T_KEY(t, 'form.permissionDefault')),
-                    React.createElement('option', { value: 'read-only' }, T_KEY(t, 'form.permissionReadonly')),
-                    React.createElement('option', { value: 'workspace-write' }, T_KEY(t, 'form.permissionWrite')),
-                    React.createElement('option', { value: 'full' }, T_KEY(t, 'form.permissionFull'))
-                  )
                 )
               ),
               React.createElement('div', { className: 'dsh-cron-form-group' },
@@ -3249,7 +3397,7 @@ window.__ModuleLoader__.load({
                   React.createElement('button', {
                     type: 'button',
                     className: 'dsh-cron-btn-secondary',
-                    onClick: () => setManualModalOpen(false)
+                    onClick: closeManualModalWithConfirm
                   }, T_KEY(t, 'modal.cancel')),
                   React.createElement('button', {
                     type: 'submit',

package/lib/cron-tool.js

@@ -150,7 +150,7 @@ export const cronToolParameters = {
   permissionPreset: {
     type: 'string',
     enum: ['default', 'read-only', 'workspace-write', 'full'],
-    description: 'Permission preset applied to the task session',
+    description: 'Permission preset applied to the task session (only used for agent session tasks: llm, skill, workflow)',
   },
   kanbanMode: {
     type: 'string',

package/lib/task-create.js

@@ -1,4 +1,4 @@
-import { normalizeTaskType } from './runtimes.js';
+import { normalizeTaskType, EXTERNAL_RUNTIMES } from './runtimes.js';
 import { validateTaskType } from './task-transfer.js';
 import { parseScheduleExpression } from './scheduler.js';
 import { CHANNEL_IDS } from './channels.js';
@@ -44,7 +44,7 @@ export function executeCreateTask(store, scheduler, args) {
     misfirePolicy: ['skip', 'runOnce', 'catchUpAll'].includes(args.misfirePolicy) ? args.misfirePolicy : 'skip',
     maxRetries: Number(args.maxRetries) > 0 ? Number(args.maxRetries) : 0,
     retryBackoffMs: Number(args.retryBackoffMs) > 0 ? Number(args.retryBackoffMs) : 30000,
-    permissionPreset: ['default', 'read-only', 'workspace-write', 'full'].includes(args.permissionPreset) ? args.permissionPreset : 'default',
+    permissionPreset: !EXTERNAL_RUNTIMES.includes(taskType) && ['default', 'read-only', 'workspace-write', 'full'].includes(args.permissionPreset) ? args.permissionPreset : 'default',
     kanbanMode: args.kanbanMode || 'none',
     channels: Array.isArray(args.channels) ? args.channels.filter((c) => CHANNEL_IDS.includes(c)) : undefined,
     template: args.template ? String(args.template) : '',

package/lib/task-patch.js

@@ -9,7 +9,7 @@
  */
 
 import { parseScheduleExpression } from './scheduler.js';
-import { normalizeTaskType, CODE_EXECUTING_TYPES } from './runtimes.js';
+import { normalizeTaskType, CODE_EXECUTING_TYPES, EXTERNAL_RUNTIMES } from './runtimes.js';
 import { PATCHABLE_TASK_FIELDS, validateTaskType } from './task-transfer.js';
 import { pickPatchableFields, restoreTaskSecrets } from './http-utils.js';
 import { unknownChannelIds } from './channels.js';
@@ -95,6 +95,10 @@ export function buildTaskPatch(current, body) {
   if (patch.tokenLimit !== undefined) {
     patch.tokenLimit = patch.tokenLimit === null ? null : (Number(patch.tokenLimit) > 0 ? Number(patch.tokenLimit) : null);
   }
+  const effectiveType = patch.type !== undefined ? normalizeTaskType(patch.type) : current.type;
+  if (EXTERNAL_RUNTIMES.includes(effectiveType) && patch.permissionPreset !== undefined) {
+    patch.permissionPreset = 'default';
+  }
   // Issue #310 / GH #5: strip undefined properties from patch
   for (const k of Object.keys(patch)) {
     if (patch[k] === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cron",
-  "version": "0.2.49",
+  "version": "0.2.50",
   "description": "Background automation runner for DSH: isolated agent runs, script/HTTP/SSH/Docker runtimes, cost guard, notifications, heartbeats.",
   "type": "module",
   "main": "lib/index.js",