clay-server 3.3.0-beta.1 → 3.3.0

package/lib/project-email.js

@@ -9,31 +9,6 @@ var smtp = require("./smtp");
 var { CONFIG_DIR } = require("./config");
 
 var AUDIT_LOG_PATH = path.join(CONFIG_DIR, "email-audit.jsonl");
-var EMAIL_DEFAULTS_DIR = path.join(CONFIG_DIR, "email-defaults");
-
-// --- Project-level email defaults ---
-// Stores which email accounts should be auto-enabled for every new session.
-
-function loadEmailDefaults(slug) {
-  try {
-    var filePath = path.join(EMAIL_DEFAULTS_DIR, slug + ".json");
-    var data = JSON.parse(fs.readFileSync(filePath, "utf8"));
-    return data.accounts || [];
-  } catch (e) {
-    return [];
-  }
-}
-
-function saveEmailDefaults(slug, accountIds) {
-  try {
-    fs.mkdirSync(EMAIL_DEFAULTS_DIR, { recursive: true });
-    var filePath = path.join(EMAIL_DEFAULTS_DIR, slug + ".json");
-    fs.writeFileSync(filePath, JSON.stringify({ accounts: accountIds }), "utf8");
-  } catch (e) {
-    console.error("[email] Failed to save defaults:", e.message);
-  }
-}
-
 // --- Audit log (Server SMTP only) ---
 
 function appendAuditLog(entry) {
@@ -185,7 +160,6 @@ function formatTimeAgo(date) {
 function attachEmail(ctx) {
   var slug = ctx.slug;
   var send = ctx.send;
-  var sendTo = ctx.sendTo;
   var clients = ctx.clients;
   var loadContextSources = ctx.loadContextSources;
   var getUserIdForWs = ctx.getUserIdForWs;
@@ -327,17 +301,6 @@ function attachEmail(ctx) {
         }
       }
     }
-    // Fallback: if no session-level sources found, check project email defaults
-    if (result.length === 0) {
-      var defaults = loadEmailDefaults(slug);
-      for (var di = 0; di < defaults.length; di++) {
-        var dec = emailAccounts.getAccountDecrypted(userId, defaults[di]);
-        if (dec && !seen[dec.id]) {
-          seen[dec.id] = true;
-          result.push(dec);
-        }
-      }
-    }
     return result;
   }
 
@@ -376,28 +339,6 @@ function attachEmail(ctx) {
     };
   }
 
-  function handleEmailMessage(ws, msg) {
-    if (msg.type === "email_defaults_get") {
-      var defaults = loadEmailDefaults(slug);
-      sendTo(ws, { type: "email_defaults", accounts: defaults });
-      return true;
-    }
-    if (msg.type === "email_defaults_save") {
-      var accountIds = msg.accounts || [];
-      saveEmailDefaults(slug, accountIds);
-      // Broadcast to all clients on this project
-      var _defMsg = JSON.stringify({ type: "email_defaults", accounts: accountIds });
-      for (var c of clients) { if (c.readyState === 1) c.send(_defMsg); }
-      return true;
-    }
-    return false;
-  }
-
-  // Get default email account IDs for new sessions
-  function getEmailDefaults() {
-    return loadEmailDefaults(slug);
-  }
-
   function destroy() {
     if (pollTimer) {
       clearInterval(pollTimer);
@@ -421,10 +362,8 @@ function attachEmail(ctx) {
   }
 
   return {
-    handleEmailMessage: handleEmailMessage,
     getEmailContext: getEmailContext,
     getCheckedEmailAccounts: getCheckedEmailAccounts,
-    getEmailDefaults: getEmailDefaults,
     createMcpDeps: createMcpDeps,
     hasEmailCapability: hasEmailCapability,
     destroy: destroy,

package/lib/project-http.js

@@ -5,6 +5,7 @@ var crypto = require("crypto");
 var { execFileSync, spawn } = require("child_process");
 var { fsAsUser } = require("./os-users");
 var usersModule = require("./users");
+var gitCli = require("./git-cli");
 
 var IMAGE_EXTS = new Set([".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg", ".bmp", ".ico"]);
 var MIME_TYPES = {
@@ -47,6 +48,7 @@ function attachHTTP(ctx) {
   var slug = ctx.slug;
   var project = ctx.project;
   var sm = ctx.sm;
+  var gitAttribution = ctx.gitAttribution;
   var send = ctx.send;
   var imagesDir = ctx.imagesDir;
   var osUsers = ctx.osUsers;
@@ -643,7 +645,108 @@ function attachHTTP(ctx) {
       return true;
     }
 
-    // Git dirty check
+    // Git panel status and actions
+    var isGitPanelRequest = urlPath === "/api/git/status" ||
+      urlPath === "/api/git/action" || urlPath.indexOf("/api/git/file-diff?") === 0 ||
+      urlPath.indexOf("/api/git/session-diff?") === 0;
+    if (isGitPanelRequest && usersModule.isMultiUser()) {
+      var gitRequestUser = req._clayUser;
+      var gitPermissions = gitRequestUser ? usersModule.getEffectivePermissions(gitRequestUser, osUsers) : null;
+      if (!gitPermissions || !gitPermissions.fileBrowser) {
+        res.writeHead(403, { "Content-Type": "application/json" });
+        res.end('{"error":"Git access is not permitted"}');
+        return true;
+      }
+    }
+
+    if (req.method === "GET" && urlPath === "/api/git/status") {
+      var gitUserInfo = getOsUserInfoForReq(req);
+      try {
+        var gitStatus = gitCli.getStatus(cwd, gitUserInfo);
+        if (gitAttribution) {
+          var visibleGitSessions = sm.sessions;
+          if (usersModule.isMultiUser() && req._clayUser) {
+            visibleGitSessions = new Map();
+            sm.sessions.forEach(function (session, id) {
+              if (usersModule.canAccessSession(req._clayUser.id, session, { visibility: "public" })) {
+                visibleGitSessions.set(id, session);
+              }
+            });
+          }
+          gitAttribution.decorateStatus(gitStatus, visibleGitSessions);
+        }
+        res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify(gitStatus));
+      } catch (e) {
+        res.writeHead(500, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: e.message || "Unable to read Git status" }));
+      }
+      return true;
+    }
+
+    if (req.method === "GET" && urlPath.indexOf("/api/git/file-diff?") === 0) {
+      var gitDiffParams = new URLSearchParams(urlPath.slice(urlPath.indexOf("?")));
+      var gitDiffPath = gitDiffParams.get("path");
+      if (!gitDiffPath) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end('{"error":"Missing file path"}');
+        return true;
+      }
+      try {
+        var gitDiffResult = gitCli.getFileDiff(cwd, gitDiffPath, getOsUserInfoForReq(req));
+        res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify(gitDiffResult));
+      } catch (e) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: e.message || "Unable to read file diff" }));
+      }
+      return true;
+    }
+
+    if (req.method === "GET" && urlPath.indexOf("/api/git/session-diff?") === 0) {
+      var sessionDiffParams = new URLSearchParams(urlPath.slice(urlPath.indexOf("?")));
+      var sessionDiffKey = sessionDiffParams.get("session");
+      var sessionDiffPath = sessionDiffParams.get("path");
+      if (!gitAttribution || !sessionDiffKey || !sessionDiffPath) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end('{"error":"Missing session comparison"}');
+        return true;
+      }
+      try {
+        var requestedSessionVisible = false;
+        sm.sessions.forEach(function (session) {
+          var key = session.cliSessionId || ("local:" + session.localId);
+          if (key !== sessionDiffKey) return;
+          requestedSessionVisible = !usersModule.isMultiUser() ||
+            (req._clayUser && usersModule.canAccessSession(req._clayUser.id, session, { visibility: "public" }));
+        });
+        if (!requestedSessionVisible) throw new Error("Session comparison is unavailable");
+        var sessionDiff = gitAttribution.getSessionBaselineDiff(sessionDiffKey, sessionDiffPath, getOsUserInfoForReq(req));
+        res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify(sessionDiff));
+      } catch (e) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: e.message || "Unable to compare session changes" }));
+      }
+      return true;
+    }
+
+    if (req.method === "POST" && urlPath === "/api/git/action") {
+      var gitActionUserInfo = getOsUserInfoForReq(req);
+      parseJsonBody(req).then(function (body) {
+        return gitCli.runAction(cwd, body, gitActionUserInfo);
+      }).then(function (output) {
+        var updatedStatus = gitCli.getStatus(cwd, gitActionUserInfo);
+        res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify({ ok: true, output: output, status: updatedStatus }));
+      }).catch(function (err) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: err.userMessage || err.message || "Git action failed" }));
+      });
+      return true;
+    }
+
+    // Legacy dirty check used by the Ralph Loop flow
     if (req.method === "GET" && urlPath === "/api/git-dirty") {
       try {
         var out = execFileSync("git", ["status", "--porcelain"], { cwd: cwd, encoding: "utf8", timeout: 5000 });

package/lib/project-sessions.js

@@ -104,7 +104,6 @@ function attachSessions(ctx) {
   var getLatestVersion = ctx.getLatestVersion;
   var setLatestVersion = ctx.setLatestVersion;
   var loadContextSources = ctx.loadContextSources;
-  var saveContextSources = ctx.saveContextSources;
 
   // Resolve the active user's Claude open-mode preference ('gui' or 'tui').
   // Multi-user mode reads per-user storage; single-user mode falls back to
@@ -516,7 +515,7 @@ function attachSessions(ctx) {
         // Reuse an existing blank GUI session instead of stacking another
         // one. A vendor-less blank is acceptable: nothing has happened in it,
         // so stamping the requested vendor is equivalent to a fresh create.
-        var reusable = sm.findReusableBlankSession({
+        var reusable = msg.forceNew === true ? null : sm.findReusableBlankSession({
           vendor: sessionOpts.vendor || null,
           ownerId: sessionOpts.ownerId || null,
         });
@@ -542,15 +541,6 @@ function attachSessions(ctx) {
         }
         send({ type: "last_vendor", vendor: msg.vendor });
       }
-      // Apply project-level email defaults to new session
-      if (typeof ctx._email === "object" && ctx._email.getEmailDefaults) {
-        var emailDefaults = ctx._email.getEmailDefaults();
-        if (emailDefaults.length > 0) {
-          var defaultSources = emailDefaults.map(function (id) { return "email:" + id; });
-          saveContextSources(slug, newSess.localId, defaultSources);
-          sendTo(ws, { type: "context_sources_state", active: defaultSources });
-        }
-      }
       var nsPresKey = ws._clayUser ? ws._clayUser.id : "_default";
       if (!ws._clayPane) userPresence.setPresence(slug, nsPresKey, newSess.localId, null);
       if (usersModule.isMultiUser() && !ws._clayPane) {

package/lib/project-user-message.js

@@ -57,6 +57,7 @@ function attachUserMessage(ctx) {
   var imagesDir = ctx.imagesDir;
 
   var onProcessingChanged = ctx.onProcessingChanged;
+  var gitAttribution = ctx.gitAttribution;
 
   var _loop = ctx._loop;
   var browserState = ctx.browserState;
@@ -293,6 +294,7 @@ function attachUserMessage(ctx) {
 
     var session = getSessionForWs(ws);
     if (!session) return true;
+    if (gitAttribution) gitAttribution.beginTurn(session);
 
     // Bind vendor to session on first message (if not already set)
     if (!session.vendor && msg.vendor) {

package/lib/project.js

@@ -3,6 +3,7 @@ var path = require("path");
 var os = require("os");
 var crypto = require("crypto");
 var { createSessionManager } = require("./sessions");
+var { attachGitSessionAttribution } = require("./git-session-attribution");
 var { createSDKBridge, createMessageQueue } = require("./sdk-bridge");
 var { createTerminalManager } = require("./terminal-manager");
 var { createNotesManager } = require("./notes");
@@ -172,7 +173,9 @@ function createProjectContext(opts) {
   // --- YOKE adapters (multi-vendor, lazy init) ---
   var _yokeState = yoke.createAdapters({ cwd: cwd, slug: slug, osUsers: osUsers });
   var adapters = _yokeState.adapters;
-  var defaultVendor = adapters.claude ? "claude" : Object.keys(adapters)[0] || "claude";
+  // A new project has no remembered vendor. Select the first installed
+  // provider by the shared Claude -> Codex -> Kiro preference order.
+  var defaultVendor = yoke.resolveDefaultVendor(adapters);
   var adapter = adapters[defaultVendor] || null;
 
   // Browser MCP server runs in-process via createSdkMcpServer (no child process spawn).
@@ -399,6 +402,7 @@ function createProjectContext(opts) {
   var stopAllDirWatches = _fileWatch.stopAllDirWatches;
 
   // --- Session manager ---
+  var _gitAttribution = null;
   var sm = createSessionManager({
     cwd: cwd,
     send: send,
@@ -417,7 +421,17 @@ function createProjectContext(opts) {
         fn(ws, filterFn);
       }
     },
-    onSessionDone: onSessionDone,
+    onSessionDone: function (session) {
+      if (_gitAttribution) _gitAttribution.finishTurn(session);
+      onSessionDone();
+    },
+  });
+  _gitAttribution = attachGitSessionAttribution({
+    cwd: cwd,
+    getOsUserInfoForSession: function (session) {
+      var linuxUser = getLinuxUserForSession(session);
+      return linuxUser ? resolveOsUserInfo(linuxUser) : null;
+    },
   });
   sm.availableVendors = Object.keys(adapters);
   sm.defaultVendor = defaultVendor;
@@ -1152,9 +1166,6 @@ function createProjectContext(opts) {
       return;
     }
 
-    // --- Email defaults (project-level) ---
-    if (_email.handleEmailMessage(ws, msg)) return;
-
     // --- MCP bridge (remote MCP servers via extension) ---
     if (_mcp.handleMcpMessage(ws, msg)) return;
 
@@ -1408,6 +1419,7 @@ function createProjectContext(opts) {
     saveImageFile: saveImageFile,
     imagesDir: imagesDir,
     onProcessingChanged: onProcessingChanged,
+    gitAttribution: _gitAttribution,
     _loop: _loop,
     browserState: browserState,
     sendExtensionCommandAny: sendExtensionCommandAny,
@@ -1619,6 +1631,7 @@ function createProjectContext(opts) {
     slug: slug,
     project: title || project,
     sm: sm,
+    gitAttribution: _gitAttribution,
     send: send,
     imagesDir: imagesDir,
     osUsers: osUsers,

package/lib/public/app.js

@@ -25,8 +25,9 @@ import { initNotifications, showDoneNotification, playDoneSound, isNotifAlertEna
 import { initInput, clearPendingImages, handleInputSync, autoResize, builtinCommands, sendMessage, hasSendableContent, setScheduleBtnDisabled, setScheduleDelayMs, clearScheduleDelay } from './modules/input.js';
 import { initQrCode, triggerShare } from './modules/qrcode.js';
 import { initFileBrowser, loadRootDirectory, refreshTree, handleFsList, handleFsRead, handleDirChanged, refreshIfOpen, handleFileChanged, handleFileHistory, handleGitDiff, handleFileAt, getPendingNavigate, closeFileViewer, resetFileBrowser } from './modules/filebrowser.js';
+import { initGitPanel } from './modules/git-panel.js';
 import { initTerminal, openTerminal, closeTerminal, resetTerminals, handleTermList, handleTermCreated, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed, sendTerminalCommand } from './modules/terminal.js';
-import { initContextSources, initEmailDefaultsModal, updateTerminalList, updateBrowserTabList, handleContextSourcesState, getActiveSources, hasActiveSources } from './modules/context-sources.js';
+import { initContextSources, updateTerminalList, updateBrowserTabList, handleContextSourcesState, getActiveSources, hasActiveSources } from './modules/context-sources.js';
 import { initStickyNotes, handleNotesList, handleNoteCreated, handleNoteUpdated, handleNoteDeleted, openArchive, closeArchive, isArchiveOpen, hideNotes, showNotes, isNotesVisible, createNote } from './modules/sticky-notes.js';
 import { initTheme, getThemeColor, getComputedVar, onThemeChange, getCurrentTheme, getChatLayout } from './modules/theme.js';
 import { initTools, resetToolState, saveToolState, restoreToolState, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionResolved, markPermissionCancelled, renderElicitationRequest, markElicitationResolved, renderPlanBanner, renderPlanCard, handleTodoWrite, handleTaskCreate, handleTaskUpdate, startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, addTurnMeta, resetTurnMetaCost, enableMainInput, getTools, getPlanContent, setPlanContent, isPlanFilePath, getTodoTools, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, updateSubagentProgress, initSubagentStop, closeToolGroup, removeToolFromGroup } from './modules/tools.js';
@@ -324,6 +325,13 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     currentFullText: "",
     matePreThinkingEl: null,
     // panels
+    fileViewerFullscreen: false,
+    markdownSlidesActive: false,
+    markdownSlideIndex: 0,
+    markdownSlideCount: 0,
+    markdownSlideLevel: 1,
+    markdownSlidePreferredLevel: 1,
+    markdownSlideLevelExplicit: false,
     currentModel: "",
     currentModels: [],
     // Project's last-used vendor; seeds the sidebar's "New session" button.
@@ -875,6 +883,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       if (!_perms.fileBrowser) {
         var fbBtn = document.getElementById("file-browser-btn");
         if (fbBtn) fbBtn.style.display = "none";
+        var gitBtn = document.getElementById("git-sidebar-btn");
+        if (gitBtn) gitBtn.style.display = "none";
       }
       if (!_perms.skills) {
         var sBtn = document.getElementById("skills-btn");
@@ -963,6 +973,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     fileTreeEl: $("file-tree"),
     fileViewerEl: $("file-viewer"),
   });
+  initGitPanel();
 
   // --- Terminal ---
   initTerminal({
@@ -1047,8 +1058,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // Close archive / scheduler panel when switching to other sidebar panels
   var fileBrowserBtn = $("file-browser-btn");
+  var gitSidebarBtn = $("git-sidebar-btn");
   var terminalSidebarBtn = $("terminal-sidebar-btn");
   if (fileBrowserBtn) fileBrowserBtn.addEventListener("click", function () { if (isArchiveOpen()) closeArchive(); if (isSchedulerOpen()) closeScheduler(); });
+  if (gitSidebarBtn) gitSidebarBtn.addEventListener("click", function () { if (isArchiveOpen()) closeArchive(); if (isSchedulerOpen()) closeScheduler(); });
   if (terminalSidebarBtn) terminalSidebarBtn.addEventListener("click", function () { if (isArchiveOpen()) closeArchive(); if (isSchedulerOpen()) closeScheduler(); });
 
   // --- Ralph Loop UI (delegated to app-loop-ui.js + app-loop-wizard.js) ---
@@ -1114,7 +1127,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- MCP Servers ---
   initMcp();
-  initEmailDefaultsModal();
 
   // --- Skills ---
   initSkills();