clay-server 2.15.2 → 2.16.0-beta.2

package/lib/daemon.js

@@ -647,8 +647,17 @@ var relay = createServer({
       hostname: os2.hostname(),
       lanIp: lanIp || null,
       updateChannel: config.updateChannel || "stable",
+      imageRetentionDays: config.imageRetentionDays !== undefined ? config.imageRetentionDays : 7,
     };
   },
+  onSetImageRetention: function (days) {
+    var d = parseInt(days, 10);
+    if (isNaN(d) || d < 0) d = 7;
+    config.imageRetentionDays = d;
+    saveConfig(config);
+    console.log("[daemon] Image retention:", d === 0 ? "forever" : d + " days");
+    return { ok: true, days: d };
+  },
   onSetUpdateChannel: function (channel) {
     config.updateChannel = channel === "beta" ? "beta" : "stable";
     saveConfig(config);

package/lib/project.js

@@ -119,6 +119,47 @@ function createProjectContext(opts) {
   var onCreateWorktree = opts.onCreateWorktree || null;
   var latestVersion = null;
 
+  // --- Chat image storage ---
+  var _imgConfig = require("./config");
+  var _imgUtils = require("./utils");
+  var _imagesBaseDir = path.join(_imgConfig.CONFIG_DIR, "images");
+  var _imagesEncodedCwd = _imgUtils.encodeCwd(cwd);
+  var imagesDir = path.join(_imagesBaseDir, _imagesEncodedCwd);
+
+  // Convert imageRefs in history entries to images with URLs for the client
+  function hydrateImageRefs(entry) {
+    if (!entry || entry.type !== "user_message" || !entry.imageRefs) return entry;
+    var images = [];
+    for (var ri = 0; ri < entry.imageRefs.length; ri++) {
+      var ref = entry.imageRefs[ri];
+      images.push({ mediaType: ref.mediaType, url: "/p/" + slug + "/images/" + ref.file });
+    }
+    var hydrated = {};
+    for (var k in entry) {
+      if (k !== "imageRefs") hydrated[k] = entry[k];
+    }
+    hydrated.images = images;
+    return hydrated;
+  }
+
+  function saveImageFile(mediaType, base64data) {
+    try { fs.mkdirSync(imagesDir, { recursive: true }); } catch (e) {}
+    var ext = mediaType === "image/png" ? ".png" : mediaType === "image/gif" ? ".gif" : mediaType === "image/webp" ? ".webp" : ".jpg";
+    var hash = crypto.createHash("sha256").update(base64data).digest("hex").substring(0, 16);
+    var fileName = Date.now() + "-" + hash + ext;
+    var filePath = path.join(imagesDir, fileName);
+    try {
+      fs.writeFileSync(filePath, Buffer.from(base64data, "base64"));
+      if (process.platform !== "win32") {
+        try { fs.chmodSync(filePath, 0o600); } catch (e) {}
+      }
+      return fileName;
+    } catch (e) {
+      console.error("[images] Failed to save image:", e.message);
+      return null;
+    }
+  }
+
   // --- OS-level user isolation helper ---
   // Returns the Linux username for the session owner.
   // Each session uses its own owner's Claude account and credits.
@@ -372,6 +413,7 @@ function createProjectContext(opts) {
     send: send,
     pushModule: pushModule,
     getSDK: getSDK,
+    mateDisplayName: opts.mateDisplayName || "",
     dangerouslySkipPermissions: dangerouslySkipPermissions,
     onProcessingChanged: onProcessingChanged,
   });
@@ -844,15 +886,25 @@ function createProjectContext(opts) {
       return;
     }
 
+    var gitLog = "";
+    try {
+      gitLog = execFileSync("git", ["log", "--oneline", loopState.baseCommit + "..HEAD"], {
+        cwd: cwd, encoding: "utf8", timeout: 10000,
+      }).trim();
+    } catch (e) {}
+
     var judgePrompt = "You are a judge evaluating whether a coding task has been completed.\n\n" +
       "## Original Task (PROMPT.md)\n\n" + loopState.promptText + "\n\n" +
       "## Evaluation Criteria (JUDGE.md)\n\n" + loopState.judgeText + "\n\n" +
+      "## Commit History\n\n```\n" + (gitLog || "(no commits yet)") + "\n```\n\n" +
       "## Changes Made (git diff)\n\n```diff\n" + diff + "\n```\n\n" +
       "Based on the evaluation criteria, has the task been completed successfully?\n\n" +
-      "Respond with exactly one of:\n" +
+      "IMPORTANT: The git diff above may not show everything. If criteria involve checking whether " +
+      "specific files, classes, or features exist, use tools (Read, Glob, Grep, Bash) to verify " +
+      "directly in the codebase. Do NOT assume something is missing just because it is not in the diff.\n\n" +
+      "After your evaluation, respond with exactly one of:\n" +
       "- PASS: [brief explanation]\n" +
-      "- FAIL: [brief explanation of what is still missing]\n\n" +
-      "Do NOT use any tools. Just analyze and respond.";
+      "- FAIL: [brief explanation of what is still missing]";
 
     var judgeSession = sm.createSession();
     var judgeName = (loopState.wizardData && loopState.wizardData.name) || "";
@@ -900,7 +952,7 @@ function createProjectContext(opts) {
       }
     };
 
-    // Watchdog: judge should complete quickly (no tool use), 3 minutes is generous
+    // Watchdog: judge may use tools to verify, so allow more time
     var judgeWatchdog = setTimeout(function() {
       if (!judgeCompleted && loopState.active && !loopState.stopping) {
         console.error("[ralph-loop] Judge #" + loopState.iteration + " watchdog triggered — onQueryComplete never fired");
@@ -918,7 +970,7 @@ function createProjectContext(opts) {
         });
         setTimeout(function() { runNextIteration(); }, 2000);
       }
-    }, 3 * 60 * 1000);
+    }, 10 * 60 * 1000);
 
     var userMsg = { type: "user_message", text: judgePrompt };
     judgeSession.history.push(userMsg);
@@ -1235,7 +1287,7 @@ function createProjectContext(opts) {
       }
       sendTo(ws, { type: "history_meta", total: total, from: fromIndex });
       for (var i = fromIndex; i < total; i++) {
-        sendTo(ws, active.history[i]);
+        sendTo(ws, hydrateImageRefs(active.history[i]));
       }
       sendTo(ws, { type: "history_done" });
 
@@ -1455,7 +1507,7 @@ function createProjectContext(opts) {
       var targetFrom = typeof msg.target === "number" ? msg.target : before - sm.HISTORY_PAGE_SIZE;
       var from = sm.findTurnBoundary(session.history, Math.max(0, targetFrom));
       var to = before;
-      var items = session.history.slice(from, to);
+      var items = session.history.slice(from, to).map(hydrateImageRefs);
       sendTo(ws, {
         type: "history_prepend",
         items: items,
@@ -2418,7 +2470,7 @@ function createProjectContext(opts) {
 
     // --- Daemon config / server management (admin-only in multi-user mode) ---
     if (msg.type === "get_daemon_config" || msg.type === "set_pin" || msg.type === "set_keep_awake" ||
-        msg.type === "shutdown_server" || msg.type === "restart_server") {
+        msg.type === "set_image_retention" || msg.type === "shutdown_server" || msg.type === "restart_server") {
       if (usersModule.isMultiUser()) {
         var _wsUser = ws._clayUser;
         if (!_wsUser || _wsUser.role !== "admin") {
@@ -2453,6 +2505,14 @@ function createProjectContext(opts) {
       return;
     }
 
+    if (msg.type === "set_image_retention") {
+      if (typeof opts.onSetImageRetention === "function") {
+        var irResult = opts.onSetImageRetention(msg.days);
+        sendTo(ws, { type: "set_image_retention_result", ok: irResult.ok, days: irResult.days });
+      }
+      return;
+    }
+
     if (msg.type === "shutdown_server") {
       if (typeof opts.onShutdown === "function") {
         sendTo(ws, { type: "shutdown_server_result", ok: true });
@@ -3073,18 +3133,62 @@ function createProjectContext(opts) {
           var tmpJudge = judgePath + ".tmp";
           fs.writeFileSync(tmpJudge, wData.judgeText);
           fs.renameSync(tmpJudge, judgePath);
-        } else {
-          // No judge: force single iteration
+        } else if (!recordSource) {
+          // Scheduled task with no judge: force single iteration and go to approval
           var singleJson = loopJsonPath + ".tmp2";
           fs.writeFileSync(singleJson, JSON.stringify({ maxIterations: 1 }, null, 2));
           fs.renameSync(singleJson, loopJsonPath);
+
+          loopState.phase = "approval";
+          saveLoopState();
+          send({ type: "ralph_phase", phase: "approval", source: recordSource, wizardData: loopState.wizardData });
+          send({ type: "ralph_files_status", promptReady: true, judgeReady: false, bothReady: true });
+          return;
+        } else {
+          // Ralph with no judge: start a crafting session to create JUDGE.md
+          loopState.phase = "crafting";
+          saveLoopState();
+
+          var judgeCraftPrompt = "Use the /clay-ralph skill to design ONLY a JUDGE.md for an existing Ralph Loop. " +
+            "The user has already provided PROMPT.md, so do NOT create or modify PROMPT.md. " +
+            "You MUST invoke the clay-ralph skill — do NOT execute the task yourself. " +
+            "Your job is to read the existing PROMPT.md and create a JUDGE.md " +
+            "that will evaluate whether the coder session completed the task successfully.\n\n" +
+            "## Task\n" + (wData.task || "") +
+            "\n\n## Loop Directory\n" + lDir;
+
+          var judgeCraftSession = sm.createSession();
+          judgeCraftSession.title = (isRalphCraft ? "Ralph" : "Task") + (craftName ? " " + craftName : "") + " Crafting";
+          judgeCraftSession.ralphCraftingMode = true;
+          judgeCraftSession.loop = { active: true, iteration: 0, role: "crafting", loopId: newLoopId, name: craftName, source: recordSource, startedAt: loopState.startedAt };
+          sm.saveSessionFile(judgeCraftSession);
+          sm.switchSession(judgeCraftSession.localId);
+          loopState.craftingSessionId = judgeCraftSession.localId;
+
+          loopRegistry.updateRecord(newLoopId, { craftingSessionId: judgeCraftSession.localId });
+
+          startClaudeDirWatch();
+
+          judgeCraftSession.history.push({ type: "user_message", text: judgeCraftPrompt });
+          sm.appendToSessionFile(judgeCraftSession, { type: "user_message", text: judgeCraftPrompt });
+          sendToSession(judgeCraftSession.localId, { type: "user_message", text: judgeCraftPrompt });
+          judgeCraftSession.isProcessing = true;
+          onProcessingChanged();
+          judgeCraftSession.sentToolResults = {};
+          sendToSession(judgeCraftSession.localId, { type: "status", status: "processing" });
+          sdk.startQuery(judgeCraftSession, judgeCraftPrompt, undefined, getLinuxUserForSession(judgeCraftSession));
+
+          send({ type: "ralph_crafting_started", sessionId: judgeCraftSession.localId, taskId: newLoopId, source: recordSource });
+          send({ type: "ralph_phase", phase: "crafting", wizardData: loopState.wizardData, craftingSessionId: judgeCraftSession.localId });
+          send({ type: "ralph_files_status", promptReady: true, judgeReady: false, bothReady: false });
+          return;
         }
 
-        // Go straight to approval (no crafting needed)
+        // Both prompt and judge provided: go straight to approval
         loopState.phase = "approval";
         saveLoopState();
-        send({ type: "ralph_phase", phase: "approval", wizardData: loopState.wizardData });
-        send({ type: "ralph_files_status", promptReady: true, judgeReady: !!wData.judgeText, bothReady: !!wData.judgeText });
+        send({ type: "ralph_phase", phase: "approval", source: recordSource, wizardData: loopState.wizardData });
+        send({ type: "ralph_files_status", promptReady: true, judgeReady: true, bothReady: true });
         return;
       }
 
@@ -3320,13 +3424,25 @@ function createProjectContext(opts) {
     var userMsg = { type: "user_message", text: msg.text || "" };
     if (msg.images && msg.images.length > 0) {
       userMsg.imageCount = msg.images.length;
+      // Save images as files, store URL references in history
+      var imageRefs = [];
+      for (var imgIdx = 0; imgIdx < msg.images.length; imgIdx++) {
+        var img = msg.images[imgIdx];
+        var savedName = saveImageFile(img.mediaType, img.data);
+        if (savedName) {
+          imageRefs.push({ mediaType: img.mediaType, file: savedName });
+        }
+      }
+      if (imageRefs.length > 0) {
+        userMsg.imageRefs = imageRefs;
+      }
     }
     if (msg.pastes && msg.pastes.length > 0) {
       userMsg.pastes = msg.pastes;
     }
     session.history.push(userMsg);
     sm.appendToSessionFile(session, userMsg);
-    sendToSessionOthers(ws, session.localId, userMsg);
+    sendToSessionOthers(ws, session.localId, hydrateImageRefs(userMsg));
 
     if (!session.title) {
       session.title = (msg.text || "Image").substring(0, 50);
@@ -3407,6 +3523,29 @@ function createProjectContext(opts) {
 
   // --- Handle project-scoped HTTP requests ---
   function handleHTTP(req, res, urlPath) {
+    // Serve chat images
+    if (req.method === "GET" && urlPath.indexOf("/images/") === 0) {
+      var imgName = path.basename(urlPath);
+      // Sanitize: only allow expected filename pattern
+      if (!/^\d+-[a-f0-9]+\.\w+$/.test(imgName)) {
+        res.writeHead(400);
+        res.end("Bad request");
+        return true;
+      }
+      var imgPath = path.join(imagesDir, imgName);
+      try {
+        var imgBuf = fs.readFileSync(imgPath);
+        var ext = path.extname(imgName).toLowerCase();
+        var mime = ext === ".png" ? "image/png" : ext === ".gif" ? "image/gif" : ext === ".webp" ? "image/webp" : "image/jpeg";
+        res.writeHead(200, { "Content-Type": mime, "Cache-Control": "public, max-age=86400" });
+        res.end(imgBuf);
+      } catch (e) {
+        res.writeHead(404);
+        res.end("Not found");
+      }
+      return true;
+    }
+
     // File upload
     if (req.method === "POST" && urlPath === "/api/upload") {
       parseJsonBody(req).then(function (body) {
@@ -3861,7 +4000,9 @@ function createProjectContext(opts) {
       var execSync = require("child_process").execSync;
       try {
         var out = execSync("git status --porcelain", { cwd: cwd, encoding: "utf8", timeout: 5000 });
-        var dirty = out.trim().length > 0;
+        var dirty = out.trim().split("\n").some(function (line) {
+          return line.trim().length > 0 && !line.startsWith("??");
+        });
         res.writeHead(200, { "Content-Type": "application/json" });
         res.end(JSON.stringify({ dirty: dirty }));
       } catch (e) {