clay-server 4.1.0-beta.4 → 4.1.0-beta.6

package/lib/project-sessions.js

@@ -12,6 +12,27 @@ function vendorSupportsTui(vendor) {
   return !!(info && info.sessionModes.indexOf("tui") !== -1);
 }
 
+function catalogHasModel(models, value) {
+  for (var i = 0; i < (models || []).length; i++) {
+    var model = models[i];
+    if (typeof model === "string" && model === value) return true;
+    if (model && (model.value === value || model.id === value || model.resolvedModel === value)) return true;
+  }
+  return false;
+}
+
+function catalogSupportsEffort(models, modelValue, effort, vendorLevels) {
+  if (!effort) return true;
+  for (var i = 0; i < (models || []).length; i++) {
+    var model = models[i];
+    var value = typeof model === "string" ? model : model && (model.value || model.id || model.resolvedModel);
+    if (value !== modelValue) continue;
+    if (model && Array.isArray(model.supportedEffortLevels) && model.supportedEffortLevels.length) return model.supportedEffortLevels.indexOf(effort) !== -1;
+    break;
+  }
+  return (vendorLevels || []).indexOf(effort) !== -1;
+}
+
 // Format a user's answer to an ask_user_questions card as a plain user
 // message so the MCP path can feed it back to the agent on the next turn.
 // The agent sees its own question text alongside the selected answer(s),
@@ -98,6 +119,8 @@ function attachSessions(ctx) {
   var onProcessingChanged = ctx.onProcessingChanged;
   var broadcastPresence = ctx.broadcastPresence;
   var adapter = ctx.adapter;
+  var fullAccessService = ctx.fullAccessService;
+  var autonomousRun = ctx.autonomousRun;
 
   function ownsSearchSession(ws, session) {
     if (!session) return false;
@@ -118,6 +141,7 @@ function attachSessions(ctx) {
       catch (e) { return false; }
     }
     delete session.pendingAskUser[toolId];
+    if (autonomousRun) autonomousRun.onUserAnswer(session);
     sm.sendAndRecord(session, { type: "ask_user_answered", toolId: toolId, answers: answers });
     if (pending.mode === "yoke" && typeof pending.respond === "function") {
       pending.respond(answers);
@@ -507,6 +531,34 @@ function attachSessions(ctx) {
     }
 
     if (msg.type === "new_session") {
+      if (msg.scheduleInterview === true) {
+        var sourceSession = getSessionForWs(ws);
+        var interviewVendor = typeof msg.vendor === "string" ? msg.vendor : "";
+        var installed = sm.installedVendors || [];
+        var knownModels = sm.modelsByVendor && sm.modelsByVendor[interviewVendor] || [];
+        var requestedModel = typeof msg.model === "string" ? msg.model : "";
+        var requestedEffort = typeof msg.effort === "string" ? msg.effort : "";
+        var vendorInfo = yoke.getVendorInfo(interviewVendor);
+        var engineError = "";
+        var sourceMatches = !!sourceSession && Number(msg.sourceSessionId) === Number(sourceSession.localId);
+        if (!sourceMatches || msg.projectSlug !== slug || !ctx.canCreateScheduledTaskInterview || !ctx.canCreateScheduledTaskInterview(ws, sourceSession)) engineError = "Scheduled Tasks is unavailable in the current project session.";
+        else if (!interviewVendor || installed.indexOf(interviewVendor) === -1 || !vendorInfo || yoke.sessionTools.capability(interviewVendor).kind === "none") engineError = "The selected interview engine is no longer available for assisted scheduling.";
+        else if (!knownModels.length) engineError = "Interview models are still loading or unavailable for this engine.";
+        else if (requestedModel && !catalogHasModel(knownModels, requestedModel)) engineError = "The selected interview model is no longer available.";
+        else if (!catalogSupportsEffort(knownModels, requestedModel, requestedEffort, vendorInfo.effortLevels)) engineError = "The selected interview effort is unavailable for this engine.";
+        if (engineError) {
+          if (msg.requestId) sendTo(ws, { type: "new_session_result", requestId: String(msg.requestId).substring(0, 200), ok: false, error: engineError });
+          return true;
+        }
+        var preferenceUserId = ws._clayUser ? ws._clayUser.id : "default";
+        var savedPreference;
+        try { savedPreference = usersModule.setScheduledTaskInterviewEngine(preferenceUserId, { vendor: interviewVendor, model: requestedModel, effort: requestedEffort }); }
+        catch (preferenceError) { savedPreference = { error: preferenceError.message || String(preferenceError) }; }
+        if (!savedPreference || !savedPreference.ok) {
+          if (msg.requestId) sendTo(ws, { type: "new_session_result", requestId: String(msg.requestId).substring(0, 200), ok: false, error: savedPreference && savedPreference.error || "The interview engine preference could not be saved." });
+          return true;
+        }
+      }
       // Opportunistic hygiene: drop blanks that sat untouched past the grace
       // period before deciding whether to reuse or create.
       sm.sweepBlankSessions();
@@ -514,6 +566,7 @@ function attachSessions(ctx) {
       if (ws._clayUser && usersModule.isMultiUser()) sessionOpts.ownerId = ws._clayUser.id;
       sessionOpts.sessionVisibility = sessionVisibility.normalize(msg.sessionVisibility);
       if (msg.vendor) sessionOpts.vendor = msg.vendor;
+      if (msg.scheduleInterview === true && msg.model) sessionOpts.model = msg.model;
       // Mode resolution: vendors without a TUI session mode are always GUI.
       // TUI-capable sessions honor the explicit msg.mode if provided, otherwise
       // fall back to the user's claudeOpenMode preference. This is what
@@ -583,10 +636,9 @@ function attachSessions(ctx) {
         sm.switchSession(newSess.localId, ws);
       } else {
         var newSessionVendor = sessionOpts.vendor || sm.defaultVendor || "claude";
-        sessionOpts.effort = yoke.clampEffort(
-          newSessionVendor,
-          (sm.currentEffortByVendor && sm.currentEffortByVendor[newSessionVendor]) || sm.currentEffort || "medium"
-        ) || null;
+        sessionOpts.effort = msg.scheduleInterview === true && msg.effort
+          ? msg.effort
+          : yoke.clampEffort(newSessionVendor, (sm.currentEffortByVendor && sm.currentEffortByVendor[newSessionVendor]) || sm.currentEffort || "medium") || null;
         // 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.
@@ -606,6 +658,7 @@ function attachSessions(ctx) {
         }
       }
       ws._clayActiveSession = newSess.localId;
+      if (msg.requestId) sendTo(ws, { type: "new_session_result", requestId: String(msg.requestId).substring(0, 200), ok: true, sessionId: newSess.localId });
       // Remember the vendor only when the client asked for one explicitly.
       // new_session without a vendor (mate sidebar, notification banner,
       // debate) falls through to the default adapter and must not clobber
@@ -1019,6 +1072,7 @@ function attachSessions(ctx) {
 
     if (msg.type === "stop") {
       var session = getSessionForWs(ws);
+      if (autonomousRun && session && session.autonomousRun) autonomousRun.finish(session, "stopped", "Stopped by the user.");
       stopSession(session);
       return true;
     }
@@ -1150,34 +1204,12 @@ function attachSessions(ctx) {
         return true;
       }
 
-      var previousFullAccess = fullAccessSession.permissionMode === "bypassPermissions";
-      var previousPermissionMode = fullAccessSession.permissionMode || null;
-      var previousRestoreMode = fullAccessSession.permissionModeBeforeFullAccess || null;
-      if (fullAccessEnabled) {
-        if (!previousFullAccess) {
-          fullAccessSession.permissionModeBeforeFullAccess = fullAccessSession.permissionMode || sm.currentPermissionMode || "default";
-        }
-        fullAccessSession.permissionMode = "bypassPermissions";
-      } else {
-        fullAccessSession.permissionMode = fullAccessSession.permissionModeBeforeFullAccess || "default";
-        fullAccessSession.permissionModeBeforeFullAccess = null;
-      }
-
       (async function () {
         try {
-          // Clay's common canUseTool callback owns permission skipping for
-          // every vendor. If an adapter supports native mode switching, keep
-          // it in a normal mode so Clay remains the single approval layer.
-          if (fullAccessSession.queryInstance && typeof fullAccessSession.queryInstance.setPermissionMode === "function") {
-            await fullAccessSession.queryInstance.setPermissionMode(fullAccessEnabled ? "default" : fullAccessSession.permissionMode);
-          }
-          sm.saveSessionFile(fullAccessSession);
-          sm.broadcastSessionList();
-          send({ type: "session_full_access_changed", id: fullAccessSession.localId, enabled: fullAccessEnabled, permissionMode: fullAccessSession.permissionMode });
+          if (!fullAccessEnabled && autonomousRun) await autonomousRun.stopForPermissionChange(fullAccessSession);
+          await fullAccessService.setEnabled(fullAccessSession, fullAccessEnabled);
           sendTo(ws, { type: "session_full_access_result", ok: true, id: fullAccessSession.localId, enabled: fullAccessEnabled });
         } catch (e) {
-          fullAccessSession.permissionMode = previousPermissionMode;
-          fullAccessSession.permissionModeBeforeFullAccess = previousRestoreMode;
           sendTo(ws, { type: "session_full_access_result", ok: false, id: fullAccessSession.localId, error: "Failed to change Skip Permissions: " + (e.message || e) });
         }
       })();

package/lib/project-user-message.js

@@ -70,6 +70,7 @@ function attachUserMessage(ctx) {
 
   var scheduleMessage = ctx.scheduleMessage;
   var cancelScheduledMessage = ctx.cancelScheduledMessage;
+  var sendScheduledMessageNow = ctx.sendScheduledMessageNow;
 
   var loadContextSources = ctx.loadContextSources;
   var saveContextSources = ctx.saveContextSources;
@@ -281,34 +282,21 @@ function attachUserMessage(ctx) {
     if (msg.type === "schedule_message") {
       var schedSession = getSessionForWs(ws);
       if (!schedSession || !msg.text || !msg.resetsAt) return true;
-      scheduleMessage(schedSession, msg.text, msg.resetsAt);
+      scheduleMessage(schedSession, msg.text, msg.resetsAt, ws._clayUser || null, ws);
       return true;
     }
 
     if (msg.type === "cancel_scheduled_message") {
       var cancelSession = getSessionForWs(ws);
       if (!cancelSession) return true;
-      cancelScheduledMessage(cancelSession);
+      cancelScheduledMessage(cancelSession, ws._clayUser || null, ws, { jobId: msg.jobId, revision: msg.revision });
       return true;
     }
 
     if (msg.type === "send_scheduled_now") {
       var nowSession = getSessionForWs(ws);
       if (!nowSession || !nowSession.scheduledMessage) return true;
-      var schedText = nowSession.scheduledMessage.text;
-      clearTimeout(nowSession.scheduledMessage.timer);
-      nowSession.scheduledMessage = null;
-      console.log("[project] Scheduled message sent immediately for session " + nowSession.localId);
-      sm.sendAndRecord(nowSession, { type: "scheduled_message_sent" });
-      var userMsg = { type: "user_message", text: schedText, _ts: Date.now() };
-      nowSession.history.push(userMsg);
-      sm.appendToSessionFile(nowSession, userMsg);
-      sendToSession(nowSession.localId, userMsg);
-      nowSession.isProcessing = true;
-      onProcessingChanged();
-      sendToSession(nowSession.localId, { type: "status", status: "processing" });
-      sdk.startQuery(nowSession, schedText, null, ensureProjectAccessForSession(nowSession));
-      sm.broadcastSessionList();
+      sendScheduledMessageNow(nowSession, ws._clayUser || null, ws, { jobId: msg.jobId, revision: msg.revision });
       return true;
     }
 
@@ -318,6 +306,11 @@ function attachUserMessage(ctx) {
     var session = getSessionForWs(ws);
     if (!session) return true;
 
+    if (session.loopInterviewHandoff && session.loopInterviewHandoff.state === "starting") {
+      sendTo(ws, { type: "error", text: "Wait for the approved Loop handoff to finish." });
+      return true;
+    }
+
     var deliveryReceipt = messageDelivery.inspect(ws, session, msg);
     if (deliveryReceipt.duplicate) {
       messageDelivery.acknowledge(ws, deliveryReceipt, hydrateImageRefs(deliveryReceipt.recordedMessage));
@@ -339,6 +332,19 @@ function attachUserMessage(ctx) {
       });
       return true;
     }
+    if (msg.autonomousRunToken) {
+      if (!ctx.autonomousRun || !ctx.autonomousRun.consume(session, msg)) {
+        sendTo(ws, { type: "error", text: "This Until complete submission is stale or no longer armed." });
+        return true;
+      }
+    } else if (session.autonomousRun && session.autonomousRun.state === "armed") {
+      sendTo(ws, { type: "error", text: "Until complete is still being armed. Wait for its acknowledgement before sending." });
+      return true;
+    } else if (ctx.autonomousRun) {
+      ctx.autonomousRun.onHumanMessage(session, msg);
+    }
+    var autonomousDeliveryMeta = session.autonomousRun && ["running", "reviewing", "waiting-worker", "waiting-user"].indexOf(session.autonomousRun.state) !== -1
+      ? { autonomousRunId: session.autonomousRun.id } : undefined;
     if (typeof ctx.beginHumanPairTurn === "function") ctx.beginHumanPairTurn(session);
     if (gitAttribution) gitAttribution.beginTurn(session);
 
@@ -552,7 +558,7 @@ function attachUserMessage(ctx) {
         if (!session.queryInstance && !session._queryStarting && (!session.worker || session.messageQueue !== "worker")) {
           // No active query (or worker idle between queries): start a new query
           startFreshQuery(finalText);
-        } else if (!sdk.pushMessage(session, finalText, msg.images)) {
+        } else if (!sdk.pushMessage(session, finalText, msg.images, autonomousDeliveryMeta)) {
           // Stale state won the branch (previous stream died between the
           // turn boundary and its cleanup) but there is nothing to deliver
           // to. Start a fresh query with this text instead of dropping it,
@@ -560,7 +566,7 @@ function attachUserMessage(ctx) {
           // response until the user sent the message again.
           startFreshQuery(finalText);
         }
-      } else if (!sdk.pushMessage(session, finalText, msg.images)) {
+      } else if (!sdk.pushMessage(session, finalText, msg.images, autonomousDeliveryMeta)) {
         // isProcessing was stuck true with no live query: same recovery.
         startFreshQuery(finalText);
       }