clay-server 2.27.1 → 2.28.0-beta.1

package/lib/project-loop.js

@@ -269,50 +269,56 @@ function attachLoop(ctx) {
 
   // --- Loop Registry (unified one-off + scheduled) ---
   var activeRegistryId = null; // track which registry record triggered current loop
+  var pendingTriggers = []; // queue for deferred triggers when skipIfRunning=false
+
+  function triggerFromQueue(record) {
+    // For schedule records, resolve the linked task to get loop files
+    var loopFilesId = record.id;
+    if (record.source === "schedule") {
+      if (!record.linkedTaskId) {
+        console.error("[loop-registry] Schedule has no linked task: " + record.name);
+        return;
+      }
+      loopFilesId = record.linkedTaskId;
+      console.log("[loop-registry] Schedule triggered: " + record.name + " -> linked task " + loopFilesId);
+    }
+
+    // Verify the loop directory and PROMPT.md exist
+    var recDir = path.join(cwd, ".claude", "loops", loopFilesId);
+    try {
+      fs.accessSync(path.join(recDir, "PROMPT.md"));
+    } catch (e) {
+      console.error("[loop-registry] PROMPT.md missing for " + loopFilesId);
+      return;
+    }
+    // Set the loopId to the schedule's own id (not the linked task) so sidebar groups correctly
+    loopState.loopId = record.id;
+    loopState.loopFilesId = loopFilesId;
+    // Restore loopMode from LOOP.json so simple loops work correctly on trigger
+    var _triggerCfg = {};
+    try { _triggerCfg = JSON.parse(fs.readFileSync(path.join(recDir, "LOOP.json"), "utf8")); } catch (e) {}
+    loopState.wizardData = { loopMode: _triggerCfg.loopMode || "judge" };
+    activeRegistryId = record.id;
+    console.log("[loop-registry] Auto-starting loop: " + record.name + " (" + loopState.loopId + ")");
+    send({ type: "schedule_run_started", recordId: record.id });
+    startLoop({ maxIterations: record.maxIterations, name: record.name });
+  }
 
   var loopRegistry = createLoopRegistry({
     cwd: cwd,
     onTrigger: function (record) {
-      // Skip trigger if a loop is already active and skipIfRunning is enabled
+      // Skip or queue trigger if a loop is already active
       if (loopState.active || loopState.phase === "executing") {
         if (record.skipIfRunning !== false) {
           console.log("[loop-registry] Skipping trigger for " + record.name + " — loop already active (skipIfRunning)");
           return;
         }
-        console.log("[loop-registry] Loop active but skipIfRunning disabled for " + record.name + "; deferring");
+        console.log("[loop-registry] Loop active, queuing trigger for " + record.name);
+        pendingTriggers.push(record);
         return;
       }
 
-      // For schedule records, resolve the linked task to get loop files
-      var loopFilesId = record.id;
-      if (record.source === "schedule") {
-        if (!record.linkedTaskId) {
-          console.error("[loop-registry] Schedule has no linked task: " + record.name);
-          return;
-        }
-        loopFilesId = record.linkedTaskId;
-        console.log("[loop-registry] Schedule triggered: " + record.name + " → linked task " + loopFilesId);
-      }
-
-      // Verify the loop directory and PROMPT.md exist
-      var recDir = path.join(cwd, ".claude", "loops", loopFilesId);
-      try {
-        fs.accessSync(path.join(recDir, "PROMPT.md"));
-      } catch (e) {
-        console.error("[loop-registry] PROMPT.md missing for " + loopFilesId);
-        return;
-      }
-      // Set the loopId to the schedule's own id (not the linked task) so sidebar groups correctly
-      loopState.loopId = record.id;
-      loopState.loopFilesId = loopFilesId;
-      // Restore loopMode from LOOP.json so simple loops work correctly on trigger
-      var _triggerCfg = {};
-      try { _triggerCfg = JSON.parse(fs.readFileSync(path.join(recDir, "LOOP.json"), "utf8")); } catch (e) {}
-      loopState.wizardData = { loopMode: _triggerCfg.loopMode || "judge" };
-      activeRegistryId = record.id;
-      console.log("[loop-registry] Auto-starting loop: " + record.name + " (" + loopState.loopId + ")");
-      send({ type: "schedule_run_started", recordId: record.id });
-      startLoop({ maxIterations: record.maxIterations, name: record.name });
+      triggerFromQueue(record);
     },
     onChange: function () {
       send({ type: "loop_registry_updated", records: getHubSchedules() });
@@ -383,6 +389,7 @@ function attachLoop(ctx) {
     loopState.results = [];
     loopState.stopping = false;
     loopState.name = loopOpts.name || null;
+    loopState.settings = loopConfig.settings || null;
     loopState.startedAt = Date.now();
     saveLoopState();
 
@@ -500,6 +507,7 @@ function attachLoop(ctx) {
     sendToSession(session.localId, { type: "status", status: "processing" });
     session.acceptEditsAfterStart = true;
     session.singleTurn = true;
+    if (loopState.settings) session.loopSettings = loopState.settings;
     sdk.startQuery(session, loopState.promptText, undefined, getLinuxUserForSession(session));
   }
 
@@ -616,6 +624,7 @@ function attachLoop(ctx) {
     judgeSession.sentToolResults = {};
     judgeSession.acceptEditsAfterStart = true;
     judgeSession.singleTurn = true;
+    if (loopState.settings) judgeSession.loopSettings = loopState.settings;
     sdk.startQuery(judgeSession, judgePrompt, undefined, getLinuxUserForSession(judgeSession));
   }
 
@@ -643,6 +652,16 @@ function attachLoop(ctx) {
 
   function finishLoop(reason) {
     console.log("[ralph-loop] finishLoop called, reason: " + reason + ", iteration: " + loopState.iteration);
+
+    // Unlock the last coder session so users can continue interacting with it
+    if (loopState.currentSessionId) {
+      var lastCoderSession = sm.sessions.get(loopState.currentSessionId);
+      if (lastCoderSession) {
+        lastCoderSession.singleTurn = false;
+        lastCoderSession.loop.active = false;
+      }
+    }
+
     loopState.active = false;
     loopState.phase = "done";
     loopState.stopping = false;
@@ -690,6 +709,15 @@ function attachLoop(ctx) {
         sessionId: loopState.currentSessionId,
       });
     }
+
+    // Process next queued trigger if any
+    if (pendingTriggers.length > 0) {
+      var next = pendingTriggers.shift();
+      console.log("[loop-registry] Processing queued trigger: " + next.name);
+      setTimeout(function () {
+        triggerFromQueue(next);
+      }, 1000);
+    }
   }
 
   function resumeLoop() {
@@ -774,6 +802,17 @@ function attachLoop(ctx) {
         send({ type: "loop_scheduled", recordId: loopState.loopId, cron: loopState.wizardData.cron });
         return true;
       }
+      // Save per-loop settings to LOOP.json if provided
+      if (msg.settings && Object.keys(msg.settings).length > 0) {
+        var lDir3 = loopDir();
+        if (lDir3) {
+          var ljPath = path.join(lDir3, "LOOP.json");
+          var lj = {};
+          try { lj = JSON.parse(fs.readFileSync(ljPath, "utf8")); } catch (e) {}
+          lj.settings = msg.settings;
+          fs.writeFileSync(ljPath, JSON.stringify(lj, null, 2), "utf8");
+        }
+      }
       startLoop({ maxIterations: msg.maxIterations });
       return true;
     }
@@ -789,6 +828,7 @@ function attachLoop(ctx) {
       var wizardCron = wData.cron || null;
       var newLoopId = generateLoopId();
       loopState.loopId = newLoopId;
+      var recordSource = wData.source === "task" ? null : "ralph";
       loopState.wizardData = {
         name: wData.name || wData.task || "Untitled",
         task: wData.task || "",
@@ -797,13 +837,13 @@ function attachLoop(ctx) {
         loopMode: wData.loopMode || "judge",
         promptAuthor: wData.promptAuthor || "clay",
         judgeAuthor: wData.judgeAuthor || null,
+        source: recordSource,
       };
       loopState.phase = "crafting";
       loopState.startedAt = Date.now();
       saveLoopState();
 
       // Register in loop registry
-      var recordSource = wData.source === "task" ? null : "ralph";
       loopRegistry.register({
         id: newLoopId,
         name: loopState.wizardData.name,
@@ -963,17 +1003,59 @@ function attachLoop(ctx) {
       var lDir = path.join(cwd, ".claude", "loops", recId);
       var promptContent = "";
       var judgeContent = "";
+      var loopSettings = null;
       try { promptContent = fs.readFileSync(path.join(lDir, "PROMPT.md"), "utf8"); } catch (e) {}
       try { judgeContent = fs.readFileSync(path.join(lDir, "JUDGE.md"), "utf8"); } catch (e) {}
+      try {
+        var loopJson = JSON.parse(fs.readFileSync(path.join(lDir, "LOOP.json"), "utf8"));
+        loopSettings = loopJson.settings || null;
+      } catch (e) {}
       send({
         type: "loop_registry_files_content",
         id: recId,
         prompt: promptContent,
         judge: judgeContent,
+        settings: loopSettings,
       });
       return true;
     }
 
+    if (msg.type === "loop_registry_save_files") {
+      var recId2 = msg.id;
+      var lDir2 = path.join(cwd, ".claude", "loops", recId2);
+      try {
+        fs.mkdirSync(lDir2, { recursive: true });
+        if (msg.prompt !== undefined) {
+          fs.writeFileSync(path.join(lDir2, "PROMPT.md"), msg.prompt, "utf8");
+        }
+        if (msg.judge !== undefined) {
+          fs.writeFileSync(path.join(lDir2, "JUDGE.md"), msg.judge, "utf8");
+        }
+        if (msg.settings !== undefined) {
+          var loopJsonPath2 = path.join(lDir2, "LOOP.json");
+          var loopJson2 = {};
+          try { loopJson2 = JSON.parse(fs.readFileSync(loopJsonPath2, "utf8")); } catch (e) {}
+          loopJson2.settings = msg.settings;
+          fs.writeFileSync(loopJsonPath2, JSON.stringify(loopJson2, null, 2), "utf8");
+        }
+        send({ type: "loop_registry_save_files_result", id: recId2, ok: true });
+        // Re-send updated content so the UI refreshes
+        var updatedPrompt = "";
+        var updatedJudge = "";
+        var updatedSettings = null;
+        try { updatedPrompt = fs.readFileSync(path.join(lDir2, "PROMPT.md"), "utf8"); } catch (e) {}
+        try { updatedJudge = fs.readFileSync(path.join(lDir2, "JUDGE.md"), "utf8"); } catch (e) {}
+        try {
+          var uj = JSON.parse(fs.readFileSync(path.join(lDir2, "LOOP.json"), "utf8"));
+          updatedSettings = uj.settings || null;
+        } catch (e) {}
+        send({ type: "loop_registry_files_content", id: recId2, prompt: updatedPrompt, judge: updatedJudge, settings: updatedSettings });
+      } catch (e) {
+        send({ type: "loop_registry_save_files_result", id: recId2, ok: false, error: e.message });
+      }
+      return true;
+    }
+
     if (msg.type === "ralph_preview_files") {
       var promptContent = "";
       var judgeContent = "";
@@ -1174,7 +1256,7 @@ function attachLoop(ctx) {
 
     // Ralph phase state
     // Derive source from wizardData for reconnect (so client can distinguish ralph vs task)
-    var _connSource = (loopState.wizardData && loopState.wizardData.source === "task") ? null : "ralph";
+    var _connSource = loopState.wizardData ? (loopState.wizardData.source || null) : null;
     sendTo(ws, {
       type: "ralph_phase",
       phase: loopState.phase,

package/lib/project-user-message.js

@@ -230,9 +230,11 @@ function attachUserMessage(ctx) {
 
     // --- Scheduled tasks permission gate ---
     if (msg.type === "loop_start" || msg.type === "loop_stop" || msg.type === "loop_registry_files" ||
-        msg.type === "loop_registry_list" || msg.type === "loop_registry_update" || msg.type === "loop_registry_rename" ||
-        msg.type === "loop_registry_remove" || msg.type === "loop_registry_convert" || msg.type === "loop_registry_toggle" ||
-        msg.type === "loop_registry_rerun" || msg.type === "schedule_create" || msg.type === "schedule_move") {
+        msg.type === "loop_registry_save_files" || msg.type === "loop_registry_list" ||
+        msg.type === "loop_registry_update" || msg.type === "loop_registry_rename" ||
+        msg.type === "loop_registry_remove" || msg.type === "loop_registry_convert" ||
+        msg.type === "loop_registry_toggle" || msg.type === "loop_registry_rerun" ||
+        msg.type === "schedule_create" || msg.type === "schedule_move") {
       if (ws._clayUser) {
         var schPerms = usersModule.getEffectivePermissions(ws._clayUser, osUsers);
         if (!schPerms.scheduledTasks) {

package/lib/public/css/scheduler-modal.css

@@ -598,6 +598,161 @@
   text-align: center;
 }
 
+#sched-create-desc-row.hidden { display: none; }
+
+.sched-create-row-icon-spacer {
+  width: 15px;
+  flex-shrink: 0;
+}
+
+.sched-review-toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-top: 10px;
+  font-size: 13px;
+  color: var(--text-secondary);
+  cursor: pointer;
+}
+
+.sched-review-toggle input[type="checkbox"] {
+  accent-color: var(--accent);
+}
+
+.sched-review-label {
+  flex-shrink: 0;
+}
+
+.sched-review-count {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+}
+
+.sched-review-count.hidden {
+  display: none;
+}
+
+.sched-create-desc-wrap {
+  margin-top: 10px;
+}
+
+.sched-create-desc-wrap .sched-create-row-textarea {
+  width: 100%;
+}
+
+/* --- Accordion sections --- */
+.sched-accordion-divider {
+  height: 1px;
+  background: var(--border);
+  margin: 4px 14px 0;
+  opacity: 0.5;
+}
+
+.sched-accordion-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  padding: 8px 14px;
+  background: none;
+  border: none;
+  cursor: pointer;
+  color: var(--text);
+  transition: background 0.12s;
+  text-align: left;
+}
+
+.sched-accordion-header:hover {
+  background: var(--hover);
+}
+
+.sched-accordion-header-left {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.sched-accordion-icon {
+  width: 15px;
+  height: 15px;
+  color: var(--text-dimmer);
+  flex-shrink: 0;
+}
+
+.sched-accordion.has-value .sched-accordion-icon {
+  color: var(--accent);
+}
+
+.sched-accordion-text {
+  display: flex;
+  flex-direction: column;
+}
+
+.sched-accordion-title {
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1.2;
+}
+
+.sched-accordion-subtitle {
+  font-size: 11px;
+  color: var(--text-dimmer);
+  line-height: 1.3;
+  margin-top: 1px;
+}
+
+.sched-accordion-header-right {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.sched-accordion-clear {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  color: var(--text-dimmer);
+  transition: background 0.12s, color 0.12s;
+}
+
+.sched-accordion-clear:hover {
+  background: var(--hover);
+  color: var(--text);
+}
+
+.sched-accordion-clear .lucide {
+  width: 12px;
+  height: 12px;
+}
+
+.sched-accordion-clear.hidden {
+  display: none;
+}
+
+.sched-accordion-chevron {
+  width: 14px;
+  height: 14px;
+  color: var(--text-dimmer);
+  flex-shrink: 0;
+  transition: transform 0.2s ease;
+}
+
+.sched-accordion.open .sched-accordion-chevron {
+  transform: rotate(90deg);
+}
+
+.sched-accordion-body {
+  padding: 4px 14px 10px 39px;
+}
+
+.sched-accordion-body.hidden {
+  display: none;
+}
+
 /* --- Bottom bar --- */
 .sched-create-bottom {
   display: flex;
@@ -1061,7 +1216,7 @@
   max-width: 100px;
 }
 
-.sched-custom-repeat-panel .sched-field-select {
+.sched-accordion-body .sched-field-select {
   padding: 5px 26px 5px 8px;
   font-size: 12px;
   border-radius: 6px;

package/lib/public/css/scheduler.css

@@ -1103,6 +1103,12 @@
   overflow-y: auto;
   padding: 20px 24px;
 }
+
+.scheduler-detail-body:has(.scheduler-file-editor) {
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
 .scheduler-detail-loading {
   padding: 32px;
   text-align: center;
@@ -1114,6 +1120,81 @@
   line-height: 1.6;
   color: var(--text);
 }
+
+.scheduler-file-toolbar {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-bottom: 12px;
+}
+
+.scheduler-file-edit-btn,
+.scheduler-file-save-btn,
+.scheduler-file-cancel-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 10px;
+  font-size: 12px;
+  border-radius: 6px;
+  border: 1px solid var(--border);
+  background: var(--bg-secondary);
+  color: var(--text-secondary);
+  cursor: pointer;
+  transition: background 0.15s, border-color 0.15s;
+}
+
+.scheduler-file-edit-btn:hover,
+.scheduler-file-cancel-btn:hover {
+  border-color: var(--text-dimmer);
+  background: var(--hover);
+}
+
+.scheduler-file-save-btn {
+  background: var(--accent);
+  color: #fff;
+  border-color: var(--accent);
+}
+
+.scheduler-file-save-btn:hover {
+  opacity: 0.9;
+}
+
+.scheduler-file-edit-btn .lucide,
+.scheduler-file-save-btn .lucide,
+.scheduler-file-cancel-btn .lucide {
+  width: 12px;
+  height: 12px;
+}
+
+.scheduler-file-editor {
+  width: 100%;
+  flex: 1;
+  min-height: 0;
+  padding: 12px;
+  font-family: "SF Mono", "Fira Code", "Consolas", monospace;
+  font-size: 13px;
+  line-height: 1.6;
+  color: var(--text);
+  background: var(--bg-secondary);
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  resize: none;
+  outline: none;
+}
+
+.scheduler-file-editor:focus {
+  border-color: var(--accent);
+}
+
+.scheduler-model-settings {
+  max-width: 640px;
+  margin: 0 auto;
+}
+
+.scheduler-model-settings .settings-card {
+  margin-bottom: 16px;
+}
 .scheduler-detail-meta {
   display: grid;
   grid-template-columns: auto 1fr;