npm - @goodandready/dsh-cron - Versions diffs - 0.1.5 → 0.1.6 - Mend

@goodandready/dsh-cron 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/chat-start.js ADDED Viewed

@@ -0,0 +1,62 @@
+export async function chatStartHandler(ctx, req, res, parseJsonBody, sendJson, randomUUID) {
+  try {
+    if (req.method !== 'POST') {
+      sendJson(res, 405, { ok: false, error: 'Method not allowed' });
+      return;
+    }
+    const body = await parseJsonBody(req);
+    const userPrompt = (body.prompt || '').trim();
+    if (!userPrompt) {
+      sendJson(res, 400, { ok: false, error: 'Текст задачи не может быть пустым' });
+      return;
+    }
+    const agents = ctx.agents;
+    if (!agents || typeof agents.create !== 'function') {
+      sendJson(res, 500, { ok: false, error: 'Служба agents недоступна в DSH' });
+      return;
+    }
+    let createUserMessage = (m) => m;
+    try {
+      const llmModule = await import('@deepseek-ai/dsh-llm');
+      if (llmModule && typeof llmModule.createUserMessage === 'function') {
+        createUserMessage = llmModule.createUserMessage;
+      }
+    } catch {}
+    let mintSessionId = () => `cron-setup-${randomUUID()}`;
+    try {
+      const sessionModule = await import('@deepseek-ai/dsh-session');
+      if (sessionModule && typeof sessionModule.SessionId === 'function') {
+        const sid = mintSessionId();
+        mintSessionId = () => sessionModule.SessionId(sid);
+      }
+    } catch {}
+    const defaultSel = ctx.get('agentDefaultModel')?.currentSelection?.();
+    const provider = body.provider || defaultSel?.provider;
+    const model = body.model || defaultSel?.model;
+    const handle = await agents.create({
+      sessionId: mintSessionId(),
+      meta: {},
+      agentOptions: provider && model ? { provider, model } : undefined,
+    });
+    const { buildAgentCronPrompt } = await import('./prompt.js');
+    const fullPrompt = buildAgentCronPrompt(userPrompt);
+    await handle.agent.whenIdle();
+    handle.agent.followup(createUserMessage({
+      content: [{ type: 'text', text: fullPrompt }],
+      source: { kind: 'plugin', plugin: 'dsh-cron', form: 'cron-setup' },
+    }));
+    sendJson(res, 200, { ok: true, sessionId: handle.agent.session.id });
+  } catch (err) {
+    ctx.logger?.warn?.(`[dsh-cron] chat/start error: ${err.message}`);
+    sendJson(res, 500, { ok: false, error: err.message });
+  }
+}

package/lib/client.js CHANGED Viewed

@@ -1,12 +1,12 @@
 window.__ModuleLoader__.load({
   id: '@goodandready/dsh-cron',
   factory: (require) => {
-    var module = { exports: {} };
-    var exports = module.exports;
-    const React = require('react');
-    const ReactDOM = require('react-dom/client');
+    var module = { exports: {} }
+    var exports = module.exports
+const React = window.React || require('react');
+    const ReactDOM = window.ReactDOM || require('react-dom/client');
-    const NS = 'dsh-cron';
+    const NS = 'cron';
     const PANEL = 'cron';
     const ACTIVATE_EVENT = 'dsh-panel-activate';
     const ACTIVE_ATTR = 'data-dsh-cron-active';
@@ -19,22 +19,26 @@ window.__ModuleLoader__.load({
     const ICON_TIMER = '<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"></circle><polyline points="12 6 12 12 16 14"></polyline></svg>';
     const ICON_PLAY = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="5 3 19 12 5 21 5 21"></polygon></svg>';
     const ICON_PAUSE = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="6" y="4" width="4" height="16"></rect><rect x="14" y="4" width="4" height="16"></rect></svg>';
-    const ICON_SEARCH = '<svg viewBox="0 0 24 24" width="15" height="15" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>';
-    const ICON_CHEVRON_DOWN = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2"><polyline points="6 9 12 15 18 9"></polyline></svg>';
-    const ICON_BELL = '<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="#f59e0b" 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="16" height="16" fill="none" stroke="#a855f7" 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="16" height="16" fill="none" stroke="#10b981" 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_TRASH = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path></svg>';
+    const ICON_SEARCH = '<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>';
+    const ICON_CHEVRON_DOWN = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"></polyline></svg>';
+    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_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 = `
-      [data-pane=conversation],[class*=centerCol]{position:relative;}
-      [data-dsh-cron-view]{z-index:60;background:var(--dsw-alias-bg-base,#171717);display:none;position:absolute;inset:0;}
-      html[${ACTIVE_ATTR}]:not([data-dsh-ssh-active]) [data-dsh-cron-view]{display:block !important;}
-      html[${ACTIVE_ATTR}]:not([data-dsh-ssh-active]) [data-pane=conversation]>:not([data-dsh-cron-view]),
-      html[${ACTIVE_ATTR}]:not([data-dsh-ssh-active]) [class*=centerCol]>:not([data-dsh-cron-view]){display:none !important;}
-      .dsh-cron-entry-clone { align-items: center; gap: 8px; display: flex; }
-      .dsh-cron-entry-clone[data-active] { font-weight: 600; }
-      .dsh-cron-entry-icon { flex: none; justify-content: center; align-items: center; display: inline-flex; }
+      html[${ACTIVE_ATTR}] [data-pane=conversation],
+      html[${ACTIVE_ATTR}] [class*=centerCol] {
+        position: relative !important;
+      }
+      html[${ACTIVE_ATTR}] [data-pane=conversation] > *:not([${VIEW_ATTR}]),
+      html[${ACTIVE_ATTR}] [class*=centerCol] > *:not([${VIEW_ATTR}]) {
+        visibility: hidden !important;
+      }
+      .dsh-cron-entry-clone { display: flex; align-items: center; gap: 8px; }
+      .dsh-cron-entry-icon { display: flex; align-items: center; justify-content: center; flex: none; width: 16px; height: 16px; }
       .dsh-cron-entry-label { text-overflow: ellipsis; overflow: hidden; }
       [data-dsh-frame][data-sidebar-collapsed] .dsh-cron-entry-label { display: none; }
@@ -67,6 +71,7 @@ window.__ModuleLoader__.load({
       .dsh-cron-task-info { flex: 1; min-width: 0; }
       .dsh-cron-task-title { font-size: 15px; font-weight: 500; margin-bottom: 3px; }
       .dsh-cron-task-sched { font-size: 13px; color: #9ca3af; }
+      .dsh-cron-task-model-tag { display: inline-block; font-size: 11px; padding: 2px 7px; border-radius: 4px; background: rgba(255,255,255,0.06); color: #aaa; margin-left: 8px; vertical-align: middle; }
       .dsh-cron-task-actions { display: flex; gap: 8px; }
       .dsh-cron-icon-btn { background: transparent; border: 1px solid #333; border-radius: 8px; padding: 6px 12px; font-size: 12.5px; color: #aaa; cursor: pointer; }
       .dsh-cron-icon-btn:hover { background: #2a2a2a; color: #fff; }
@@ -81,15 +86,25 @@ window.__ModuleLoader__.load({
       .dsh-cron-rec-desc { font-size: 13px; color: #71717a; }
       .dsh-cron-modal-overlay { position: fixed; inset: 0; background: rgba(0,0,0,0.7); backdrop-filter: blur(4px); display: flex; align-items: center; justify-content: center; z-index: 1000; }
-      .dsh-cron-modal { background: var(--dsw-alias-bg-layer-2, #1f1f1f); border: 1px solid var(--dsw-alias-border-l2, #333); border-radius: 16px; width: 100%; max-width: 520px; padding: 24px; box-shadow: 0 20px 40px rgba(0,0,0,0.6); }
+      .dsh-cron-modal { background: var(--dsw-alias-bg-layer-2, #1f1f1f); border: 1px solid var(--dsw-alias-border-l2, #333); border-radius: 16px; width: 100%; max-width: 540px; padding: 24px; box-shadow: 0 20px 40px rgba(0,0,0,0.6); box-sizing: border-box; }
       .dsh-cron-modal-title { font-size: 18px; font-weight: 600; margin-bottom: 18px; }
       .dsh-cron-form-group { margin-bottom: 16px; }
       .dsh-cron-form-group label { display: block; font-size: 13px; color: #aaa; margin-bottom: 6px; }
-      .dsh-cron-form-group input, .dsh-cron-form-group textarea { width: 100%; background: #141414; border: 1px solid #333; border-radius: 8px; padding: 9px 12px; color: #fff; font-size: 13.5px; outline: none; box-sizing: border-box; }
+      .dsh-cron-form-group input, .dsh-cron-form-group textarea, .dsh-cron-form-group select { width: 100%; background: #141414; border: 1px solid #333; border-radius: 8px; padding: 9px 12px; color: #fff; font-size: 13.5px; outline: none; box-sizing: border-box; }
+      .dsh-cron-form-group select { cursor: pointer; }
       .dsh-cron-form-group textarea { min-height: 80px; resize: vertical; }
-      .dsh-cron-modal-foot { display: flex; justify-content: flex-end; gap: 10px; margin-top: 20px; }
-      .dsh-cron-btn-primary { background: #ededed; color: #111; border: none; border-radius: 8px; padding: 7px 16px; font-size: 13.5px; font-weight: 500; cursor: pointer; }
+      .dsh-cron-form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; }
+      .dsh-cron-modal-foot { display: flex; justify-content: flex-end; align-items: center; gap: 10px; margin-top: 20px; }
+      .dsh-cron-btn-primary { background: #ededed; color: #111; border: none; border-radius: 8px; padding: 7px 16px; font-size: 13.5px; font-weight: 500; cursor: pointer; display: inline-flex; align-items: center; gap: 6px; }
+      .dsh-cron-btn-primary:disabled { opacity: 0.5; cursor: not-allowed; }
       .dsh-cron-btn-secondary { background: transparent; color: #999; border: 1px solid #383838; border-radius: 8px; padding: 7px 16px; font-size: 13.5px; cursor: pointer; }
+      .dsh-cron-chat-box { position: relative; background: #141414; border: 1px solid #333; border-radius: 12px; padding: 12px; }
+      .dsh-cron-chat-input { width: 100%; background: transparent; border: none; color: #fff; font-size: 14px; min-height: 100px; resize: vertical; outline: none; box-sizing: border-box; line-height: 1.5; }
+      .dsh-cron-chat-foot { display: flex; justify-content: space-between; align-items: center; margin-top: 8px; padding-top: 8px; border-top: 1px solid #222; }
+      .dsh-cron-chat-hint { font-size: 12px; color: #666; }
+      .dsh-cron-send-btn { width: 34px; height: 34px; border-radius: 8px; background: #ededed; color: #111; border: none; display: flex; align-items: center; justify-content: center; cursor: pointer; transition: transform 0.1s, background 0.15s; }
+      .dsh-cron-send-btn:hover:not(:disabled) { background: #fff; transform: translateY(-1px); }
+      .dsh-cron-send-btn:disabled { opacity: 0.4; cursor: not-allowed; }
       .dsh-cron-card { background: var(--dsw-alias-bg-layer-2, #1f1f1f); border: 1px solid var(--dsw-alias-border-l1, #333); border-radius: 12px; padding: 18px 20px; margin-bottom: 16px; }
       .dsh-cron-card-head { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px; }
@@ -129,23 +144,16 @@ window.__ModuleLoader__.load({
       };
     }
-    function startNewSession(ctx) {
-      if (ctx) {
-        const uiWorkspace = typeof ctx.get === 'function' ? ctx.get('uiWorkspace') : ctx.uiWorkspace;
-        if (uiWorkspace && typeof uiWorkspace.startSession === 'function') {
-          uiWorkspace.startSession();
-          return;
-        }
-        const sessions = typeof ctx.get === 'function' ? ctx.get('sessions') : ctx.sessions;
-        if (sessions && typeof sessions.create === 'function') {
-          sessions.create({}).then((sessionId) => {
-            if (sessions.open) sessions.open(sessionId);
-          }).catch(() => {});
-          return;
-        }
+    function openSession(ctx, sessionId) {
+      if (!sessionId) return false;
+      const sessions = ctx && typeof ctx.get === 'function' ? ctx.get('sessions') : ctx?.sessions;
+      if (!sessions || typeof sessions.open !== 'function') return false;
+      try {
+        sessions.open(sessionId);
+        return true;
+      } catch {
+        return false;
       }
-      const btn = nativeButton();
-      if (btn) btn.click();
     }
     function CronScreen(props) {
@@ -155,21 +163,36 @@ window.__ModuleLoader__.load({
       const [tasks, setTasks] = React.useState([]);
       const [recs, setRecs] = React.useState([]);
       const [dropdownOpen, setDropdownOpen] = React.useState(false);
-      const [modalOpen, setModalOpen] = React.useState(false);
+      // Manual modal state
+      const [manualModalOpen, setManualModalOpen] = React.useState(false);
       const [formTitle, setFormTitle] = React.useState('');
       const [formSchedule, setFormSchedule] = React.useState('');
       const [formPrompt, setFormPrompt] = React.useState('');
+      const [formProvider, setFormProvider] = React.useState('');
+      const [formModel, setFormModel] = React.useState('');
+      // DSH dialog state
+      const [dshModalOpen, setDshModalOpen] = React.useState(false);
+      const [dshPrompt, setDshPrompt] = React.useState('');
+      const [dshLoading, setDshLoading] = React.useState(false);
+      // Models list state
+      const [providers, setProviders] = React.useState([]);
+      const [models, setModels] = React.useState([]);
+      const [defaultModelInfo, setDefaultModelInfo] = React.useState(null);
       React.useEffect(() => {
         const onKey = (e) => {
           if (e.key !== 'Escape') return;
-          if (modalOpen) { setModalOpen(false); return; }
+          if (manualModalOpen) { setManualModalOpen(false); return; }
+          if (dshModalOpen) { setDshModalOpen(false); return; }
           if (dropdownOpen) { setDropdownOpen(false); return; }
           if (onClose) onClose();
         };
         document.addEventListener('keydown', onKey);
         return () => document.removeEventListener('keydown', onKey);
-      }, [modalOpen, dropdownOpen, onClose]);
+      }, [manualModalOpen, dshModalOpen, dropdownOpen, onClose]);
       const fetchTasks = async () => {
         try {
@@ -182,7 +205,21 @@ window.__ModuleLoader__.load({
         } catch (err) {}
       };
+      const loadModels = async (providerToFetch) => {
+        try {
+          const url = '/dsh-cron/models' + (providerToFetch ? '?provider=' + encodeURIComponent(providerToFetch) : '');
+          const res = await fetch(url);
+          const data = await res.json();
+          if (data) {
+            if (data.providers) setProviders(data.providers);
+            if (data.models) setModels(data.models);
+            if (data.current) setDefaultModelInfo(data.current);
+          }
+        } catch (err) {}
+      };
       React.useEffect(() => { fetchTasks(); }, [tab, query]);
+      React.useEffect(() => { loadModels(); }, []);
       const handleToggleTask = async (id) => {
         try {
@@ -207,21 +244,34 @@ window.__ModuleLoader__.load({
         } catch (err) {}
       };
-      const openCreateModal = (preset) => {
+      const openManualModal = (preset) => {
         setDropdownOpen(false);
         if (preset) {
           setFormTitle(preset.title || '');
           setFormSchedule(preset.schedule || '');
           setFormPrompt(preset.prompt || '');
+          setFormProvider(defaultModelInfo?.provider || '');
+          setFormModel(defaultModelInfo?.model || '');
+          if (defaultModelInfo?.provider) loadModels(defaultModelInfo.provider);
         } else {
           setFormTitle('');
           setFormSchedule('0 9 * * 1-5');
           setFormPrompt('');
+          setFormProvider(defaultModelInfo?.provider || '');
+          setFormModel(defaultModelInfo?.model || '');
+          if (defaultModelInfo?.provider) loadModels(defaultModelInfo.provider);
         }
-        setModalOpen(true);
+        setManualModalOpen(true);
       };
-      const handleSave = async (e) => {
+      const handleProviderChange = (e) => {
+        const prov = e.target.value;
+        setFormProvider(prov);
+        setFormModel('');
+        loadModels(prov);
+      };
+      const handleSaveManual = async (e) => {
         e.preventDefault();
         try {
           const res = await fetch('/dsh-cron/tasks', {
@@ -230,38 +280,54 @@ window.__ModuleLoader__.load({
             body: JSON.stringify({
               title: formTitle,
               schedule: formSchedule,
-              prompt: formPrompt
+              prompt: formPrompt,
+              provider: formProvider || undefined,
+              model: formModel || undefined,
             })
           });
           const data = await res.json();
           if (!data.ok) { alert(data.error || 'Ошибка'); return; }
-          setModalOpen(false);
+          setManualModalOpen(false);
           fetchTasks();
         } catch (err) { alert(err.message); }
       };
-      const handleCreateWithDSH = () => {
+      const openDshModal = () => {
         setDropdownOpen(false);
-        if (onClose) onClose();
-        else toggle.set(false);
-        startNewSession(ctx);
-        const promptText = 'Помоги мне настроить новую запланированную задачу cron: ';
-        let attempts = 0;
-        const fillTextarea = () => {
-          const textarea = document.querySelector('textarea[placeholder*="message"], textarea[class*="prompt"], textarea[placeholder*="сообщение"], textarea[placeholder*="спросить"]');
-          if (textarea) {
-            textarea.value = promptText;
-            textarea.dispatchEvent(new Event('input', { bubbles: true }));
-            textarea.focus();
-            textarea.setSelectionRange(promptText.length, promptText.length);
-          } else if (attempts < 10) {
-            attempts++;
-            setTimeout(fillTextarea, 150);
+        setDshPrompt('');
+        setDshModalOpen(true);
+      };
+      const handleStartWithDSH = async () => {
+        const text = dshPrompt.trim();
+        if (!text) return;
+        setDshLoading(true);
+        try {
+          const res = await fetch('/dsh-cron/chat/start', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ prompt: text })
+          });
+          const data = await res.json();
+          if (!data.ok || !data.sessionId) {
+            alert(data.error || 'Не удалось запустить диалог с агентом');
+            setDshLoading(false);
+            return;
           }
-        };
-        setTimeout(fillTextarea, 100);
+          setDshModalOpen(false);
+          if (onClose) onClose();
+          else toggle.set(false);
+          if (!openSession(ctx, data.sessionId)) {
+            alert('Сессия создана (' + data.sessionId + '), перейдите к ней в списке чатов');
+          }
+        } catch (err) {
+          alert('Ошибка запуска: ' + err.message);
+        } finally {
+          setDshLoading(false);
+        }
       };
       return React.createElement('div', { className: 'dsh-cron-overlay' },
@@ -291,8 +357,8 @@ window.__ModuleLoader__.load({
                 React.createElement('span', { dangerouslySetInnerHTML: { __html: ICON_CHEVRON_DOWN } })
               ),
               dropdownOpen && React.createElement('div', { className: 'dsh-cron-dropdown' },
-                React.createElement('button', { className: 'dsh-cron-dropdown-item', onClick: handleCreateWithDSH }, '💬 Создать с DSH'),
-                React.createElement('button', { className: 'dsh-cron-dropdown-item', onClick: () => openCreateModal(null) }, '✏️ Настроить вручную')
+                React.createElement('button', { className: 'dsh-cron-dropdown-item', onClick: openDshModal }, '💬 Создать с DSH'),
+                React.createElement('button', { className: 'dsh-cron-dropdown-item', onClick: () => openManualModal(null) }, '✏️ Настроить вручную')
               )
             )
           ),
@@ -312,46 +378,58 @@ window.__ModuleLoader__.load({
                 className: 'dsh-cron-tab',
                 'data-active': tab === t ? 'true' : undefined,
                 onClick: () => setTab(t)
-              },
-                t === 'all' ? 'Все' : t === 'active' ? 'Активные' : t === 'paused' ? 'Приостановленные' : 'Завершено'
-              )
+              }, t === 'all' ? 'Все' : t === 'active' ? 'Активные' : t === 'paused' ? 'На паузе' : 'Завершенные')
             )
           ),
           React.createElement('div', { className: 'dsh-cron-task-list' },
-            tasks.length === 0 ? React.createElement('div', { style: { padding: '24px', textAlign: 'center', color: '#666' } }, 'Нет задач в выбранном статусе') :
-            tasks.map((task) =>
-              React.createElement('div', { key: task.id, className: 'dsh-cron-task-item' },
-                React.createElement('button', {
-                  className: 'dsh-cron-task-status-btn',
-                  'data-active': task.status === 'active' ? 'true' : undefined,
-                  onClick: () => handleToggleTask(task.id),
-                  dangerouslySetInnerHTML: { __html: task.status === 'active' ? ICON_PLAY : ICON_PAUSE }
-                }),
-                React.createElement('div', { className: 'dsh-cron-task-info' },
-                  React.createElement('div', { className: 'dsh-cron-task-title' }, task.title),
-                  React.createElement('div', { className: 'dsh-cron-task-sched' }, task.scheduleText || task.schedule)
-                ),
-                React.createElement('div', { className: 'dsh-cron-task-actions' },
-                  React.createElement('button', { className: 'dsh-cron-icon-btn', onClick: () => handleRunNow(task.id) }, 'Запустить'),
-                  React.createElement('button', { className: 'dsh-cron-icon-btn', onClick: () => handleDelete(task.id) }, 'Удалить')
+            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('button', {
+                      className: 'dsh-cron-task-status-btn',
+                      'data-active': task.status === 'active' ? 'true' : undefined,
+                      title: task.status === 'active' ? 'Приостановить' : 'Возобновить',
+                      onClick: () => 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,
+                        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' })}` : ''
+                      )
+                    ),
+                    React.createElement('div', { className: 'dsh-cron-task-actions' },
+                      React.createElement('button', {
+                        className: 'dsh-cron-icon-btn',
+                        title: 'Запустить немедленно',
+                        onClick: () => handleRunNow(task.id)
+                      }, 'Запустить'),
+                      React.createElement('button', {
+                        className: 'dsh-cron-icon-btn',
+                        title: 'Удалить задачу',
+                        onClick: () => handleDelete(task.id)
+                      }, React.createElement('span', { dangerouslySetInnerHTML: { __html: ICON_TRASH } }))
+                    )
+                  )
                 )
-              )
-            )
           ),
-          React.createElement('div', { className: 'dsh-cron-recs-title' }, 'Рекомендации'),
+          React.createElement('div', { className: 'dsh-cron-recs-title' }, 'Рекомендуемые задачи'),
           React.createElement('div', { className: 'dsh-cron-recs-list' },
             recs.map((rec) =>
               React.createElement('div', {
                 key: rec.id,
                 className: 'dsh-cron-rec-card',
-                onClick: () => openCreateModal(rec)
+                onClick: () => openManualModal(rec)
               },
-                React.createElement('div', {
-                  className: 'dsh-cron-rec-icon',
-                  dangerouslySetInnerHTML: {
+                React.createElement('div', { className: 'dsh-cron-rec-icon' },
+                  React.createElement('span', { dangerouslySetInnerHTML: {
                     __html: rec.icon === 'bell' ? ICON_BELL : rec.icon === 'clipboard' ? ICON_CLIPBOARD : ICON_ACTIVITY
-                  }
-                }),
+                  } })
+                ),
                 React.createElement('div', { className: 'dsh-cron-rec-content' },
                   React.createElement('div', { className: 'dsh-cron-rec-title' },
                     rec.title,
@@ -363,10 +441,12 @@ window.__ModuleLoader__.load({
             )
           )
         ),
-        modalOpen && React.createElement('div', { className: 'dsh-cron-modal-overlay', onClick: () => setModalOpen(false) },
+        // 1. Manual creation 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('form', { onSubmit: handleSave },
+            React.createElement('form', { onSubmit: handleSaveManual },
               React.createElement('div', { className: 'dsh-cron-form-group' },
                 React.createElement('label', null, 'Название задачи'),
                 React.createElement('input', {
@@ -385,6 +465,28 @@ window.__ModuleLoader__.load({
                   onChange: (e) => setFormSchedule(e.target.value)
                 })
               ),
+              React.createElement('div', { className: 'dsh-cron-form-row' },
+                React.createElement('div', { className: 'dsh-cron-form-group' },
+                  React.createElement('label', null, 'Провайдер LLM'),
+                  React.createElement('select', {
+                    value: formProvider,
+                    onChange: handleProviderChange
+                  },
+                    React.createElement('option', { value: '' }, 'По умолчанию (DSH)'),
+                    providers.map((p) => React.createElement('option', { key: p.id, value: p.id }, p.name || p.id))
+                  )
+                ),
+                React.createElement('div', { className: 'dsh-cron-form-group' },
+                  React.createElement('label', null, 'Модель LLM'),
+                  React.createElement('select', {
+                    value: formModel,
+                    onChange: (e) => setFormModel(e.target.value)
+                  },
+                    React.createElement('option', { value: '' }, 'По умолчанию'),
+                    models.map((m) => React.createElement('option', { key: m.id, value: m.id }, m.name || m.id))
+                  )
+                )
+              ),
               React.createElement('div', { className: 'dsh-cron-form-group' },
                 React.createElement('label', null, 'Промпт / Инструкция для агента'),
                 React.createElement('textarea', {
@@ -398,7 +500,7 @@ window.__ModuleLoader__.load({
                 React.createElement('button', {
                   type: 'button',
                   className: 'dsh-cron-btn-secondary',
-                  onClick: () => setModalOpen(false)
+                  onClick: () => setManualModalOpen(false)
                 }, 'Отмена'),
                 React.createElement('button', {
                   type: 'submit',
@@ -407,6 +509,56 @@ window.__ModuleLoader__.load({
               )
             )
           )
+        ),
+        // 2. "Создать с DSH" modal
+        dshModalOpen && React.createElement('div', { className: 'dsh-cron-modal-overlay', onClick: () => !dshLoading && setDshModalOpen(false) },
+          React.createElement('div', { className: 'dsh-cron-modal', onClick: (e) => e.stopPropagation() },
+            React.createElement('div', { className: 'dsh-cron-modal-title' }, 'Запланировать задачу с DSH Агентом'),
+            React.createElement('div', { className: 'dsh-cron-form-group' },
+              React.createElement('label', null, 'Опишите задачу и желаемую периодичность:'),
+              React.createElement('div', { className: 'dsh-cron-chat-box' },
+                React.createElement('textarea', {
+                  className: 'dsh-cron-chat-input',
+                  rows: 4,
+                  autoFocus: true,
+                  disabled: dshLoading,
+                  placeholder: 'Например: проверяй каждые 2 часа свободное место на сервере и наличие упавших systemd-сервисов, присылай алерт только если что-то не так...',
+                  value: dshPrompt,
+                  onKeyDown: (e) => {
+                    if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
+                      e.preventDefault();
+                      handleStartWithDSH();
+                    }
+                  },
+                  onChange: (e) => setDshPrompt(e.target.value)
+                }),
+                React.createElement('div', { className: 'dsh-cron-chat-foot' },
+                  React.createElement('span', { className: 'dsh-cron-chat-hint' }, 'Ctrl+Enter для отправки'),
+                  React.createElement('button', {
+                    type: 'button',
+                    className: 'dsh-cron-send-btn',
+                    disabled: dshLoading || !dshPrompt.trim(),
+                    title: 'Отправить агенту',
+                    onClick: handleStartWithDSH
+                  },
+                    React.createElement('span', {
+                      style: { display: 'flex', alignItems: 'center' },
+                      dangerouslySetInnerHTML: { __html: ICON_SEND }
+                    })
+                  )
+                )
+              )
+            ),
+            React.createElement('div', { className: 'dsh-cron-modal-foot' },
+              React.createElement('button', {
+                type: 'button',
+                className: 'dsh-cron-btn-secondary',
+                disabled: dshLoading,
+                onClick: () => setDshModalOpen(false)
+              }, 'Отмена')
+            )
+          )
         )
       );
     }
@@ -611,4 +763,4 @@ window.__ModuleLoader__.load({
     module.exports = { apply, inject: ['slots', 'locale', 'settingsScope'] };
     return module.exports;
   }
-});
+})

package/lib/index.js CHANGED Viewed

@@ -1,10 +1,13 @@
 import { TaskStore } from './store.js';
 import { TaskScheduler, parseScheduleExpression } from './scheduler.js';
 import { SessionRunner } from './runner.js';
+import { getModelsHandler } from './models-handler.js';
+import { chatStartHandler } from './chat-start.js';
 import { defineTool } from '@deepseek-ai/dsh-tools';
+import { randomUUID } from 'node:crypto';
 export const name = '@goodandready/dsh-cron';
-export const inject = ['tools', 'webServer', 'settings'];
+export const inject = ['tools', 'webServer', 'settings', 'llm', 'agents', 'agentDefaultModel'];
 function parseJsonBody(req) {
   return new Promise((resolve, reject) => {
@@ -101,6 +104,8 @@ export function apply(ctx, config) {
             type: body.type || 'prompt',
             delivery: body.delivery || 'current',
             status: body.status || 'active',
+            provider: body.provider || undefined,
+            model: body.model || undefined,
           });
           scheduler.scheduleTask(task);
           sendJson(res, 200, { ok: true, task });
@@ -114,6 +119,24 @@ export function apply(ctx, config) {
     }
   }), 'dsh-cron: /tasks');
+  // GET /dsh-cron/models
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-cron/models',
+    handler: async (req, res) => {
+      await getModelsHandler(ctx, req, res, sendJson);
+    }
+  }), 'dsh-cron: /models');
+  // POST /dsh-cron/chat/start
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-cron/chat/start',
+    handler: async (req, res) => {
+      await chatStartHandler(ctx, req, res, parseJsonBody, sendJson, randomUUID);
+    }
+  }), 'dsh-cron: /chat/start');
   // Prefix routes for actions (/dsh-cron/action/*)
   ctx.effect(() => ctx.webServer.register({
     kind: 'prefix',
@@ -128,11 +151,11 @@ export function apply(ctx, config) {
           const taskId = toggleMatch[1];
           const task = store.get(taskId);
           if (!task) {
-            sendJson(res, 404, { ok: false, error: 'Задача не найдена' });
+            sendJson(res, 404, { ok: false, error: 'Task not found' });
             return;
           }
-          const updated = task.status === 'active'
-            ? scheduler.pauseTask(taskId)
+          const updated = task.status === 'active'
+            ? scheduler.pauseTask(taskId)
             : scheduler.resumeTask(taskId);
           sendJson(res, 200, { ok: true, task: updated });
           return;
@@ -141,13 +164,8 @@ export function apply(ctx, config) {
         const runMatch = pathname.match(/^\/dsh-cron\/action\/([^/]+)\/run$/);
         if (req.method === 'POST' && runMatch) {
           const taskId = runMatch[1];
-          const task = store.get(taskId);
-          if (!task) {
-            sendJson(res, 404, { ok: false, error: 'Задача не найдена' });
-            return;
-          }
           scheduler.runTask(taskId);
-          sendJson(res, 200, { ok: true, message: 'Запуск инициирован' });
+          sendJson(res, 200, { ok: true });
           return;
         }
@@ -175,7 +193,9 @@ export function apply(ctx, config) {
         title: { type: 'string', required: true, description: 'Краткое название задачи' },
         schedule: { type: 'string', required: true, description: 'Выражение cron или интервал (every 30m, 0 9 * * 1-5, daily)' },
         prompt: { type: 'string', required: true, description: 'Инструкция для агента при запуске' },
-        delivery: { type: 'string', description: 'Режим запуска: current или isolated' }
+        delivery: { type: 'string', description: 'Режим запуска: current или isolated' },
+        provider: { type: 'string', description: 'ID провайдера LLM для выполнения задачи' },
+        model: { type: 'string', description: 'ID модели LLM для выполнения задачи' }
       },
       output: {
         schema: {
@@ -190,7 +210,7 @@ export function apply(ctx, config) {
           return [{ type: 'text', text: value.message }];
         }
       },
-      execute: async ({ title, schedule, prompt, delivery }) => {
+      execute: async ({ title, schedule, prompt, delivery, provider, model }) => {
         try {
           const parsed = parseScheduleExpression(schedule);
           const task = store.set({
@@ -199,6 +219,8 @@ export function apply(ctx, config) {
             scheduleText: parsed.humanText,
             prompt,
             delivery: delivery || 'isolated',
+            provider: provider || undefined,
+            model: model || undefined,
             status: 'active'
           });
           scheduler.scheduleTask(task);
@@ -346,4 +368,4 @@ export function apply(ctx, config) {
       return;
     }
   });
-}
+}

package/lib/models-handler.js ADDED Viewed

@@ -0,0 +1,32 @@
+export async function getModelsHandler(ctx, req, res, sendJson) {
+  const current = ctx.get('agentDefaultModel')?.currentSelection?.() ?? null;
+  let providers = [];
+  try {
+    if (ctx.llm && typeof ctx.llm.listProviders === 'function') {
+      providers = (ctx.llm.listProviders() ?? []).map((p) => ({ id: p.id, name: p.name ?? p.id }));
+    }
+  } catch {
+    providers = [];
+  }
+  const url = new URL(req.url, 'http://127.0.0.1');
+  const wanted = url.searchParams.get('provider') || '';
+  if (wanted === '') {
+    sendJson(res, 200, { current, providers, models: [] });
+    return;
+  }
+  try {
+    let rows = [];
+    if (ctx.llm && typeof ctx.llm.listModels === 'function') {
+      rows = await ctx.llm.listModels(wanted);
+    }
+    sendJson(res, 200, {
+      current,
+      providers,
+      models: (rows ?? []).map((m) => ({ id: m.id, name: m.name ?? m.id })),
+    });
+  } catch {
+    sendJson(res, 200, { current, providers, models: [] });
+  }
+}

package/lib/prompt.js ADDED Viewed

@@ -0,0 +1,17 @@
+/**
+ * Builds the initial prompt for starting a session with DSH agent to configure a cron task.
+ * @param {string} userText
+ * @returns {string}
+ */
+export function buildAgentCronPrompt(userText) {
+  const text = (userText || '').trim();
+  return `Пользователь хочет запланировать cron-задачу через DSH Cron:
+"${text}"
+ИНСТРУКЦИЯ ДЛЯ АГЕНТА:
+1. Твоя цель — помочь пользователю настроить и зарегистрировать запланированную задачу с помощью инструмента \`cron_schedule_task\`.
+2. Предложи подходящую и экономичную LLM-модель для выполнения этого крона (например, \`Qwen/Qwen3.8-Flash\` через Command Code или \`deepseek/deepseek-v4-flash\`), уточни у пользователя, устраивает ли она его или он предпочитает другую подключенную модель.
+3. Уточни и сформулируй точное расписание cron (например, "0 * * * *" или интервал вроде "every 1h").
+4. Примени Silent Rule (правило тишины): если задача мониторинга/проверки не обнаружила проблем, критических изменений или ошибок, агент должен возвращать ПУСТОЙ ответ или короткое уведомление без лишнего шума.
+5. После согласования параметров ОБЯЗАТЕЛЬНО вызови инструмент \`cron_schedule_task\`, передав title, schedule, prompt и delivery ("isolated" или "current").`;
+}

package/lib/runner.js CHANGED Viewed

@@ -9,7 +9,51 @@ export class SessionRunner {
   async execute(task) {
     console.log(`[dsh-cron] executing task "${task.title}" (${task.id})`);
-    // Check if session / agent service is present in DSH context
+    // 1. If ctx.agents is available, run through agent session
+    if (this.ctx && this.ctx.agents && typeof this.ctx.agents.create === 'function') {
+      try {
+        const { randomUUID } = await import('node:crypto');
+        let createUserMessage = (m) => m;
+        try {
+          const llmModule = await import('@deepseek-ai/dsh-llm');
+          if (llmModule && typeof llmModule.createUserMessage === 'function') {
+            createUserMessage = llmModule.createUserMessage;
+          }
+        } catch {}
+        let mintSessionId = () => `cron-exec-${task.id}-${randomUUID()}`;
+        try {
+          const sessionModule = await import('@deepseek-ai/dsh-session');
+          if (sessionModule && typeof sessionModule.SessionId === 'function') {
+            const sid = mintSessionId();
+            mintSessionId = () => sessionModule.SessionId(sid);
+          }
+        } catch {}
+        const defaultSel = this.ctx.get?.('agentDefaultModel')?.currentSelection?.();
+        const provider = task.provider || defaultSel?.provider;
+        const model = task.model || defaultSel?.model;
+        const handle = await this.ctx.agents.create({
+          sessionId: mintSessionId(),
+          meta: {},
+          agentOptions: provider && model ? { provider, model } : undefined,
+        });
+        await handle.agent.whenIdle();
+        handle.agent.followup(createUserMessage({
+          content: [{ type: 'text', text: task.prompt }],
+          source: { kind: 'plugin', plugin: 'dsh-cron', form: 'cron-execute' },
+        }));
+        return `[dsh-cron] Agent started session ${handle.agent.session?.id || 'cron'}`;
+      } catch (err) {
+        console.error(`[dsh-cron] agent execution failed:`, err.message);
+        throw err;
+      }
+    }
+    // 2. Check if legacy session service is present
     if (this.ctx && this.ctx.session && typeof this.ctx.session.create === 'function') {
       try {
         const session = await this.ctx.session.create({
@@ -27,7 +71,7 @@ export class SessionRunner {
       }
     }
-    // Direct shell / script task fallback
+    // 3. Direct shell / script task fallback
     if (task.type === 'script' && task.prompt) {
       const { exec } = await import('node:child_process');
       const { promisify } = await import('node:util');

package/package.json CHANGED Viewed

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