@goodandready/dsh-cron 0.1.10 → 0.1.11

package/lib/client.js

@@ -25,6 +25,7 @@ const React = window.React || require('react');
     const ICON_BELL = '<svg viewBox="0 0 24 24" width="18" height="18" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"></path><path d="M13.73 21a2 2 0 0 1-3.46 0"></path></svg>';
     const ICON_CLIPBOARD = '<svg viewBox="0 0 24 24" width="18" height="18" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"></path><rect x="8" y="2" width="8" height="4" rx="1" ry="1"></rect></svg>';
     const ICON_ACTIVITY = '<svg viewBox="0 0 24 24" width="18" height="18" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="22 12 18 12 15 21 9 3 6 12 2 12"></polyline></svg>';
+    const ICON_EDIT = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg>';
     const ICON_SEND = '<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="22" y1="2" x2="11" y2="13"></line><polygon points="22 2 15 22 11 13 2 9 22 2"></polygon></svg>';
 
     const STYLES = `
@@ -73,7 +74,10 @@ const React = window.React || require('react');
       .dsh-cron-tab { appearance: none; background: transparent; border: none; padding: 6px 14px; border-radius: 9999px; color: #9ca3af; font-size: 13.5px; cursor: pointer; }
       .dsh-cron-tab[data-active="true"] { background: var(--dsw-alias-bg-layer-4, #2a2a2a); color: #fff; font-weight: 500; }
       .dsh-cron-task-list { display: flex; flex-direction: column; gap: 12px; margin-bottom: 40px; }
-      .dsh-cron-task-item { display: flex; align-items: center; gap: 16px; padding: 14px 18px; background: var(--dsw-alias-bg-layer-3, #1e1e1e); border: 1px solid var(--dsw-alias-border-l2, #2e2e2e); border-radius: 12px; }
+      .dsh-cron-task-item { display: flex; align-items: center; gap: 16px; padding: 14px 18px; background: var(--dsw-alias-bg-layer-3, #1e1e1e); border: 1px solid var(--dsw-alias-border-l2, #2e2e2e); border-radius: 12px; cursor: pointer; transition: background 0.15s, border-color 0.15s; }
+      .dsh-cron-task-item:hover { background: var(--dsw-alias-bg-layer-4, #242424); border-color: #444; }
+      .dsh-cron-task-prompt-preview { font-size: 12.5px; color: #888; margin-top: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 520px; line-height: 1.3; }
+      .dsh-cron-type-tag { display: inline-block; font-size: 10.5px; padding: 1px 6px; border-radius: 4px; text-transform: uppercase; font-weight: 600; margin-left: 8px; vertical-align: middle; }
       .dsh-cron-task-item:hover { border-color: #444; }
       .dsh-cron-task-status-btn { background: none; border: 1px solid #444; border-radius: 50%; width: 28px; height: 28px; display: flex; align-items: center; justify-content: center; color: #888; cursor: pointer; flex-shrink: 0; }
       .dsh-cron-task-status-btn[data-active="true"] { color: #10b981; border-color: #10b981; }
@@ -205,13 +209,17 @@ const React = window.React || require('react');
       const [recs, setRecs] = React.useState([]);
       const [dropdownOpen, setDropdownOpen] = React.useState(false);
 
-      // Manual modal state
+      // Manual / Edit modal state
       const [manualModalOpen, setManualModalOpen] = React.useState(false);
+      const [formId, setFormId] = React.useState(null);
       const [formTitle, setFormTitle] = React.useState('');
       const [formSchedule, setFormSchedule] = React.useState('');
+      const [formType, setFormType] = React.useState('llm');
       const [formPrompt, setFormPrompt] = React.useState('');
       const [formProvider, setFormProvider] = React.useState('');
       const [formModel, setFormModel] = React.useState('');
+      const [formDelivery, setFormDelivery] = React.useState('isolated');
+      const [selectedTaskMeta, setSelectedTaskMeta] = React.useState(null);
 
       // DSH dialog state
       const [dshModalOpen, setDshModalOpen] = React.useState(false);
@@ -287,6 +295,10 @@ const React = window.React || require('react');
 
       const openManualModal = (preset) => {
         setDropdownOpen(false);
+        setFormId(null);
+        setSelectedTaskMeta(null);
+        setFormType('llm');
+        setFormDelivery('isolated');
         if (preset) {
           setFormTitle(preset.title || '');
           setFormSchedule(preset.schedule || '');
@@ -305,6 +317,22 @@ const React = window.React || require('react');
         setManualModalOpen(true);
       };
 
+      const openEditModal = (task) => {
+        setDropdownOpen(false);
+        setFormId(task.id);
+        setSelectedTaskMeta(task);
+        setFormTitle(task.title || '');
+        setFormSchedule(task.schedule || '');
+        setFormType(task.type || 'llm');
+        setFormPrompt(task.prompt || '');
+        setFormProvider(task.provider || '');
+        setFormModel(task.model || '');
+        setFormDelivery(task.delivery || 'isolated');
+        if (task.provider) loadModels(task.provider);
+        else if (defaultModelInfo?.provider) loadModels(defaultModelInfo.provider);
+        setManualModalOpen(true);
+      };
+
       const handleProviderChange = (e) => {
         const prov = e.target.value;
         setFormProvider(prov);
@@ -315,19 +343,23 @@ const React = window.React || require('react');
       const handleSaveManual = async (e) => {
         e.preventDefault();
         try {
+          const payload = {
+            id: formId || undefined,
+            title: formTitle,
+            schedule: formSchedule,
+            prompt: formPrompt,
+            type: formType,
+            delivery: formDelivery || 'isolated',
+            provider: formType === 'script' ? undefined : (formProvider || undefined),
+            model: formType === 'script' ? undefined : (formModel || undefined),
+          };
           const res = await fetch('/dsh-cron/tasks', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              title: formTitle,
-              schedule: formSchedule,
-              prompt: formPrompt,
-              provider: formProvider || undefined,
-              model: formModel || undefined,
-            })
+            body: JSON.stringify(payload)
           });
           const data = await res.json();
-          if (!data.ok) { alert(data.error || 'Ошибка'); return; }
+          if (!data.ok) { alert(data.error || 'Ошибка сохранения'); return; }
           setManualModalOpen(false);
           fetchTasks();
         } catch (err) { alert(err.message); }
@@ -424,30 +456,57 @@ const React = window.React || require('react');
             tasks.length === 0
               ? React.createElement('div', { style: { color: '#777', padding: '16px 0', fontSize: '14px' } }, 'Нет запланированных задач')
               : tasks.map((task) =>
-                  React.createElement('div', { key: task.id, className: 'dsh-cron-task-item' },
+                  React.createElement('div', {
+                    key: task.id,
+                    className: 'dsh-cron-task-item',
+                    onClick: () => openEditModal(task)
+                  },
                     React.createElement('button', {
+                      type: 'button',
                       className: 'dsh-cron-task-status-btn',
                       'data-active': task.status === 'active' ? 'true' : undefined,
                       title: task.status === 'active' ? 'Приостановить' : 'Возобновить',
-                      onClick: () => handleToggleTask(task.id)
+                      onClick: (e) => { e.stopPropagation(); handleToggleTask(task.id); }
                     }, React.createElement('span', { dangerouslySetInnerHTML: { __html: task.status === 'active' ? ICON_PAUSE : ICON_PLAY } })),
                     React.createElement('div', { className: 'dsh-cron-task-info' },
                       React.createElement('div', { className: 'dsh-cron-task-title' },
                         task.title,
+                        React.createElement('span', {
+                          className: 'dsh-cron-type-tag',
+                          style: {
+                            background: task.type === 'script' ? 'rgba(59, 130, 246, 0.15)' : 'rgba(16, 185, 129, 0.15)',
+                            color: task.type === 'script' ? '#60a5fa' : '#34d399'
+                          }
+                        }, task.type === 'script' ? 'Shell' : 'LLM'),
                         task.model ? React.createElement('span', { className: 'dsh-cron-task-model-tag' }, task.model.split('/').pop()) : null
                       ),
                       React.createElement('div', { className: 'dsh-cron-task-sched' },
                         task.scheduleText || task.schedule,
                         task.nextRunAt ? ` · след: ${new Date(task.nextRunAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}` : ''
-                      )
+                      ),
+                      task.prompt ? React.createElement('div', {
+                        className: 'dsh-cron-task-prompt-preview',
+                        title: task.prompt
+                      }, task.prompt.slice(0, 140) + (task.prompt.length > 140 ? '…' : '')) : null
                     ),
-                    React.createElement('div', { className: 'dsh-cron-task-actions' },
+                    React.createElement('div', {
+                      className: 'dsh-cron-task-actions',
+                      onClick: (e) => e.stopPropagation()
+                    },
                       React.createElement('button', {
+                        type: 'button',
                         className: 'dsh-cron-icon-btn',
                         title: 'Запустить немедленно',
                         onClick: () => handleRunNow(task.id)
                       }, 'Запустить'),
                       React.createElement('button', {
+                        type: 'button',
+                        className: 'dsh-cron-icon-btn',
+                        title: 'Редактировать / Подробнее',
+                        onClick: () => openEditModal(task)
+                      }, React.createElement('span', { dangerouslySetInnerHTML: { __html: ICON_EDIT } })),
+                      React.createElement('button', {
+                        type: 'button',
                         className: 'dsh-cron-icon-btn',
                         title: 'Удалить задачу',
                         onClick: () => handleDelete(task.id)
@@ -481,30 +540,57 @@ const React = window.React || require('react');
           )
         ),
 
-        // 1. Manual creation modal
+        // 1. Manual creation / Edit modal
         manualModalOpen && React.createElement('div', { className: 'dsh-cron-modal-overlay', onClick: () => setManualModalOpen(false) },
-          React.createElement('div', { className: 'dsh-cron-modal', onClick: (e) => e.stopPropagation() },
-            React.createElement('div', { className: 'dsh-cron-modal-title' }, 'Настройка запланированной задачи'),
+          React.createElement('div', {
+            className: 'dsh-cron-modal',
+            style: { maxWidth: '640px' },
+            onClick: (e) => e.stopPropagation()
+          },
+            React.createElement('div', { className: 'dsh-cron-modal-head', style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '18px' } },
+              React.createElement('div', { className: 'dsh-cron-modal-title', style: { margin: 0 } }, formId ? 'Редактирование задачи' : 'Новая запланированная задача'),
+              selectedTaskMeta && React.createElement('span', {
+                style: {
+                  fontSize: '12px',
+                  padding: '3px 8px',
+                  borderRadius: '6px',
+                  background: selectedTaskMeta.status === 'active' ? 'rgba(16, 185, 129, 0.15)' : 'rgba(239, 68, 68, 0.15)',
+                  color: selectedTaskMeta.status === 'active' ? '#10b981' : '#ef4444'
+                }
+              }, selectedTaskMeta.status === 'active' ? '● Активна' : '○ На паузе')
+            ),
             React.createElement('form', { onSubmit: handleSaveManual },
               React.createElement('div', { className: 'dsh-cron-form-group' },
                 React.createElement('label', null, 'Название задачи'),
                 React.createElement('input', {
                   required: true,
                   value: formTitle,
-                  placeholder: 'Например: Ежедневный утренний отчет',
+                  placeholder: 'Например: dsh-tags-watch',
                   onChange: (e) => setFormTitle(e.target.value)
                 })
               ),
-              React.createElement('div', { className: 'dsh-cron-form-group' },
-                React.createElement('label', null, 'Расписание (cron или "every 30m")'),
-                React.createElement('input', {
-                  required: true,
-                  value: formSchedule,
-                  placeholder: '0 9 * * 1-5 или every 2h',
-                  onChange: (e) => setFormSchedule(e.target.value)
-                })
+              React.createElement('div', { className: 'dsh-cron-form-row', style: { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '12px' } },
+                React.createElement('div', { className: 'dsh-cron-form-group' },
+                  React.createElement('label', null, 'Тип выполнения'),
+                  React.createElement('select', {
+                    value: formType,
+                    onChange: (e) => setFormType(e.target.value)
+                  },
+                    React.createElement('option', { value: 'llm' }, 'LLM (Агент с нейросетью)'),
+                    React.createElement('option', { value: 'script' }, 'NO-LLM (Shell-команда/Скрипт)')
+                  )
+                ),
+                React.createElement('div', { className: 'dsh-cron-form-group' },
+                  React.createElement('label', null, 'Расписание (cron или интервал)'),
+                  React.createElement('input', {
+                    required: true,
+                    value: formSchedule,
+                    placeholder: '0 */6 * * * или every 2h',
+                    onChange: (e) => setFormSchedule(e.target.value)
+                  })
+                )
               ),
-              React.createElement('div', { className: 'dsh-cron-form-row' },
+              formType !== 'script' && React.createElement('div', { className: 'dsh-cron-form-row', style: { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '12px' } },
                 React.createElement('div', { className: 'dsh-cron-form-group' },
                   React.createElement('label', null, 'Провайдер LLM'),
                   React.createElement('select', {
@@ -527,14 +613,41 @@ const React = window.React || require('react');
                 )
               ),
               React.createElement('div', { className: 'dsh-cron-form-group' },
-                React.createElement('label', null, 'Промпт / Инструкция для агента'),
+                React.createElement('label', null, formType === 'script' ? 'Shell-команда или скрипт' : 'Инструкция / Промпт для агента'),
                 React.createElement('textarea', {
                   required: true,
+                  rows: 9,
+                  style: { fontFamily: 'monospace', fontSize: '12.5px', lineHeight: '1.45' },
                   value: formPrompt,
-                  placeholder: 'Опишите, что именно агент должен сделать...',
+                  placeholder: formType === 'script' ? 'curl -fsSL https://... || exit 1' : 'Опишите, что именно агент должен сделать...',
                   onChange: (e) => setFormPrompt(e.target.value)
                 })
               ),
+              selectedTaskMeta && React.createElement('div', {
+                style: {
+                  background: 'rgba(255,255,255,0.03)',
+                  border: '1px solid #2e2e2e',
+                  borderRadius: '8px',
+                  padding: '10px 14px',
+                  fontSize: '12.5px',
+                  color: '#999',
+                  marginBottom: '16px',
+                  display: 'flex',
+                  justifyContent: 'space-between',
+                  alignItems: 'center'
+                }
+              },
+                React.createElement('div', null,
+                  React.createElement('span', null, 'Следующий запуск: '),
+                  React.createElement('strong', { style: { color: '#eee' } }, selectedTaskMeta.nextRunAt ? new Date(selectedTaskMeta.nextRunAt).toLocaleString() : 'не запланирован')
+                ),
+                React.createElement('button', {
+                  type: 'button',
+                  className: 'dsh-cron-btn-secondary',
+                  style: { padding: '4px 10px', fontSize: '12px' },
+                  onClick: () => { handleRunNow(selectedTaskMeta.id); }
+                }, 'Запустить сейчас')
+              ),
               React.createElement('div', { className: 'dsh-cron-modal-foot' },
                 React.createElement('button', {
                   type: 'button',
@@ -544,7 +657,7 @@ const React = window.React || require('react');
                 React.createElement('button', {
                   type: 'submit',
                   className: 'dsh-cron-btn-primary'
-                }, 'Сохранить задачу')
+                }, formId ? 'Сохранить изменения' : 'Создать задачу')
               )
             )
           )

package/lib/store.js

@@ -82,21 +82,26 @@ export class TaskStore {
   set(task) {
     const now = Date.now();
     const id = task.id || ('cron_' + Math.random().toString(36).slice(2, 9));
+    const prev = this.tasks.get(id) || {};
     const record = {
+      ...prev,
+      ...task,
       id,
-      title: task.title || 'Новая задача',
-      schedule: task.schedule || '0 9 * * *',
-      scheduleText: task.scheduleText || task.schedule,
-      prompt: task.prompt || '',
-      type: task.type || 'prompt',
-      status: task.status || 'active',
-      delivery: task.delivery || 'current',
-      createdAt: task.createdAt || now,
+      title: task.title !== undefined ? task.title : (prev.title || 'Новая задача'),
+      schedule: task.schedule !== undefined ? task.schedule : (prev.schedule || '0 9 * * *'),
+      scheduleText: task.scheduleText !== undefined ? task.scheduleText : (prev.scheduleText || task.schedule),
+      prompt: task.prompt !== undefined ? task.prompt : (prev.prompt || ''),
+      type: task.type !== undefined ? task.type : (prev.type || 'llm'),
+      status: task.status !== undefined ? task.status : (prev.status || 'active'),
+      delivery: task.delivery !== undefined ? task.delivery : (prev.delivery || 'isolated'),
+      provider: task.provider !== undefined ? task.provider : prev.provider,
+      model: task.model !== undefined ? task.model : prev.model,
+      createdAt: prev.createdAt || task.createdAt || now,
       updatedAt: now,
-      lastRunAt: task.lastRunAt || null,
-      lastStatus: task.lastStatus || null,
-      lastDurationMs: task.lastDurationMs || 0,
-      nextRunAt: task.nextRunAt || null,
+      lastRunAt: task.lastRunAt !== undefined ? task.lastRunAt : (prev.lastRunAt || null),
+      lastStatus: task.lastStatus !== undefined ? task.lastStatus : (prev.lastStatus || null),
+      lastDurationMs: task.lastDurationMs !== undefined ? task.lastDurationMs : (prev.lastDurationMs || 0),
+      nextRunAt: task.nextRunAt !== undefined ? task.nextRunAt : (prev.nextRunAt || null),
     };
     this.tasks.set(id, record);
     this.save();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cron",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Scheduled cron tasks, background automation and agent execution for DeepSeek Harness.",
   "type": "module",
   "main": "lib/index.js",