clementine-agent 1.18.89 → 1.18.91

package/dist/cli/dashboard.js

@@ -4587,6 +4587,56 @@ export async function cmdDashboard(opts) {
     });
     // SSE events handler moved before auth middleware (see above)
     // ── POST routes (actions) ──────────────────────────────────────
+    // PRD §10 / 1.18.91: cancel an in-flight cron run. The daemon runs every
+    // cron job in-process (cron-running.json's `pid` is the daemon's PID — we
+    // can't SIGTERM it without crashing everything else). Instead we look up
+    // the job's AbortController in the gateway registry and abort it; the SDK
+    // path on runAgentCron honors the signal and unwinds cleanly. The
+    // CronScheduler's own catch path then writes the closing CronRunEntry
+    // with status='error' + an "AbortError" message.
+    app.post('/api/cron/run/:job/cancel', async (req, res) => {
+        try {
+            const jobName = req.params.job;
+            if (!jobName) {
+                res.status(400).json({ ok: false, error: 'job required' });
+                return;
+            }
+            const gw = await getGateway();
+            if (!gw || typeof gw.cancelCronJob !== 'function') {
+                res.status(503).json({ ok: false, error: 'gateway not initialized — try again in a moment' });
+                return;
+            }
+            const runningFile = path.join(BASE_DIR, 'cron-running.json');
+            let runId;
+            if (existsSync(runningFile)) {
+                try {
+                    const entries = JSON.parse(readFileSync(runningFile, 'utf-8'));
+                    const match = Array.isArray(entries) ? entries.find((e) => String(e.jobName ?? '').toLowerCase() === jobName.toLowerCase()) : null;
+                    if (match?.runId)
+                        runId = match.runId;
+                }
+                catch { /* non-fatal — cancel can still proceed without runId */ }
+            }
+            const aborted = gw.cancelCronJob(jobName, 'cancelled-by-dashboard');
+            if (!aborted) {
+                res.status(404).json({ ok: false, error: `Job "${jobName}" is not running on this daemon` });
+                return;
+            }
+            // Broadcast so other tabs drop the running card without polling.
+            try {
+                broadcastEvent({ type: 'cron_cancelled', data: { job: jobName, runId } });
+            }
+            catch { /* non-fatal */ }
+            res.json({
+                ok: true,
+                message: `Cancel signal sent to "${jobName}". The runner will close the run within a few seconds.`,
+                runId,
+            });
+        }
+        catch (err) {
+            res.status(500).json({ ok: false, error: String(err) });
+        }
+    });
     app.post('/api/cron/run/:job', (req, res) => {
         const jobName = req.params.job;
         try {
@@ -20217,7 +20267,10 @@ if('serviceWorker' in navigator){navigator.serviceWorker.getRegistrations().then
           <h4>What it does</h4>
           <p class="cron-section-desc">The instruction the agent receives. Long prompts are fine — drag the corner to resize.</p>
           <div class="form-group">
-            <label class="form-label">Prompt</label>
+            <label class="form-label" style="display:flex;align-items:center;gap:8px">
+              Prompt
+              <a href="#" id="cron-prompt-history-link" onclick="event.preventDefault();openPromptHistory()" style="display:none;font-size:11px;font-weight:normal;color:var(--text-muted);text-decoration:none;border-bottom:1px dotted var(--border)">View prompt history</a>
+            </label>
             <textarea id="cron-prompt" class="cron-prompt-textarea" placeholder="What should the AI do when this task runs?"></textarea>
             <div class="form-hint">The instruction sent to the AI agent when this task fires.</div>
           </div>
@@ -20450,6 +20503,29 @@ if('serviceWorker' in navigator){navigator.serviceWorker.getRegistrations().then
 
 <!-- (legacy standalone Preview modal removed in 1.18.70 — preview now lives as a tab inside the cron modal) -->
 
+<!-- ═══ Prompt History Modal — PRD §11 / 1.18.90 ═══
+     Lists every past prompt revision for the currently-edited task.
+     Each row shows ts + changedBy + a preview, expandable to full
+     content. "Restore" copies the old prompt back into the editor —
+     it does NOT auto-save, so the user reviews + clicks Save Changes
+     to commit. The current draft in the editor is preserved if the
+     user closes without restoring. -->
+<div class="modal-overlay" id="prompt-history-modal">
+  <div class="modal" style="max-width:720px;width:96vw;max-height:88vh;display:flex;flex-direction:column">
+    <div class="modal-header">
+      <h3>Prompt history</h3>
+      <button class="btn-ghost btn-sm" onclick="closePromptHistory()">&times;</button>
+    </div>
+    <div class="modal-body" style="padding:0;flex:1;min-height:0;overflow-y:auto">
+      <div id="prompt-history-list" style="padding:18px"></div>
+    </div>
+    <div class="modal-footer">
+      <span style="flex:1;font-size:11px;color:var(--text-muted)">Restore copies a version into the editor. You still need to click <strong>Save Changes</strong> to commit it.</span>
+      <button onclick="closePromptHistory()">Close</button>
+    </div>
+  </div>
+</div>
+
 <!-- ═══ MCP Server Edit Modal — PRD Phase 2.1 ═══ -->
 <div class="modal-overlay" id="mcp-edit-modal">
   <div class="modal" style="max-width:640px;width:96vw">
@@ -22656,6 +22732,24 @@ async function toggleCronJob(name) {
   } catch(e) { toast('Failed to toggle: ' + e, 'error'); }
 }
 
+// PRD §10 / 1.18.91: SIGTERM the in-flight runner for this cron job. The
+// daemon endpoint reads PID from cron-running.json (already written by
+// CronScheduler). The runner's signal handler closes the run gracefully —
+// the SSE cron_cancelled broadcast will refresh the card.
+async function cancelCronRun(name) {
+  if (!confirm('Cancel the in-flight run for "' + name + '"? The runner will stop within a few seconds.')) return;
+  try {
+    var r = await apiFetch('/api/cron/run/' + encodeURIComponent(name) + '/cancel', { method: 'POST' });
+    var d = await r.json();
+    if (!r.ok || d.ok === false) {
+      toast(d.error || ('Cancel failed (HTTP ' + r.status + ')'), 'error');
+      return;
+    }
+    toast(d.message || ('Cancel signal sent to ' + name), 'success');
+    setTimeout(refreshCron, 800);
+  } catch(e) { toast('Failed to cancel: ' + e, 'error'); }
+}
+
 async function toggleScheduledWorkflow(id) {
   try {
     var r = await apiFetch('/api/builder/workflows/' + encodeURIComponent(id));
@@ -23637,6 +23731,14 @@ function renderScheduledTaskCard(task) {
   badges += '<span class="badge ' + (enabled ? 'badge-green' : 'badge-gray') + '">' + (enabled ? 'Enabled' : 'Disabled') + '</span>';
   badges += '<span class="badge ' + (task.health === 'broken' || task.health === 'failed' ? 'badge-yellow' : 'badge-gray') + '">' + esc(task.healthLabel || task.health) + '</span>';
   var safeName = jsStr(task.name);
+  // PRD §10 / 1.18.91: when a task is mid-flight, Run Now is meaningless and
+  // would race against the concurrency lock; replace it with a Cancel button
+  // that calls /api/cron/run/:job/cancel (SIGTERMs the runner via the PID
+  // recorded in cron-running.json).
+  var isRunning = task.health === 'running';
+  var runOrCancelBtn = isRunning
+    ? '<button class="btn-sm secondary btn-danger" onclick="cancelCronRun(\\x27' + safeName + '\\x27)" title="Stop this in-flight run (SIGTERM)">Cancel</button>'
+    : '<button class="btn-sm secondary btn-success" onclick="apiPost(\\x27/api/cron/run/' + encodeURIComponent(task.name) + '\\x27)" title="Run this task once now">Run Now</button>';
   return '<div class="' + cardCls + '" style="' + style + '">'
     + '<div class="task-card-header"><strong>' + esc(task.displayName || task.name) + '</strong>'
     + '<label class="toggle-switch"><input type="checkbox"' + (enabled ? ' checked' : '') + ' onchange="toggleCronJob(\\x27' + safeName + '\\x27)"><span class="toggle-slider"></span></label></div>'
@@ -23648,7 +23750,7 @@ function renderScheduledTaskCard(task) {
     + '<div class="task-card-badges">' + badges + '</div>'
     + '<div class="task-card-actions">'
     + '<button class="btn-sm primary" onclick="openEditCronModal(\\x27' + safeName + '\\x27)" title="Edit task" style="background:var(--bg-tertiary);border:1px solid var(--border);color:var(--text-primary)">Edit</button>'
-    + '<button class="btn-sm secondary btn-success" onclick="apiPost(\\x27/api/cron/run/' + encodeURIComponent(task.name) + '\\x27)" title="Run this task once now">Run Now</button>'
+    + runOrCancelBtn
     + '<button class="btn-sm secondary" onclick="openCronPreview(\\x27' + safeName + '\\x27)" title="See exactly what will run">Preview</button>'
     + '<button class="btn-sm secondary" data-trace-job="' + esc(task.name) + '" title="View execution trace">Trace</button>'
     + '<button class="btn-sm secondary btn-danger" onclick="confirmDeleteCron(\\x27' + safeName + '\\x27)" title="Delete task">Del</button>'
@@ -25965,6 +26067,87 @@ async function loadCronPreviewIntoTab(jobName) {
 // Mark the preview as stale (call after save so next tab visit refetches).
 function markCronPreviewDirty() { _cronPreviewLoadedFor = null; }
 
+// ── PRD §11 / 1.18.90: Prompt history viewer ────────────────────────
+// Reads /api/cron/:job/prompt-history (already populated on every PUT
+// since 1.18.x). Each version is the OLD prompt at the moment of a save,
+// so rolling back means picking the version that was AFTER the change
+// you want to undo (or the current saved value if you want the most
+// recent committed state).
+async function openPromptHistory() {
+  if (!editingCronJob) {
+    toast('Save the task first, then prompt history will be available.', 'info');
+    return;
+  }
+  var modal = document.getElementById('prompt-history-modal');
+  var list = document.getElementById('prompt-history-list');
+  if (!modal || !list) return;
+  list.innerHTML = '<div style="padding:24px;color:var(--text-muted);text-align:center">Loading prompt history…</div>';
+  modal.classList.add('show');
+  try {
+    var r = await apiFetch('/api/cron/' + encodeURIComponent(editingCronJob) + '/prompt-history');
+    var d = await r.json();
+    var versions = (d && d.versions) || [];
+    if (versions.length === 0) {
+      list.innerHTML = '<div style="padding:36px 24px;color:var(--text-muted);text-align:center;line-height:1.6">'
+        + '<div style="font-weight:500;color:var(--text-secondary);margin-bottom:8px">No prior prompt versions yet</div>'
+        + '<div style="font-size:12px">A version is recorded each time you save a different prompt. The first edit you make to this task will create version 1.</div>'
+        + '</div>';
+      return;
+    }
+    var html = '<div style="font-size:11px;color:var(--text-muted);margin-bottom:12px">Newest first. Each entry is the prompt as it was BEFORE that save — restoring rolls the editor back to the version that was active before that change landed.</div>';
+    for (var i = 0; i < versions.length; i++) {
+      var v = versions[i];
+      var ts = v.timestamp ? new Date(v.timestamp).toLocaleString() : 'unknown time';
+      var who = v.changedBy || 'dashboard';
+      var prompt = String(v.prompt || '');
+      var preview = prompt.slice(0, 200).replace(/\\s+/g, ' ');
+      var rowId = 'pmt-hist-' + i;
+      var promptB64 = btoa(unescape(encodeURIComponent(prompt))); // safe transport for restore
+      html += '<div style="background:var(--bg-secondary);border:1px solid var(--border);border-radius:8px;padding:14px;margin-bottom:10px">';
+      html += '<div style="display:flex;align-items:center;gap:10px;margin-bottom:8px">';
+      html += '<span style="font-size:11px;font-weight:600;color:var(--text-muted);text-transform:uppercase;letter-spacing:0.04em">v' + esc(v.version || (versions.length - i)) + '</span>';
+      html += '<span style="font-size:12px;color:var(--text-primary)">' + esc(ts) + '</span>';
+      html += '<span style="font-size:11px;color:var(--text-muted)">· by ' + esc(who) + '</span>';
+      html += '<span style="flex:1"></span>';
+      html += '<button class="btn-sm" onclick="document.getElementById(\\x27' + rowId + '\\x27).style.display=document.getElementById(\\x27' + rowId + '\\x27).style.display===\\x27none\\x27?\\x27block\\x27:\\x27none\\x27" style="font-size:11px;padding:3px 8px">Show full</button>';
+      html += '<button class="btn-sm btn-primary" onclick="restorePromptVersion(\\x27' + promptB64 + '\\x27)" style="font-size:11px;padding:3px 10px">Restore</button>';
+      html += '</div>';
+      html += '<div style="font-size:12px;color:var(--text-secondary);line-height:1.5;font-family:\\x27JetBrains Mono\\x27,monospace">' + esc(preview) + (prompt.length > 200 ? '…' : '') + '</div>';
+      html += '<pre id="' + rowId + '" style="display:none;margin-top:10px;font-size:11px;font-family:\\x27JetBrains Mono\\x27,monospace;background:var(--bg-tertiary);border:1px solid var(--border);padding:10px;border-radius:6px;white-space:pre-wrap;word-break:break-word;max-height:280px;overflow-y:auto">' + esc(prompt) + '</pre>';
+      html += '</div>';
+    }
+    list.innerHTML = html;
+  } catch (e) {
+    list.innerHTML = '<div style="padding:24px;color:var(--red)">Failed to load history: ' + esc(String(e)) + '</div>';
+  }
+}
+
+function closePromptHistory() {
+  var modal = document.getElementById('prompt-history-modal');
+  if (modal) modal.classList.remove('show');
+}
+
+// Restore copies the old prompt back into the editor's textarea. Doesn't
+// auto-save — the user must click Save Changes to commit, which keeps the
+// dirty-guard semantics intact and gives them a chance to back out.
+function restorePromptVersion(promptB64) {
+  try {
+    var prompt = decodeURIComponent(escape(atob(promptB64)));
+    var ta = document.getElementById('cron-prompt');
+    if (!ta) return;
+    if (ta.value !== prompt && ta.value.trim() && !confirm('Replace the current prompt with this restored version? Your unsaved edits will be discarded.')) {
+      return;
+    }
+    ta.value = prompt;
+    // Switch to the Prompt tab so the user sees what just changed.
+    if (typeof switchCronConfigTab === 'function') switchCronConfigTab('prompt');
+    closePromptHistory();
+    toast('Prompt restored. Click Save Changes to commit it.', 'info');
+  } catch (e) {
+    toast('Failed to restore: ' + String(e), 'error');
+  }
+}
+
 // PRD Phase 1.3a: inner Configure pane tabs. Sets the data-active-config-tab
 // attribute on #cron-tab-configure; CSS handles section visibility via
 // data-config-tab attributes on each section. JS-light by design.
@@ -26260,6 +26443,9 @@ function openCreateCronModal(agentSlug) {
   if (lastRunBtn) lastRunBtn.setAttribute('disabled', 'disabled');
   var runOnceBtn = document.getElementById('cron-run-once-btn');
   if (runOnceBtn) runOnceBtn.style.display = 'none';
+  // PRD §11 / 1.18.90: prompt history link only meaningful for existing tasks.
+  var historyLinkNew = document.getElementById('cron-prompt-history-link');
+  if (historyLinkNew) historyLinkNew.style.display = 'none';
   var host = document.getElementById('cron-legacy-banner-host');
   if (host) host.innerHTML = '';
   // Reset the "Use a cron expression" link in case it was hidden last time.
@@ -26360,6 +26546,9 @@ function openEditCronModal(jobName) {
   // Show "Run task once" only for saved tasks.
   var runOnceBtnEdit = document.getElementById('cron-run-once-btn');
   if (runOnceBtnEdit) runOnceBtnEdit.style.display = '';
+  // 1.18.90: surface prompt history link for saved tasks.
+  var historyLinkEdit = document.getElementById('cron-prompt-history-link');
+  if (historyLinkEdit) historyLinkEdit.style.display = '';
   // Render the most recent run from the loaded job into the Last run tab so
   // the user sees something the moment they switch to it (rather than a
   // dead empty pane). The pane updates live when Run task once fires.

package/dist/gateway/router.d.ts

@@ -30,6 +30,11 @@ export declare class Gateway {
      *  `CronRunEntry`. Mirrors the `consumeLastTerminalReason` pattern so we
      *  don't have to refactor `handleCronJob`'s positional return shape. */
     private _lastCronRunMetadata?;
+    /** PRD §10 / 1.18.91: registry of in-flight cron AbortControllers keyed by
+     *  jobName. Lets the dashboard cancel endpoint abort an in-progress run
+     *  without SIGTERMing the whole daemon. Populated/cleaned up by
+     *  handleCronJob. */
+    private cronAbortControllers;
     /** Persisted set of channel keys the owner has approved. Loaded lazily. */
     private seenChannels;
     private _authFailCount;
@@ -178,6 +183,12 @@ export declare class Gateway {
     _mode?: 'standard' | 'unleashed', maxHours?: number, timeoutMs?: number, successCriteria?: string[], agentSlug?: string, pinnedSkills?: string[], allowedTools?: string[], allowedMcpServers?: string[], 
     /** Predictable (contract) mode — runner skips memory/team/auto-skills. */
     predictable?: boolean): Promise<string>;
+    /**
+     * PRD §10 / 1.18.91 — cancel an in-flight cron run by name. Returns true if
+     * an AbortController was found and abort() was called, false if nothing was
+     * registered (job wasn't running on this daemon). Safe to call repeatedly.
+     */
+    cancelCronJob(jobName: string, reason?: string): boolean;
     /**
      * Process a team message as an autonomous task — same multi-phase execution
      * as cron unleashed jobs, so agents can work until done instead of being

package/dist/gateway/router.js

@@ -112,6 +112,11 @@ export class Gateway {
      *  `CronRunEntry`. Mirrors the `consumeLastTerminalReason` pattern so we
      *  don't have to refactor `handleCronJob`'s positional return shape. */
     _lastCronRunMetadata;
+    /** PRD §10 / 1.18.91: registry of in-flight cron AbortControllers keyed by
+     *  jobName. Lets the dashboard cancel endpoint abort an in-progress run
+     *  without SIGTERMing the whole daemon. Populated/cleaned up by
+     *  handleCronJob. */
+    cronAbortControllers = new Map();
     /** Persisted set of channel keys the owner has approved. Loaded lazily. */
     seenChannels = null;
     // Auth circuit breaker — suppresses repeated error spam after consecutive failures
@@ -1987,6 +1992,10 @@ export class Gateway {
             cronAc.abort();
             logger.warn({ jobName, wallMs }, 'Cron job hit wall-clock cap — aborting');
         }, wallMs);
+        // PRD §10 / 1.18.91: register so the dashboard cancel endpoint can find
+        // and abort this controller. Last-write-wins if a duplicate fires (the
+        // concurrency lock prevents that for manual runs, but be defensive).
+        this.cronAbortControllers.set(jobName, cronAc);
         try {
             logger.info(`Running cron job: ${jobName}${workDir ? ` in ${workDir}` : ''}${agentSlug && agentSlug !== 'clementine' ? ` as ${agentSlug}` : ''}`);
             const cronStart = Date.now();
@@ -2047,7 +2056,29 @@ export class Gateway {
         finally {
             clearTimeout(cronTimer);
             releaseLane();
+            // PRD §10 / 1.18.91: deregister only if we're still the owner (a
+            // theoretical re-entry could have replaced us; don't clobber).
+            if (this.cronAbortControllers.get(jobName) === cronAc) {
+                this.cronAbortControllers.delete(jobName);
+            }
+        }
+    }
+    /**
+     * PRD §10 / 1.18.91 — cancel an in-flight cron run by name. Returns true if
+     * an AbortController was found and abort() was called, false if nothing was
+     * registered (job wasn't running on this daemon). Safe to call repeatedly.
+     */
+    cancelCronJob(jobName, reason = 'cancelled-by-dashboard') {
+        const ac = this.cronAbortControllers.get(jobName);
+        if (!ac)
+            return false;
+        if (!ac.signal.aborted) {
+            try {
+                ac.abort(reason);
+            }
+            catch { /* ignore */ }
         }
+        return true;
     }
     // ── Team task execution ──────────────────────────────────────────────
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clementine-agent",
-  "version": "1.18.89",
+  "version": "1.18.91",
   "description": "Clementine — Personal AI Assistant (TypeScript)",
   "type": "module",
   "main": "dist/index.js",