clay-server 2.7.0 → 2.7.1

package/bin/cli.js

@@ -21,8 +21,9 @@ var { execSync, execFileSync, spawn } = require("child_process");
 var qrcode = require("qrcode-terminal");
 var net = require("net");
 
-// Detect dev mode (no separate storage — dev and prod share ~/.clay)
+// Detect dev mode — dev and prod use separate daemon files so they can run simultaneously
 var _isDev = (process.argv[1] && path.basename(process.argv[1]) === "clay-dev") || process.argv.includes("--dev");
+if (_isDev) process.env.CLAY_DEV = "1";
 
 var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");

package/lib/config.js

@@ -70,20 +70,23 @@ var CONFIG_DIR = CLAY_HOME;
 var CLAYRC_PATH = path.join(os.homedir(), ".clayrc");
 var CRASH_INFO_PATH = path.join(CONFIG_DIR, "crash.json");
 
+// Dev mode uses separate daemon files so dev and prod can run simultaneously
+var _devMode = !!process.env.CLAY_DEV;
+
 function configPath() {
-  return path.join(CONFIG_DIR, "daemon.json");
+  return path.join(CONFIG_DIR, _devMode ? "daemon-dev.json" : "daemon.json");
 }
 
 function socketPath() {
   if (process.platform === "win32") {
-    var pipeName = "clay-daemon";
+    var pipeName = _devMode ? "clay-daemon-dev" : "clay-daemon";
     return "\\\\.\\pipe\\" + pipeName;
   }
-  return path.join(CONFIG_DIR, "daemon.sock");
+  return path.join(CONFIG_DIR, _devMode ? "daemon-dev.sock" : "daemon.sock");
 }
 
 function logPath() {
-  return path.join(CONFIG_DIR, "daemon.log");
+  return path.join(CONFIG_DIR, _devMode ? "daemon-dev.log" : "daemon.log");
 }
 
 function ensureConfigDir() {

package/lib/notes.js

@@ -8,8 +8,8 @@ function createNotesManager(opts) {
   var cwd = opts.cwd;
 
   // Storage path: ~/.clay/notes/{encodedCwd}.json
-  var encodedCwd = utils.encodeCwd(cwd);
   var notesDir = path.join(config.CONFIG_DIR, "notes");
+  var encodedCwd = utils.resolveEncodedFile(notesDir, cwd, ".json");
   var notesFile = path.join(notesDir, encodedCwd + ".json");
 
   // In-memory cache

package/lib/project.js

@@ -8,6 +8,7 @@ var { createTerminalManager } = require("./terminal-manager");
 var { createNotesManager } = require("./notes");
 var { fetchLatestVersion, isNewer } = require("./updater");
 var { execFileSync, spawn } = require("child_process");
+var { createLoopRegistry } = require("./scheduler");
 
 var MAX_UPLOAD_BYTES = 50 * 1024 * 1024; // 50 MB
 
@@ -253,8 +254,8 @@ function createProjectContext(opts) {
   // Loop state persistence
   var _loopConfig = require("./config");
   var _loopUtils = require("./utils");
-  var _loopEncodedCwd = _loopUtils.encodeCwd(cwd);
   var _loopDir = path.join(_loopConfig.CONFIG_DIR, "loops");
+  var _loopEncodedCwd = _loopUtils.resolveEncodedFile(_loopDir, cwd, ".json");
   var _loopStatePath = path.join(_loopDir, _loopEncodedCwd + ".json");
 
   function saveLoopState() {
@@ -395,17 +396,71 @@ function createProjectContext(opts) {
       judgeReady: hasJudge,
       loopJsonReady: hasLoopJson,
       bothReady: hasPrompt && hasJudge,
+      taskId: loopState.loopId,
     });
     // Auto-transition to approval phase when both files appear
     if (hasPrompt && hasJudge && loopState.phase === "crafting") {
       loopState.phase = "approval";
       saveLoopState();
+
+      // Parse recommended title from crafting session conversation
+      if (loopState.craftingSessionId && loopState.loopId) {
+        var craftSess = sm.sessions.get(loopState.craftingSessionId);
+        if (craftSess && craftSess.history) {
+          for (var hi = craftSess.history.length - 1; hi >= 0; hi--) {
+            var entry = craftSess.history[hi];
+            var entryText = entry.text || "";
+            var titleMatch = entryText.match(/\[\[LOOP_TITLE:\s*(.+?)\]\]/);
+            if (titleMatch) {
+              var suggestedTitle = titleMatch[1].trim();
+              if (suggestedTitle) {
+                loopRegistry.updateRecord(loopState.loopId, { name: suggestedTitle });
+              }
+              break;
+            }
+          }
+        }
+      }
     }
   }
 
   // Load persisted state on startup
   loadLoopState();
 
+  // --- Loop Registry (unified one-off + scheduled) ---
+  var activeRegistryId = null; // track which registry record triggered current loop
+
+  var loopRegistry = createLoopRegistry({
+    cwd: cwd,
+    onTrigger: function (record) {
+      // Only trigger if no loop is currently active
+      if (loopState.active || loopState.phase === "executing") {
+        console.log("[loop-registry] Skipping trigger — loop already active");
+        return;
+      }
+      // Verify the loop directory and files exist
+      var recDir = path.join(cwd, ".claude", "loops", record.id);
+      try {
+        fs.accessSync(path.join(recDir, "PROMPT.md"));
+        fs.accessSync(path.join(recDir, "JUDGE.md"));
+      } catch (e) {
+        console.error("[loop-registry] Loop files missing for " + record.id);
+        return;
+      }
+      // Set the loopId and start
+      loopState.loopId = record.id;
+      activeRegistryId = record.id;
+      console.log("[loop-registry] Auto-starting loop: " + record.name);
+      send({ type: "schedule_run_started", recordId: record.id });
+      startLoop();
+    },
+    onChange: function (records) {
+      send({ type: "loop_registry_updated", records: records });
+    },
+  });
+  loopRegistry.load();
+  loopRegistry.startTimer();
+
   function startLoop(opts) {
     var loopOpts = opts || {};
     var dir = loopDir();
@@ -654,6 +709,19 @@ function createProjectContext(opts) {
       results: loopState.results,
     });
 
+    // Record result in loop registry
+    if (loopState.loopId) {
+      loopRegistry.recordRun(loopState.loopId, {
+        reason: reason,
+        startedAt: loopState.startedAt,
+        iterations: loopState.iteration,
+      });
+    }
+    if (activeRegistryId) {
+      send({ type: "schedule_run_finished", recordId: activeRegistryId, reason: reason, iterations: loopState.iteration });
+      activeRegistryId = null;
+    }
+
     if (pushModule) {
       var body = reason === "pass"
         ? "Task completed after " + loopState.iteration + " iteration(s)"
@@ -773,6 +841,7 @@ function createProjectContext(opts) {
     sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
     sendTo(ws, { type: "term_list", terminals: tm.list() });
     sendTo(ws, { type: "notes_list", notes: nm.list() });
+    sendTo(ws, { type: "loop_registry_updated", records: loopRegistry.getAll() });
 
     // Ralph Loop availability
     var hasLoopFiles = false;
@@ -809,6 +878,7 @@ function createProjectContext(opts) {
         promptReady: _hasPrompt,
         judgeReady: _hasJudge,
         bothReady: _hasPrompt && _hasJudge,
+        taskId: loopState.loopId,
       });
     }
 
@@ -2019,6 +2089,16 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "loop_start") {
+      // If this loop has a cron schedule, don't run immediately — just confirm registration
+      if (loopState.wizardData && loopState.wizardData.cron) {
+        loopState.active = false;
+        loopState.phase = "done";
+        saveLoopState();
+        send({ type: "loop_finished", reason: "scheduled", iterations: 0, results: [] });
+        send({ type: "ralph_phase", phase: "idle", wizardData: null });
+        send({ type: "loop_scheduled", recordId: loopState.loopId, cron: loopState.wizardData.cron });
+        return;
+      }
       startLoop();
       return;
     }
@@ -2031,17 +2111,29 @@ function createProjectContext(opts) {
     if (msg.type === "ralph_wizard_complete") {
       var wData = msg.data || {};
       var maxIter = wData.maxIterations || 25;
+      var wizardCron = wData.cron || null;
       var newLoopId = generateLoopId();
       loopState.loopId = newLoopId;
       loopState.wizardData = {
-        name: (wData.name || "").replace(/[^a-zA-Z0-9_-]/g, "") || "ralph",
+        name: wData.name || wData.task || "Untitled",
         task: wData.task || "",
         maxIterations: maxIter,
+        cron: wizardCron,
       };
       loopState.phase = "crafting";
       loopState.startedAt = Date.now();
       saveLoopState();
 
+      // Register in loop registry
+      loopRegistry.register({
+        id: newLoopId,
+        name: loopState.wizardData.name,
+        task: wData.task || "",
+        cron: wizardCron,
+        enabled: wizardCron ? true : false,
+        maxIterations: maxIter,
+      });
+
       // Create loop directory and write LOOP.json
       var lDir = loopDir();
       try { fs.mkdirSync(lDir, { recursive: true }); } catch (e) {}
@@ -2051,19 +2143,26 @@ function createProjectContext(opts) {
       fs.renameSync(tmpLoopJson, loopJsonPath);
 
       // Assemble prompt for clay-ralph skill (include loop dir path so skill knows where to write)
-      var craftingPrompt = "/clay-ralph\n## Task\n" + (wData.task || "") +
-        "\n## Loop Directory\n" + lDir;
+      var craftingPrompt = "Use the /clay-ralph skill to design a Ralph Loop for the following task. " +
+        "You MUST invoke the clay-ralph skill — do NOT execute the task yourself. " +
+        "Your job is to interview me, then create PROMPT.md and JUDGE.md files " +
+        "that a future autonomous session will execute.\n\n" +
+        "## Task\n" + (wData.task || "") +
+        "\n\n## Loop Directory\n" + lDir;
 
       // Create a new session for crafting
       var craftingSession = sm.createSession();
       var craftName = (loopState.wizardData && loopState.wizardData.name) || "";
       craftingSession.title = "Ralph" + (craftName ? " " + craftName : "") + " Crafting";
       craftingSession.ralphCraftingMode = true;
+      craftingSession.hidden = true;
       sm.saveSessionFile(craftingSession);
       sm.switchSession(craftingSession.localId);
-      sm.broadcastSessionList();
       loopState.craftingSessionId = craftingSession.localId;
 
+      // Store crafting session ID in the registry record
+      loopRegistry.updateRecord(newLoopId, { craftingSessionId: craftingSession.localId });
+
       // Start .claude/ directory watcher
       startClaudeDirWatch();
 
@@ -2077,11 +2176,27 @@ function createProjectContext(opts) {
       send({ type: "status", status: "processing" });
       sdk.startQuery(craftingSession, craftingPrompt);
 
-      send({ type: "ralph_crafting_started", sessionId: craftingSession.localId });
+      send({ type: "ralph_crafting_started", sessionId: craftingSession.localId, taskId: newLoopId });
       send({ type: "ralph_phase", phase: "crafting", wizardData: loopState.wizardData, craftingSessionId: craftingSession.localId });
       return;
     }
 
+    if (msg.type === "loop_registry_files") {
+      var recId = msg.id;
+      var lDir = path.join(cwd, ".claude", "loops", recId);
+      var promptContent = "";
+      var judgeContent = "";
+      try { promptContent = fs.readFileSync(path.join(lDir, "PROMPT.md"), "utf8"); } catch (e) {}
+      try { judgeContent = fs.readFileSync(path.join(lDir, "JUDGE.md"), "utf8"); } catch (e) {}
+      send({
+        type: "loop_registry_files_content",
+        id: recId,
+        prompt: promptContent,
+        judge: judgeContent,
+      });
+      return;
+    }
+
     if (msg.type === "ralph_preview_files") {
       var promptContent = "";
       var judgeContent = "";
@@ -2129,6 +2244,62 @@ function createProjectContext(opts) {
       return;
     }
 
+    // --- Loop Registry messages ---
+    if (msg.type === "loop_registry_list") {
+      sendTo(ws, { type: "loop_registry_updated", records: loopRegistry.getAll() });
+      return;
+    }
+
+    if (msg.type === "loop_registry_update") {
+      var updatedRec = loopRegistry.update(msg.id, msg.data || {});
+      if (!updatedRec) {
+        sendTo(ws, { type: "loop_registry_error", text: "Record not found" });
+      }
+      return;
+    }
+
+    if (msg.type === "loop_registry_remove") {
+      var removedRec = loopRegistry.remove(msg.id);
+      if (!removedRec) {
+        sendTo(ws, { type: "loop_registry_error", text: "Record not found" });
+      }
+      return;
+    }
+
+    if (msg.type === "loop_registry_toggle") {
+      var toggledRec = loopRegistry.toggleEnabled(msg.id);
+      if (!toggledRec) {
+        sendTo(ws, { type: "loop_registry_error", text: "Record not found or not scheduled" });
+      }
+      return;
+    }
+
+    if (msg.type === "loop_registry_rerun") {
+      // Re-run an existing job (one-off from library)
+      if (loopState.active || loopState.phase === "executing") {
+        sendTo(ws, { type: "loop_registry_error", text: "A loop is already running" });
+        return;
+      }
+      var rerunRec = loopRegistry.getById(msg.id);
+      if (!rerunRec) {
+        sendTo(ws, { type: "loop_registry_error", text: "Record not found" });
+        return;
+      }
+      var rerunDir = path.join(cwd, ".claude", "loops", rerunRec.id);
+      try {
+        fs.accessSync(path.join(rerunDir, "PROMPT.md"));
+        fs.accessSync(path.join(rerunDir, "JUDGE.md"));
+      } catch (e) {
+        sendTo(ws, { type: "loop_registry_error", text: "Loop files missing for " + rerunRec.id });
+        return;
+      }
+      loopState.loopId = rerunRec.id;
+      activeRegistryId = null; // not a scheduled trigger
+      send({ type: "loop_rerun_started", recordId: rerunRec.id });
+      startLoop();
+      return;
+    }
+
     if (msg.type !== "message") return;
     if (!msg.text && (!msg.images || msg.images.length === 0) && (!msg.pastes || msg.pastes.length === 0)) return;
 
@@ -2491,6 +2662,7 @@ function createProjectContext(opts) {
 
   // --- Destroy ---
   function destroy() {
+    loopRegistry.stopTimer();
     stopFileWatch();
     stopAllDirWatches();
     // Abort all active sessions