clay-server 3.8.1 → 4.0.0-beta.2

package/lib/project-debate.js

@@ -2,6 +2,7 @@ var fs = require("fs");
 var path = require("path");
 var crypto = require("crypto");
 var matesModule = require("./mates");
+var debateToolPolicy = require("./home-debate-tool-policy");
 
 /**
  * Attach debate engine to a project context.
@@ -95,6 +96,7 @@ function attachDebate(ctx) {
     lines.push("4. After hearing from all panelists, you may start additional rounds.");
     lines.push("5. When you believe the debate has reached a natural conclusion, provide a summary WITHOUT mentioning any panelist. A response with no @mention signals the end of the debate.");
     lines.push("6. If the user interjects with a comment, acknowledge it and weave it into the discussion.");
+    lines.push("7. You govern debate tool access: non-mutating investigation is permitted and shown to the user, while any capability that could change the system is blocked.");
     lines.push("");
     lines.push("Begin by introducing the topic and calling on the first panelist.");
     return lines.join("\n");
@@ -125,23 +127,43 @@ function attachDebate(ctx) {
     lines.push("2. Respond to the specific question or prompt from the moderator.");
     lines.push("3. You may reference what other panelists have said.");
     lines.push("4. Keep responses focused and substantive. Do not ramble.");
-    lines.push("5. You have read-only access to project files if needed to support your arguments.");
+    lines.push("5. You may use investigation tools when they strengthen your argument. The moderator automatically permits non-mutating research and blocks system changes.");
     return lines.join("\n");
   }
 
-  function buildDebateToolHandler(session) {
+  function buildDebateToolHandler(session, mateId) {
     return function (toolName, input, toolOpts) {
-      var autoAllow = { Read: true, Glob: true, Grep: true, WebFetch: true, WebSearch: true };
-      if (autoAllow[toolName]) {
-        return Promise.resolve({ behavior: "allow", updatedInput: input });
-      }
+      var decision = debateToolPolicy.debateToolDecision(toolName, input);
+      var debate = session && session._debate;
+      var profile = debate ? ctx.getMateProfile(debate.mateCtx, mateId) : null;
+      debateSendAndRecord(session, {
+        type: "debate_tool_decision",
+        decisionId: toolOpts && toolOpts.toolUseID ? toolOpts.toolUseID : crypto.randomUUID(),
+        mateId: mateId || null,
+        mateName: profile && profile.name ? profile.name : "Mate",
+        toolName: debateToolPolicy.displayToolName(toolName),
+        action: decision.action,
+        command: decision.command,
+        commandTruncated: decision.commandTruncated,
+        decision: decision.allowed ? "allowed" : "blocked",
+        reason: decision.reason,
+      });
       return Promise.resolve({
-        behavior: "deny",
-        message: "Read-only access during debate. You cannot make changes.",
+        behavior: decision.behavior,
+        updatedInput: decision.updatedInput,
+        message: decision.message,
       });
     };
   }
 
+  function participantModel(debate, mateId) {
+    var selections = debate && Array.isArray(debate.participantModels) ? debate.participantModels : [];
+    for (var i = 0; i < selections.length; i++) {
+      if (selections[i] && selections[i].mateId === mateId) return selections[i];
+    }
+    return null;
+  }
+
   // --- State persistence ---
 
   function persistDebateState(session) {
@@ -154,6 +176,9 @@ function attachDebate(ctx) {
       context: d.context || "",
       specialRequests: d.specialRequests || null,
       moderatorId: d.moderatorId,
+      participantModels: Array.isArray(d.participantModels) ? d.participantModels.map(function (item) {
+        return { mateId: item.mateId, vendor: item.vendor, model: item.model };
+      }) : [],
       panelists: d.panelists.map(function (p) {
         return { mateId: p.mateId, role: p.role || "", brief: p.brief || "" };
       }),
@@ -165,6 +190,7 @@ function attachDebate(ctx) {
       awaitingConcludeConfirm: !!d.awaitingConcludeConfirm,
       awaitingUserFloor: !!d.awaitingUserFloor,
       ownerId: d.ownerId || null,
+      turnSequence: d.turnSequence || 0,
     };
     ctx.sm.saveSessionFile(session);
   }
@@ -181,6 +207,7 @@ function attachDebate(ctx) {
       context: ds.context || "",
       specialRequests: ds.specialRequests || null,
       moderatorId: ds.moderatorId,
+      participantModels: Array.isArray(ds.participantModels) ? ds.participantModels : [],
       panelists: ds.panelists || [],
       mateCtx: mateCtx,
       moderatorSession: null,
@@ -197,6 +224,7 @@ function attachDebate(ctx) {
       awaitingConcludeConfirm: !!ds.awaitingConcludeConfirm,
       awaitingUserFloor: !!ds.awaitingUserFloor,
       ownerId: ds.ownerId || userId,
+      turnSequence: ds.turnSequence || 0,
     };
 
     // Fallback: if awaitingConcludeConfirm was not persisted, detect from history
@@ -337,11 +365,24 @@ function attachDebate(ctx) {
     // On server restart, SDK sessions are lost so debates cannot continue.
     // Clear stale debate state instead of restoring dead UI.
     ctx.sm.sessions.forEach(function (session) {
-      if (session._debate) {
-        delete session._debate;
-      }
+      // A live in-memory debate belongs to this daemon and must survive a
+      // websocket reconnect. Persisted state without its runtime object is
+      // the restart case that cannot safely resume dead mention processes.
+      if (session._debate) return;
       if (session.debateState) {
         var phase = session.debateState.phase;
+        if (session.homeDebatePlanning === true && (phase === "live" || phase === "ending")) {
+          session.homeDebatePhase = "interrupted";
+          session.debateState.phase = "interrupted";
+          var lastLifecycle = null;
+          for (var li = session.history.length - 1; li >= 0; li--) {
+            var lifecycleType = session.history[li] && session.history[li].type;
+            if (lifecycleType === "debate_started" || lifecycleType === "debate_resumed" || lifecycleType === "debate_ended") { lastLifecycle = lifecycleType; break; }
+          }
+          if (lastLifecycle !== "debate_ended") session.history.push({ type: "debate_ended", topic: session.debateState.topic || session.title || "Debate", rounds: session.debateState.round || 1, reason: "interrupted", _ts: Date.now() });
+          ctx.sm.saveSessionFile(session);
+          return;
+        }
         if (phase === "preparing" || phase === "reviewing" || phase === "live") {
           console.log("[debate] Clearing stale debate state:", session.debateState.topic);
           session.debateState = null;
@@ -726,14 +767,31 @@ function attachDebate(ctx) {
 
   // Persist a debate message to session history and send to clients
   function debateSendAndRecord(session, msg) {
-    session.history.push(msg);
-    ctx.sm.appendToSessionFile(session, msg);
-    ctx.sendToSession(session.localId, msg);
+    var debate = session._debate;
+    if (debate && msg.mateId && (msg.type === "debate_turn" || msg.type === "debate_turn_done")) {
+      var identity = ctx.getMateProfile(debate.mateCtx, msg.mateId);
+      var identityMate = matesModule.getMate(debate.mateCtx, msg.mateId);
+      var identityProfile = identityMate && identityMate.profile ? identityMate.profile : (identityMate || {});
+      if (!msg.mateName) msg.mateName = identity.name;
+      if (!msg.avatarStyle) msg.avatarStyle = identity.avatarStyle;
+      if (!msg.avatarSeed) msg.avatarSeed = identity.avatarSeed;
+      if (!msg.avatarColor) msg.avatarColor = identity.avatarColor;
+      if (!msg.avatarCustom && identityProfile.avatarCustom) msg.avatarCustom = identityProfile.avatarCustom;
+    }
+    if (debate && msg.type === "debate_turn") {
+      debate.turnSequence = (debate.turnSequence || 0) + 1;
+      debate.activeTurnId = (debate.debateId || "debate") + ":" + debate.turnSequence;
+      msg.turnId = debate.activeTurnId;
+    } else if (debate && !msg.turnId && (msg.type === "debate_activity" || msg.type === "debate_stream" || msg.type === "debate_turn_done")) {
+      msg.turnId = debate.activeTurnId || null;
+    }
+    ctx.sm.sendAndRecord(session, msg);
+    if (debate && msg.type === "debate_turn_done") debate.activeTurnId = null;
   }
 
   // --- Live debate ---
 
-  function startDebateLive(session) {
+  function startDebateLive(session, targetWs) {
     var debate = session._debate;
     if (!debate || debate.phase === "live") return;
 
@@ -744,21 +802,35 @@ function attachDebate(ctx) {
     var mateCtx = debate.mateCtx;
     var moderatorProfile = ctx.getMateProfile(mateCtx, debate.moderatorId);
 
-    // Create a dedicated debate session, grouped with the setup session
-    var liveOpts = debate.ownerId ? { ownerId: debate.ownerId } : null;
-    var debateSession = ctx.sm.createSession(liveOpts);
-    debateSession.title = debate.topic.slice(0, 50);
-    debateSession.loop = { active: true, iteration: 1, role: "debate", loopId: debate.debateId, name: debate.topic.slice(0, 40), source: "debate", startedAt: debate.setupStartedAt || Date.now() };
-    ctx.sm.saveSessionFile(debateSession);
-    ctx.sm.switchSession(debateSession.localId, null, ctx.hydrateImageRefs);
-    debate.liveSessionId = debateSession.localId;
-
-    // Move _debate to the new session so all debate logic uses it
-    debateSession._debate = debate;
-    delete session._debate;
-    // Clear persisted state from setup session, persist on live session
-    session.debateState = null;
-    ctx.sm.saveSessionFile(session);
+    var reuseHomeSession = session.homeDebatePlanning === true;
+    var debateSession = session;
+    if (reuseHomeSession) {
+      session.homeDebatePhase = "live";
+      session.title = "Debate: " + debate.topic.slice(0, 42);
+      session.titleManuallySet = true;
+      session.isProcessing = false;
+      ctx.onProcessingChanged();
+      if (session.abortController) { try { session.abortController.abort(); } catch (e) {} }
+      if (session.queryInstance && typeof session.queryInstance.close === "function") { try { session.queryInstance.close(); } catch (e) {} }
+      session.abortController = null;
+      session.queryInstance = null;
+      if (session.messageQueue && typeof session.messageQueue.end === "function") { try { session.messageQueue.end(); } catch (e) {} }
+      session.messageQueue = null;
+      if (targetWs) targetWs._clayActiveSession = session.localId;
+    } else {
+      // Legacy project debates retain their dedicated live session.
+      var liveOpts = debate.ownerId ? { ownerId: debate.ownerId } : null;
+      debateSession = ctx.sm.createSession(liveOpts, targetWs || null);
+      debateSession.title = debate.topic.slice(0, 50);
+      debateSession.loop = { active: true, iteration: 1, role: "debate", loopId: debate.debateId, name: debate.topic.slice(0, 40), source: "debate", startedAt: debate.setupStartedAt || Date.now() };
+      ctx.sm.saveSessionFile(debateSession);
+      ctx.sm.switchSession(debateSession.localId, null, ctx.hydrateImageRefs);
+      debate.liveSessionId = debateSession.localId;
+      debateSession._debate = debate;
+      delete session._debate;
+      session.debateState = null;
+      ctx.sm.saveSessionFile(session);
+    }
     persistDebateState(debateSession);
 
     // Save to session history
@@ -768,16 +840,15 @@ function attachDebate(ctx) {
       format: debate.format,
       moderatorId: debate.moderatorId,
       moderatorName: moderatorProfile.name,
+      participantModels: Array.isArray(debate.participantModels) ? debate.participantModels.map(function (item) {
+        return { mateId: item.mateId, vendor: item.vendor, model: item.model };
+      }) : [],
       panelists: debate.panelists.map(function (p) {
         var prof = ctx.getMateProfile(mateCtx, p.mateId);
         return { mateId: p.mateId, name: prof.name, role: p.role, avatarColor: prof.avatarColor, avatarStyle: prof.avatarStyle, avatarSeed: prof.avatarSeed };
       }),
     };
-    debateSession.history.push(debateStartEntry);
-    ctx.sm.appendToSessionFile(debateSession, debateStartEntry);
-
-    // Notify clients (same data as history entry)
-    ctx.sendToSession(debateSession.localId, debateStartEntry);
+    debateSendAndRecord(debateSession, debateStartEntry);
 
     // Signal moderator's first turn
     debateMateProcessing(debate.moderatorId, true);
@@ -798,15 +869,17 @@ function attachDebate(ctx) {
     var moderatorContext = buildModeratorContext(debate) + digests;
 
     var _modMate2 = matesModule.getMate(mateCtx, debate.moderatorId);
+    var moderatorModel = participantModel(debate, debate.moderatorId);
     ctx.sdk.createMentionSession({
-      vendor: _modMate2 ? _modMate2.vendor : null,
+      vendor: moderatorModel ? moderatorModel.vendor : (_modMate2 ? _modMate2.vendor : null),
+      model: moderatorModel ? moderatorModel.model : undefined,
       linuxUser: mateCtx.linuxUser || undefined,
       claudeMd: claudeMd,
       initialContext: moderatorContext,
       initialMessage: "Begin the debate on: " + debate.topic,
       onActivity: function (activity) {
         if (debateSession._debate && debateSession._debate.phase !== "ended") {
-          ctx.sendToSession(debateSession.localId, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
+          debateSendAndRecord(debateSession, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
         }
       },
       onDelta: function (delta) {
@@ -821,7 +894,7 @@ function attachDebate(ctx) {
         console.error("[debate] Moderator error:", errMsg);
         endDebate(debateSession, "error");
       },
-      canUseTool: buildDebateToolHandler(debateSession),
+      canUseTool: buildDebateToolHandler(debateSession, debate.moderatorId),
     }).then(function (mentionSession) {
       if (mentionSession) {
         debate.moderatorSession = mentionSession;
@@ -847,9 +920,7 @@ function attachDebate(ctx) {
 
     // Save to session history
     var turnEntry = { type: "debate_turn_done", mateId: debate.moderatorId, mateName: moderatorProfile.name, role: "moderator", round: debate.round, text: fullText, avatarStyle: moderatorProfile.avatarStyle, avatarSeed: moderatorProfile.avatarSeed, avatarColor: moderatorProfile.avatarColor };
-    session.history.push(turnEntry);
-    ctx.sm.appendToSessionFile(session, turnEntry);
-    ctx.sendToSession(session.localId, turnEntry);
+    debateSendAndRecord(session, turnEntry);
 
     // Check if user stopped the debate during this turn
     if (debate.phase === "ending") {
@@ -870,9 +941,7 @@ function attachDebate(ctx) {
       debate.awaitingConcludeConfirm = true;
       persistDebateState(session);
       var concludeEntry = { type: "debate_conclude_confirm", topic: debate.topic, round: debate.round };
-      session.history.push(concludeEntry);
-      ctx.sm.appendToSessionFile(session, concludeEntry);
-      ctx.sendToSession(session.localId, concludeEntry);
+      debateSendAndRecord(session, concludeEntry);
       return;
     }
 
@@ -933,7 +1002,7 @@ function attachDebate(ctx) {
     var panelistCallbacks = {
       onActivity: function (activity) {
         if (session._debate && session._debate.phase !== "ended") {
-          ctx.sendToSession(session.localId, { type: "debate_activity", mateId: mateId, activity: activity });
+          debateSendAndRecord(session, { type: "debate_activity", mateId: mateId, activity: activity });
         }
       },
       onDelta: function (delta) {
@@ -994,8 +1063,10 @@ function attachDebate(ctx) {
       }
 
       var _panMate = matesModule.getMate(debate.mateCtx, mateId);
+      var panelistModel = participantModel(debate, mateId);
       ctx.sdk.createMentionSession({
-        vendor: _panMate ? _panMate.vendor : null,
+        vendor: panelistModel ? panelistModel.vendor : (_panMate ? _panMate.vendor : null),
+        model: panelistModel ? panelistModel.model : undefined,
         linuxUser: debate.mateCtx && debate.mateCtx.linuxUser ? debate.mateCtx.linuxUser : undefined,
         claudeMd: claudeMd,
         initialContext: panelistContext + historyContext,
@@ -1004,7 +1075,7 @@ function attachDebate(ctx) {
         onDelta: panelistCallbacks.onDelta,
         onDone: panelistCallbacks.onDone,
         onError: panelistCallbacks.onError,
-        canUseTool: buildDebateToolHandler(session),
+        canUseTool: buildDebateToolHandler(session, mateId),
       }).then(function (mentionSession) {
         if (mentionSession) {
           debate.panelistSessions[mateId] = mentionSession;
@@ -1041,9 +1112,7 @@ function attachDebate(ctx) {
 
     // Save to session history
     var turnEntry = { type: "debate_turn_done", mateId: mateId, mateName: profile.name, role: panelistInfo ? panelistInfo.role : "", round: debate.round, text: fullText, avatarStyle: profile.avatarStyle, avatarSeed: profile.avatarSeed, avatarColor: profile.avatarColor };
-    session.history.push(turnEntry);
-    ctx.sm.appendToSessionFile(session, turnEntry);
-    ctx.sendToSession(session.localId, turnEntry);
+    debateSendAndRecord(session, turnEntry);
 
     // Check if user stopped the debate
     if (debate.phase === "ending") {
@@ -1112,7 +1181,7 @@ function attachDebate(ctx) {
     return {
       onActivity: function (activity) {
         if (session._debate && session._debate.phase !== "ended") {
-          ctx.sendToSession(session.localId, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
+          debateSendAndRecord(session, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
         }
       },
       onDelta: function (delta) {
@@ -1132,20 +1201,21 @@ function attachDebate(ctx) {
 
   // --- User interaction during debate ---
 
-  function handleDebateHandRaise(ws) {
-    var session = ctx.getSessionForWs(ws);
+  function handleDebateHandRaise(ws, exactSession) {
+    var session = exactSession || ctx.getSessionForWs(ws);
     if (!session) return;
 
     var debate = session._debate;
     if (!debate || debate.phase !== "live") return;
     if (debate.awaitingUserFloor || debate.handRaised) return;
     if (debate.awaitingConcludeConfirm) {
-      ctx.sendTo(ws, { type: "debate_conclude_confirm", topic: debate.topic, round: debate.round });
+      if (session.homeDebatePlanning === true) debateSendAndRecord(session, { type: "debate_conclude_confirm", topic: debate.topic, round: debate.round });
+      else ctx.sendTo(ws, { type: "debate_conclude_confirm", topic: debate.topic, round: debate.round });
       return;
     }
 
     debate.handRaised = true;
-    ctx.sendToSession(session.localId, { type: "debate_hand_raised" });
+    debateSendAndRecord(session, { type: "debate_hand_raised" });
 
     // If no one is speaking, yield floor immediately
     if (!debate.turnInProgress) {
@@ -1154,9 +1224,9 @@ function attachDebate(ctx) {
     // Otherwise: current speaker finishes -> handRaised detected -> yieldFloorToUser
   }
 
-  function handleDebateComment(ws, msg) {
+  function handleDebateComment(ws, msg, exactSession) {
     // Legacy: kept for compatibility but now hand raise is separate
-    var session = ctx.getSessionForWs(ws);
+    var session = exactSession || ctx.getSessionForWs(ws);
     if (!session) return;
 
     var debate = session._debate;
@@ -1169,7 +1239,7 @@ function attachDebate(ctx) {
 
     debate.pendingComment = { text: msg.text };
     debate.handRaised = true;
-    ctx.sendToSession(session.localId, { type: "debate_comment_queued", text: msg.text });
+    debateSendAndRecord(session, { type: "debate_comment_queued", text: msg.text });
 
     if (!debate.turnInProgress) {
       injectUserComment(session);
@@ -1215,9 +1285,7 @@ function attachDebate(ctx) {
     debate.history.push({ speaker: "user", mateId: null, mateName: "User", text: comment.text });
 
     var commentEntry = { type: "debate_comment_injected", text: comment.text };
-    session.history.push(commentEntry);
-    ctx.sm.appendToSessionFile(session, commentEntry);
-    ctx.sendToSession(session.localId, commentEntry);
+    debateSendAndRecord(session, commentEntry);
 
     // Feed to moderator: yield the floor to the user
     debate.turnInProgress = true;
@@ -1249,7 +1317,7 @@ function attachDebate(ctx) {
     return {
       onActivity: function (activity) {
         if (session._debate && session._debate.phase !== "ended") {
-          ctx.sendToSession(session.localId, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
+          debateSendAndRecord(session, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
         }
       },
       onDelta: function (delta) {
@@ -1264,14 +1332,12 @@ function attachDebate(ctx) {
         // Record moderator yield turn
         debate.history.push({ speaker: "moderator", mateId: debate.moderatorId, mateName: moderatorProfile.name, text: fullText });
         var turnEntry = { type: "debate_turn_done", mateId: debate.moderatorId, mateName: moderatorProfile.name, role: "moderator", round: debate.round, text: fullText, avatarStyle: moderatorProfile.avatarStyle, avatarSeed: moderatorProfile.avatarSeed, avatarColor: moderatorProfile.avatarColor };
-        session.history.push(turnEntry);
-        ctx.sm.appendToSessionFile(session, turnEntry);
-        ctx.sendToSession(session.localId, turnEntry);
+        debateSendAndRecord(session, turnEntry);
 
         // Enter user floor mode: pause debate and show input
         debate.awaitingUserFloor = true;
         persistDebateState(session);
-        ctx.sendToSession(session.localId, { type: "debate_user_floor", topic: debate.topic, round: debate.round });
+        debateSendAndRecord(session, { type: "debate_user_floor", topic: debate.topic, round: debate.round });
       },
       onError: function (errMsg) {
         console.error("[debate] Moderator yield error:", errMsg);
@@ -1280,8 +1346,8 @@ function attachDebate(ctx) {
     };
   }
 
-  function handleDebateUserFloorResponse(ws, msg) {
-    var session = ctx.getSessionForWs(ws);
+  function handleDebateUserFloorResponse(ws, msg, exactSession) {
+    var session = exactSession || ctx.getSessionForWs(ws);
     if (!session) return;
 
     var debate = session._debate;
@@ -1294,9 +1360,7 @@ function attachDebate(ctx) {
     // Record user's floor contribution
     debate.history.push({ speaker: "user", mateId: null, mateName: "User", text: userText });
     var floorEntry = { type: "debate_user_floor_done", text: userText };
-    session.history.push(floorEntry);
-    ctx.sm.appendToSessionFile(session, floorEntry);
-    ctx.sendToSession(session.localId, floorEntry);
+    debateSendAndRecord(session, floorEntry);
 
     // Feed to moderator to resume debate
     debate.turnInProgress = true;
@@ -1336,40 +1400,54 @@ function attachDebate(ctx) {
     startDebateLive(session);
   }
 
-  function handleDebateStop(ws) {
-    var session = ctx.getSessionForWs(ws);
-    if (!session) return;
+  function handleDebateStop(ws, exactSession) {
+    var session = exactSession || ctx.getSessionForWs(ws);
+    if (!session) return false;
 
     var debate = session._debate;
-    if (!debate) return;
+    if (!debate) return false;
 
     if (debate.phase === "reviewing") {
       endDebate(session, "user_stopped");
-      return;
+      return true;
     }
 
-    if (debate.phase !== "live") return;
+    if (debate.phase !== "live") return false;
 
     if (debate.turnInProgress) {
       // Let current turn finish, then end
       debate.phase = "ending";
+      persistDebateState(session);
+      debateSendAndRecord(session, { type: "debate_stop_requested", topic: debate.topic, round: debate.round });
     } else {
       endDebate(session, "user_stopped");
     }
+    return true;
+  }
+
+  function handleDebateCancelStop(ws, exactSession) {
+    var session = exactSession || ctx.getSessionForWs(ws);
+    var debate = session && session._debate;
+    if (!debate || debate.phase !== "ending") return false;
+    debate.phase = "live";
+    persistDebateState(session);
+    debateSendAndRecord(session, { type: "debate_stop_cancelled", topic: debate.topic, round: debate.round });
+    return true;
   }
 
   // Rebuild _debate from session history (for resume after server restart)
   function rebuildDebateState(session, ws) {
     // Find debate_started entry in history
     var startEntry = null;
-    var endEntry = null;
+    var latestPhase = null;
     var concludeEntry = null;
     var lastRound = 1;
     for (var i = 0; i < session.history.length; i++) {
       var h = session.history[i];
-      if (h.type === "debate_started") startEntry = h;
-      if (h.type === "debate_ended") endEntry = h;
-      if (h.type === "debate_conclude_confirm") concludeEntry = h;
+      if (h.type === "debate_started") { startEntry = h; latestPhase = "live"; concludeEntry = null; }
+      if (h.type === "debate_resumed") { latestPhase = "live"; concludeEntry = null; }
+      if (h.type === "debate_ended") { latestPhase = "ended"; concludeEntry = null; }
+      if (h.type === "debate_conclude_confirm" && latestPhase === "live") concludeEntry = h;
       if (h.type === "debate_turn_done" && h.round) lastRound = h.round;
     }
     if (!startEntry) return null;
@@ -1377,29 +1455,33 @@ function attachDebate(ctx) {
     var userId = ws._clayUser ? ws._clayUser.id : null;
     var mateCtx = matesModule.buildMateCtx(userId);
 
+    var savedState = session.debateState || {};
+    var savedPanelists = Array.isArray(savedState.panelists) && savedState.panelists.length ? savedState.panelists : (startEntry.panelists || []);
     var debate = {
-      phase: endEntry ? "ended" : "live",
-      topic: startEntry.topic || "",
-      format: startEntry.format || "free_discussion",
-      context: "",
-      specialRequests: null,
-      moderatorId: startEntry.moderatorId,
-      panelists: (startEntry.panelists || []).map(function (p) {
+      phase: session.homeDebatePhase === "ended" || session.homeDebatePhase === "interrupted" ? "ended" : (latestPhase || "live"),
+      topic: savedState.topic || startEntry.topic || "",
+      format: savedState.format || startEntry.format || "free_discussion",
+      context: savedState.context || "",
+      specialRequests: savedState.specialRequests || null,
+      moderatorId: savedState.moderatorId || startEntry.moderatorId,
+      participantModels: Array.isArray(savedState.participantModels) ? savedState.participantModels : (startEntry.participantModels || []),
+      panelists: savedPanelists.map(function (p) {
         return { mateId: p.mateId, role: p.role || "", brief: p.brief || "" };
       }),
       mateCtx: mateCtx,
       moderatorSession: null,
       panelistSessions: {},
       nameMap: buildDebateNameMap(
-        (startEntry.panelists || []).map(function (p) { return { mateId: p.mateId, role: p.role || "" }; }),
+        savedPanelists.map(function (p) { return { mateId: p.mateId, role: p.role || "" }; }),
         mateCtx
       ),
       turnInProgress: false,
       pendingComment: null,
       round: lastRound,
       history: [],
-      awaitingConcludeConfirm: !endEntry && !!concludeEntry,
-      debateId: (session.loop && session.loop.loopId) || "debate_rebuilt",
+      awaitingConcludeConfirm: latestPhase === "live" && !!concludeEntry,
+      ownerId: savedState.ownerId || userId,
+      debateId: savedState.debateId || (session.loop && session.loop.loopId) || "debate_rebuilt",
     };
 
     // Rebuild debate.history from session history turn entries
@@ -1417,7 +1499,7 @@ function attachDebate(ctx) {
     }
 
     // If no endEntry and no concludeEntry, check if last moderator turn had no mentions (implicit conclude)
-    if (!endEntry && !concludeEntry && debate.history.length > 0) {
+    if (debate.phase === "live" && !concludeEntry && debate.history.length > 0) {
       var lastTurn = debate.history[debate.history.length - 1];
       if (lastTurn.speaker === "moderator" && lastTurn.text) {
         var rebuildMentions = detectMentions(lastTurn.text, debate.nameMap);
@@ -1433,8 +1515,8 @@ function attachDebate(ctx) {
     return debate;
   }
 
-  function handleDebateConcludeResponse(ws, msg) {
-    var session = ctx.getSessionForWs(ws);
+  function handleDebateConcludeResponse(ws, msg, exactSession) {
+    var session = exactSession || ctx.getSessionForWs(ws);
     if (!session) return;
     var debate = session._debate;
 
@@ -1449,7 +1531,7 @@ function attachDebate(ctx) {
 
     // Allow resume from both "live + awaiting confirm" and "ended" states
     var isLiveConfirm = debate.phase === "live" && debate.awaitingConcludeConfirm;
-    var isResume = debate.phase === "ended" && msg.action === "continue";
+    var isResume = (debate.phase === "ended" || debate.phase === "interrupted") && msg.action === "continue";
     if (!isLiveConfirm && !isResume) return;
 
     debate.awaitingConcludeConfirm = false;
@@ -1462,6 +1544,7 @@ function attachDebate(ctx) {
     if (msg.action === "continue") {
       var wasEnded = debate.phase === "ended";
       debate.phase = "live";
+      if (session.homeDebatePlanning === true) session.homeDebatePhase = "live";
       var instruction = (msg.text || "").trim();
       var mateCtx = debate.mateCtx || matesModule.buildMateCtx(ws._clayUser ? ws._clayUser.id : null);
       debate.mateCtx = mateCtx;
@@ -1470,9 +1553,7 @@ function attachDebate(ctx) {
       // Record user's resume message if provided
       if (instruction) {
         var resumeEntry = { type: "debate_user_resume", text: instruction };
-        session.history.push(resumeEntry);
-        ctx.sm.appendToSessionFile(session, resumeEntry);
-        ctx.sendToSession(session.localId, resumeEntry);
+        debateSendAndRecord(session, resumeEntry);
       }
 
       // Notify clients debate is back live and persist to history
@@ -1487,9 +1568,8 @@ function attachDebate(ctx) {
           return { mateId: p.mateId, name: prof.name, role: p.role, avatarColor: prof.avatarColor, avatarStyle: prof.avatarStyle, avatarSeed: prof.avatarSeed };
         }),
       };
-      session.history.push(resumedMsg);
-      ctx.sm.appendToSessionFile(session, resumedMsg);
-      ctx.sendToSession(session.localId, resumedMsg);
+      persistDebateState(session);
+      debateSendAndRecord(session, resumedMsg);
 
       debate.turnInProgress = true;
       debateMateProcessing(debate.moderatorId, true);
@@ -1531,15 +1611,17 @@ function attachDebate(ctx) {
         moderatorContext += "---\n";
 
         var _modMate3 = matesModule.getMate(mateCtx, debate.moderatorId);
+        var resumedModeratorModel = participantModel(debate, debate.moderatorId);
         ctx.sdk.createMentionSession({
-          vendor: _modMate3 ? _modMate3.vendor : null,
+          vendor: resumedModeratorModel ? resumedModeratorModel.vendor : (_modMate3 ? _modMate3.vendor : null),
+          model: resumedModeratorModel ? resumedModeratorModel.model : undefined,
           linuxUser: mateCtx.linuxUser || undefined,
           claudeMd: claudeMd,
           initialContext: moderatorContext,
           initialMessage: resumePrompt,
           onActivity: function (activity) {
             if (session._debate && session._debate.phase !== "ended") {
-              ctx.sendToSession(session.localId, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
+              debateSendAndRecord(session, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
             }
           },
           onDelta: function (delta) {
@@ -1554,7 +1636,7 @@ function attachDebate(ctx) {
             console.error("[debate] Moderator resume error:", errMsg);
             endDebate(session, "error");
           },
-          canUseTool: buildDebateToolHandler(session),
+          canUseTool: buildDebateToolHandler(session, debate.moderatorId),
         }).then(function (mentionSession) {
           if (mentionSession) {
             debate.moderatorSession = mentionSession;
@@ -1584,6 +1666,7 @@ function attachDebate(ctx) {
 
     debate.phase = "ended";
     debate.turnInProgress = false;
+    if (session.homeDebatePlanning === true) session.homeDebatePhase = reason === "interrupted" ? "interrupted" : "ended";
     persistDebateState(session);
 
     // Clean up brief watcher if still active
@@ -1593,17 +1676,20 @@ function attachDebate(ctx) {
     }
 
     // Notify clients
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_ended",
       reason: reason,
       rounds: debate.round,
       topic: debate.topic,
     });
 
-    // Save to session history
-    var endEntry = { type: "debate_ended", topic: debate.topic, rounds: debate.round, reason: reason };
-    session.history.push(endEntry);
-    ctx.sm.appendToSessionFile(session, endEntry);
+    if (debate.homeClient && session.homeDebatePlanning !== true) {
+      if (typeof ctx.unregisterHomeDebateClient === "function") ctx.unregisterHomeDebateClient(debate.homeClient);
+      debate.homeClient._clayActiveSession = debate.homeClient._clayHomePreviousSessionId || null;
+      debate.homeClient._clayHomePreviousSessionId = null;
+      debate.homeClient._clayHomeDebateSlug = null;
+      debate.homeClient = null;
+    }
 
     // Generate digests for all participants
     digestDebateParticipant(session, debate.moderatorId, debate, "moderator");
@@ -1725,6 +1811,7 @@ function attachDebate(ctx) {
       context: briefData.context || "",
       specialRequests: briefData.specialRequests || null,
       moderatorId: mateId,
+      participantModels: Array.isArray(briefData.participantModels) ? briefData.participantModels : [],
       panelists: (briefData.panelists || []).map(function (p) {
         return { mateId: p.mateId, role: p.role || "", brief: p.brief || "" };
       }),
@@ -1745,10 +1832,26 @@ function attachDebate(ctx) {
     session._debate = debate;
 
     console.log("[debate] MCP debate approved. Topic:", debate.topic, "debateId:", debateId);
-    startDebateLive(session);
+    var homeWs = ws && ws._homeChatTap && ws._homeChatTap.mateSlug === ctx.slug && ws._homeChatTap.sessionId === session.localId ? ws : null;
+    startDebateLive(session, homeWs);
     return { ok: true };
   }
 
+  function handleHomeControl(ws, msg, session) {
+    if (!session || session.homeDebatePlanning !== true) return false;
+    if (!session._debate && (msg.action === "conclude" || msg.action === "resume")) rebuildDebateState(session, ws);
+    if (!session._debate) return false;
+    if (msg.action === "hand_raise") handleDebateHandRaise(ws, session);
+    else if (msg.action === "comment") handleDebateComment(ws, msg, session);
+    else if (msg.action === "stop") return handleDebateStop(ws, session);
+    else if (msg.action === "cancel_stop") return handleDebateCancelStop(ws, session);
+    else if (msg.action === "conclude") handleDebateConcludeResponse(ws, { action: msg.response, text: msg.text || "" }, session);
+    else if (msg.action === "resume") handleDebateConcludeResponse(ws, { action: "continue", text: msg.text || "" }, session);
+    else if (msg.action === "user_floor") handleDebateUserFloorResponse(ws, msg, session);
+    else return false;
+    return true;
+  }
+
   // --- Public API ---
 
   return {
@@ -1762,6 +1865,7 @@ function attachDebate(ctx) {
     restoreDebateState: restoreDebateState,
     checkForDmDebateBrief: checkForDmDebateBrief,
     handleMcpDebateApproval: handleMcpDebateApproval,
+    handleHomeControl: handleHomeControl,
   };
 }