clay-server 5.1.0-beta.1 → 5.1.0-beta.2

package/lib/project-connection.js

@@ -6,6 +6,7 @@ var emailAccounts = require("./email-accounts");
 var { getCodexConfig } = require("./codex-defaults");
 var yoke = require("./yoke");
 var permissionModes = require("./session-permission-mode");
+var sessionProvenance = require("./session-provenance");
 
 function dispatchMessageSafely(handleMessage, sendTo, slug, ws, msg) {
   try {
@@ -45,6 +46,36 @@ function buildInitialModelInfo(sm, initialVendor, initialModel, initialModels, s
   };
 }
 
+function buildRestoredSessionMessage(active, initialEffort, capabilities, permissionState) {
+  return {
+    type: "session_switched",
+    id: active.localId,
+    sessionOriginId: active.sessionOriginId || null,
+    sessionRole: sessionProvenance.isWorker(active) ? "worker" : "driver",
+    cliSessionId: active.cliSessionId || null,
+    loop: active.loop || null,
+    vendor: active.vendor || null,
+    model: active.model || null,
+    effort: active.effort || initialEffort || null,
+    hasHistory: !!(active.history && active.history.length > 0),
+    capabilities: capabilities,
+    isProcessing: !!active.isProcessing,
+    mateCreation: active.mateCreationMode === true,
+    mateCreationPhase: active.homeMateCreationPhase || null,
+    debatePlanning: active.debateSetupMode === true,
+    debatePhase: active.homeDebatePhase || null,
+    mode: active.mode || "gui",
+    terminalId: typeof active.terminalId === "number" ? active.terminalId : null,
+    runtimeMode: active.runtimeMode || null,
+    runtimeTerminalId: typeof active.runtimeTerminalId === "number" ? active.runtimeTerminalId : null,
+    tuiSuspended: !!active.tuiSuspended,
+    permissionMode: permissionState.requestedPermissionMode,
+    effectivePermissionMode: permissionState.effectivePermissionMode,
+    permissionCapabilities: permissionState.permissionCapabilities,
+    mcpPermissionModeOverrides: permissionState.mcpPermissionModeOverrides,
+  };
+}
+
 /**
  * Attach connection/disconnection handlers to a project context.
  *
@@ -63,6 +94,8 @@ function attachConnection(ctx) {
   var cwd = ctx.cwd;
   var slug = ctx.slug;
   var isMate = ctx.isMate;
+  var mateId = ctx.mateId || null;
+  var mateDisplayName = ctx.mateDisplayName || "";
   var osUsers = ctx.osUsers;
   var debug = ctx.debug;
   var dangerouslySkipPermissions = ctx.dangerouslySkipPermissions;
@@ -184,7 +217,7 @@ function attachConnection(ctx) {
       sm.saveSessionFile(restoredActive);
     }
     var initialModels = (sm.modelsByVendor && sm.modelsByVendor[initialVendor]) || sm.availableModels || [];
-    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId, ownerLocked: ownerLocked, vendors: yoke.VENDOR_REGISTRY });
+    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId, ownerLocked: ownerLocked, vendors: yoke.VENDOR_REGISTRY, isMate: isMate, mateId: isMate ? mateId : null, mateDisplayName: isMate ? (mateDisplayName || title || project || "Mate") : "" });
     if (typeof sendCursorSharingState === "function") sendCursorSharingState(ws);
     // Update notifications are pushed on a scheduled interval (see
     // scheduleUpdateBroadcast). We no longer push on connect to avoid
@@ -262,7 +295,7 @@ function attachConnection(ctx) {
       }
       var _vendorCaps = (sm.capabilitiesByVendor && sm.capabilitiesByVendor[active.vendor || sm.defaultVendor || "claude"]) || {};
       var activePermissionState = permissionModes.clientState(active, sm.currentPermissionMode, sm.defaultVendor);
-      sendTo(ws, { type: "session_switched", id: active.localId, sessionOriginId: active.sessionOriginId || null, cliSessionId: active.cliSessionId || null, loop: active.loop || null, vendor: active.vendor || null, model: active.model || null, effort: active.effort || initialEffort || null, hasHistory: (active.history && active.history.length > 0), capabilities: _vendorCaps, isProcessing: !!active.isProcessing, mode: active.mode || "gui", terminalId: typeof active.terminalId === "number" ? active.terminalId : null, runtimeMode: active.runtimeMode || null, runtimeTerminalId: typeof active.runtimeTerminalId === "number" ? active.runtimeTerminalId : null, tuiSuspended: !!active.tuiSuspended, permissionMode: activePermissionState.requestedPermissionMode, effectivePermissionMode: activePermissionState.effectivePermissionMode, permissionCapabilities: activePermissionState.permissionCapabilities, mcpPermissionModeOverrides: activePermissionState.mcpPermissionModeOverrides });
+      sendTo(ws, buildRestoredSessionMessage(active, initialEffort, _vendorCaps, activePermissionState));
       if (ctx.autonomousRun) sendTo(ws, { type: "autonomous_run_state", sessionId: active.localId, run: ctx.autonomousRun.project(active.autonomousRun) });
       // Send per-session context sources
       var sessionSources = loadContextSources(slug, active.localId);
@@ -382,5 +415,6 @@ function attachConnection(ctx) {
 module.exports = {
   attachConnection: attachConnection,
   buildInitialModelInfo: buildInitialModelInfo,
+  buildRestoredSessionMessage: buildRestoredSessionMessage,
   dispatchMessageSafely: dispatchMessageSafely,
 };

package/lib/project-debate-proposal.js

@@ -227,6 +227,12 @@ function attachDebateProposal(ctx) {
 
     var found = findPendingProposal(ws, msg);
     if (!found) return true;
+    if (msg.sessionId != null && (String(found.pending.session.localId) !== String(msg.sessionId)
+        || String(ws._clayActiveSession) !== String(msg.sessionId)
+        || (found.pending.session.ownerId && (!ws._clayUser || ws._clayUser.id !== found.pending.session.ownerId)))) {
+      ctx.sendTo(ws, { type: "debate_error", error: "This proposal belongs to a different session." });
+      return true;
+    }
     startApprovedProposal(ws, msg, found).catch(function (error) {
       delete pendingProposals[found.key];
       rejectProposal(ws, found.pending, error && error.message ? error.message : "The selected debate models could not be verified.");

package/lib/project-debate-workspace.js

@@ -0,0 +1,43 @@
+// Project-bound access to the same participation actions used by Home debates.
+function handleProjectDebateControl(ws, msg, session, engine, sendTo) {
+  if (msg.type !== "project_debate_control" && msg.type !== "project_debate_state") return false;
+  var userId = ws && ws._clayUser && ws._clayUser.id;
+  var valid = session && msg.sessionId != null && String(session.localId) === String(msg.sessionId)
+    && (!session.ownerId || session.ownerId === userId);
+  if (msg.type === "project_debate_state") {
+    sendTo(ws, { type: "project_debate_state", sessionId: msg.sessionId, header: valid ? debateHeader(session) : null });
+    return true;
+  }
+  var ok = false;
+  if (valid) {
+    if (session.homeDebatePlanning) ok = engine.handleHomeControl(ws, msg, session);
+    else if (msg.action === "hand_raise") { engine.handleDebateHandRaise(ws, session); ok = true; }
+    else if (msg.action === "stop") ok = engine.handleDebateStop(ws, session);
+    else if (msg.action === "cancel_stop") ok = engine.handleDebateCancelStop(ws, session);
+    else if (msg.action === "user_floor") { engine.handleDebateUserFloorResponse(ws, msg, session); ok = true; }
+    else if (msg.action === "conclude" || msg.action === "resume") {
+      engine.handleDebateConcludeResponse(ws, { action: msg.action === "resume" ? "continue" : msg.response, text: msg.text || "" }, session);
+      ok = true;
+    }
+  }
+  sendTo(ws, { type: "project_debate_control_result", sessionId: msg.sessionId, ok: !!ok, error: ok ? null : "This debate action is no longer available. Reopen the debate and try again." });
+  return true;
+}
+function debateHeader(session) {
+  var header = null;
+  (session.history || []).forEach(function (event) {
+    if (event.type === "debate_started") header = Object.assign({}, event, { role: "debate_header", phase: "live", round: 1, interaction: null, handRaised: false });
+    if (!header) return;
+    if (event.round) header.round = event.round;
+    if (event.type === "debate_conclude_confirm") header.interaction = "conclude";
+    if (event.type === "debate_user_floor") header.interaction = "user_floor";
+    if (event.type === "debate_user_floor_done") { header.interaction = null; header.handRaised = false; }
+    if (event.type === "debate_hand_raised") header.handRaised = true;
+    if (event.type === "debate_stop_requested") header.stopping = true;
+    if (event.type === "debate_stop_cancelled") header.stopping = false;
+    if (event.type === "debate_turn" || event.type === "debate_resumed") { header.interaction = null; header.phase = "live"; }
+    if (event.type === "debate_ended") { header.phase = event.reason === "interrupted" ? "interrupted" : "ended"; header.reason = event.reason; header.interaction = null; header.stopping = false; }
+  });
+  return header;
+}
+module.exports = { handleProjectDebateControl: handleProjectDebateControl, debateHeader: debateHeader };

package/lib/project-debate.js

@@ -1859,6 +1859,7 @@ function attachDebate(ctx) {
     handleDebateHandRaise: handleDebateHandRaise,
     handleDebateComment: handleDebateComment,
     handleDebateStop: handleDebateStop,
+    handleDebateCancelStop: handleDebateCancelStop,
     handleDebateConcludeResponse: handleDebateConcludeResponse,
     handleDebateConfirmBrief: handleDebateConfirmBrief,
     handleDebateUserFloorResponse: handleDebateUserFloorResponse,