clay-server 3.2.2-beta.3 → 3.3.0-beta.2

package/lib/project-worker-proposal.js

@@ -0,0 +1,317 @@
+var crypto = require("crypto");
+var yoke = require("./yoke");
+var buildShape = require("./session-spawn-mcp-server").buildShape;
+
+var MAX_SUMMARY_CHARS = 600;
+var MAX_PLAN_CHARS = 6000;
+var MAX_TASK_CHARS = 30000;
+
+function modelValue(entry) {
+  if (typeof entry === "string") return entry;
+  return entry && (entry.value || entry.id) || "";
+}
+
+function modelLabel(entry) {
+  if (typeof entry === "string") return entry;
+  return entry && (entry.displayName || entry.name || entry.value || entry.id) || "";
+}
+
+function isFableSession(session, modelsByVendor, fallbackModel) {
+  if (!session || (session.vendor || "claude") !== "claude") return false;
+  var effectiveModel = session.model || fallbackModel || "";
+  var selected = String(effectiveModel).toLowerCase();
+  if (selected.indexOf("fable") !== -1) return true;
+  var models = (modelsByVendor && modelsByVendor.claude) || [];
+  for (var i = 0; i < models.length; i++) {
+    if (modelValue(models[i]) !== effectiveModel) continue;
+    if (modelLabel(models[i]).toLowerCase().indexOf("fable") !== -1) return true;
+  }
+  return false;
+}
+
+function toolResult(value) {
+  return Promise.resolve({ content: [{ type: "text", text: JSON.stringify(value) }] });
+}
+
+function attachWorkerProposal(ctx) {
+  var sm = ctx.sm;
+  var store = ctx.splitStore;
+
+  function isEligible(session) {
+    if (ctx.isMate || !session || session.mode === "tui") return false;
+    if (store.groupForMember(session.localId)) return false;
+    return isFableSession(session, sm.modelsByVendor, sm.currentModel);
+  }
+
+  function safeModelsByVendor(installed) {
+    var result = {};
+    for (var i = 0; i < installed.length; i++) {
+      var vendor = installed[i];
+      var source = (sm.modelsByVendor && sm.modelsByVendor[vendor]) || [];
+      result[vendor] = source.map(function (entry) {
+        if (typeof entry === "string") return entry;
+        return {
+          value: modelValue(entry),
+          displayName: modelLabel(entry),
+          supportedEffortLevels: entry.supportedEffortLevels || null,
+        };
+      });
+    }
+    return result;
+  }
+
+  function proposalOptions() {
+    var installed = (sm.installedVendors || []).slice();
+    var capabilities = {};
+    for (var i = 0; i < installed.length; i++) {
+      var source = (sm.capabilitiesByVendor && sm.capabilitiesByVendor[installed[i]]) || {};
+      var vendorInfo = yoke.getVendorInfo(installed[i]) || {};
+      var supportsEffort = Array.isArray(vendorInfo.effortLevels) && vendorInfo.effortLevels.length > 0;
+      capabilities[installed[i]] = { effort: source.effort === undefined ? supportsEffort : source.effort !== false };
+    }
+    return {
+      installedVendors: installed,
+      modelsByVendor: safeModelsByVendor(installed),
+      capabilitiesByVendor: capabilities,
+    };
+  }
+
+  async function ensureModelCatalogs() {
+    var installed = sm.installedVendors || [];
+    sm.modelsByVendor = sm.modelsByVendor || {};
+    for (var i = 0; i < installed.length; i++) {
+      var vendor = installed[i];
+      if (sm.modelsByVendor[vendor] && sm.modelsByVendor[vendor].length > 0) continue;
+      var adapter = ctx.adapters && ctx.adapters[vendor];
+      if (!adapter || typeof adapter.supportedModels !== "function") continue;
+      try { sm.modelsByVendor[vendor] = await adapter.supportedModels(); }
+      catch (err) { console.warn("[worker-proposal] Could not load " + vendor + " models:", err.message || err); }
+    }
+  }
+
+  function modelIsAvailable(options, vendor, model) {
+    if (!model) return true;
+    var models = options.modelsByVendor[vendor] || [];
+    for (var i = 0; i < models.length; i++) {
+      if (modelValue(models[i]) === model) return true;
+    }
+    return models.length === 0;
+  }
+
+  function chooseRecommendation(args, session, options) {
+    var installed = options.installedVendors;
+    var vendor = args.recommendedVendor;
+    if (installed.indexOf(vendor) === -1) {
+      if (installed.indexOf("codex") !== -1) vendor = "codex";
+      else {
+        vendor = installed[0] || session.vendor || "claude";
+        for (var i = 0; i < installed.length; i++) {
+          if (installed[i] !== session.vendor) { vendor = installed[i]; break; }
+        }
+      }
+    }
+    var models = options.modelsByVendor[vendor] || [];
+    var model = modelIsAvailable(options, vendor, args.recommendedModel) ? (args.recommendedModel || "") : "";
+    var currentModel = session.model || sm.currentModel || "";
+    if (vendor === session.vendor && model === currentModel) model = "";
+    if (!model && models.length > 0) {
+      for (var j = 0; j < models.length; j++) {
+        if (vendor === session.vendor && modelValue(models[j]) === currentModel) continue;
+        if (modelLabel(models[j]).toLowerCase().indexOf("fable") !== -1) continue;
+        model = modelValue(models[j]);
+        break;
+      }
+    }
+    if (!model && models.length > 0 && vendor !== session.vendor) model = modelValue(models[0]);
+    var effort = yoke.clampEffort(vendor, args.recommendedEffort || "medium") || "";
+    return { vendor: vendor, model: model, effort: effort };
+  }
+
+  function findProposal(session, proposalId) {
+    var history = (session && session.history) || [];
+    for (var i = history.length - 1; i >= 0; i--) {
+      if (history[i] && history[i].type === "worker_proposal" && history[i].proposalId === proposalId) return history[i];
+    }
+    return null;
+  }
+
+  function hasPendingProposal(session) {
+    var history = (session && session.history) || [];
+    for (var i = history.length - 1; i >= 0; i--) {
+      var item = history[i];
+      if (!item || item.type !== "worker_proposal") continue;
+      return item.status === "pending" || item.status === "starting" || item.status === "running";
+    }
+    return false;
+  }
+
+  function updateProposal(session, proposal, patch) {
+    Object.assign(proposal, patch, { updatedAt: Date.now() });
+    sm.saveSessionFile(session);
+    sm.sendToSession(session, Object.assign({
+      type: "worker_proposal_update",
+      proposalId: proposal.proposalId,
+    }, patch));
+  }
+
+  async function propose(args, session) {
+    if (!isEligible(session)) return toolResult({ error: "Worker suggestions are only available in an unpaired Fable session." });
+    if (hasPendingProposal(session)) return toolResult({ error: "A Worker suggestion is already awaiting a decision." });
+    var summary = typeof args.summary === "string" ? args.summary.trim() : "";
+    var plan = typeof args.plan === "string" ? args.plan.trim() : "";
+    var task = typeof args.message === "string" ? args.message.trim() : "";
+    if (!summary || !plan || !task) return toolResult({ error: "summary, plan, and message are required." });
+    if (task.length > MAX_TASK_CHARS) return toolResult({ error: "The Worker task is too long." });
+    await ensureModelCatalogs();
+    var options = proposalOptions();
+    if (options.installedVendors.length === 0) return toolResult({ error: "No coding agent is installed for a Worker session." });
+    var recommendation = chooseRecommendation(args, session, options);
+    var proposal = {
+      type: "worker_proposal",
+      proposalId: "worker_" + crypto.randomUUID(),
+      summary: summary.slice(0, MAX_SUMMARY_CHARS),
+      plan: plan.slice(0, MAX_PLAN_CHARS),
+      message: task,
+      status: "pending",
+      recommendedVendor: recommendation.vendor,
+      recommendedModel: recommendation.model,
+      recommendedEffort: recommendation.effort,
+      options: options,
+    };
+    sm.sendAndRecord(session, proposal);
+    return toolResult({
+      status: "posted",
+      proposalId: proposal.proposalId,
+      instruction: "The Worker suggestion is visible in the chat. End this turn now and wait for the user's decision.",
+    });
+  }
+
+  function resumeDriver(session, text) {
+    var sdk = ctx.getSdk();
+    if (!sdk) return Promise.reject(new Error("SDK bridge is not ready"));
+    var message = { type: "user_message", text: text, _internal: true };
+    sm.sendAndRecord(session, message);
+    session.sentToolResults = {};
+    if (!session.isProcessing) {
+      session.isProcessing = true;
+      ctx.onProcessingChanged();
+      sm.sendToSession(session, { type: "status", status: "processing" });
+    }
+    if (sdk.pushMessage(session, text)) return Promise.resolve();
+    return Promise.resolve(sdk.startQuery(session, text, undefined, ctx.getLinuxUserForSession(session)));
+  }
+
+  function parsePartnerResult(result) {
+    if (!result || result.isError || !result.content || !result.content[0]) {
+      return { status: "error", error: "Worker execution failed." };
+    }
+    try { return JSON.parse(result.content[0].text); }
+    catch (e) { return { status: "error", error: result.content[0].text || "Worker execution failed." }; }
+  }
+
+  async function runWorker(session, proposal) {
+    var result = parsePartnerResult(await ctx.sendToPartner({ message: proposal.message, wait: true, timeoutSeconds: 900 }, session));
+    var status = result.status === "complete" ? "completed" : result.status;
+    updateProposal(session, proposal, {
+      status: status || "error",
+      resultPreview: result.response ? result.response.slice(0, 1200) : "",
+      error: result.error || null,
+    });
+    var followup;
+    if (result.status === "complete") {
+      followup = "[Worker execution completed]\nReview the Worker's result, verify the implementation, and integrate any remaining changes.\n\n" + (result.response || "The Worker completed without a text summary.");
+    } else if (result.status === "running") {
+      followup = "[Worker execution is still running]\nUse read_partner to inspect progress before completing the task.";
+    } else {
+      followup = "[Worker execution failed]\nInspect the failure and decide whether to fix it here or delegate a narrower follow-up.\n\n" + (result.error || result.response || "Unknown Worker error.");
+    }
+    await resumeDriver(session, followup);
+  }
+
+  function sessionForResponse(ws) {
+    var session = sm.sessions.get(ws._clayActiveSession);
+    if (!session) throw new Error("active Driver session not found");
+    if (ctx.usersModule.isMultiUser()) {
+      var userId = ws._clayUser && ws._clayUser.id;
+      if (!userId || session.ownerId !== userId) throw new Error("Driver session access denied");
+    }
+    return session;
+  }
+
+  async function respondToProposal(ws, msg) {
+    var session = sessionForResponse(ws);
+    var proposal = findProposal(session, msg.proposalId);
+    if (!proposal) throw new Error("Worker suggestion not found");
+    if (proposal.status !== "pending") throw new Error("Worker suggestion has already been resolved");
+    if (!msg.accepted) {
+      updateProposal(session, proposal, { status: "declined" });
+      await resumeDriver(session, "[Worker suggestion declined]\nContinue this task in the current session using the plan you already prepared.");
+      return { ok: true, status: "declined" };
+    }
+    var options = proposal.options || proposalOptions();
+    var vendor = msg.vendor || proposal.recommendedVendor;
+    var model = msg.model || "";
+    if (options.installedVendors.indexOf(vendor) === -1) throw new Error("Selected Worker vendor is not installed");
+    if (!modelIsAvailable(options, vendor, model)) throw new Error("Selected Worker model is unavailable");
+    var effort = yoke.clampEffort(vendor, msg.effort || proposal.recommendedEffort || "medium") || "";
+    updateProposal(session, proposal, { status: "starting", selectedVendor: vendor, selectedModel: model, selectedEffort: effort });
+    try {
+      var created = ctx.createPairRecord(ws, {
+        driver: { sessionId: session.localId },
+        worker: { vendor: vendor, model: model, effort: effort },
+      });
+      updateProposal(session, proposal, { status: "running", groupId: created.group.id, workerId: created.worker.localId });
+      ctx.sendTo(ws, { type: "pair_session_created", ok: true, group: created.group });
+      runWorker(session, proposal).catch(function (err) {
+        updateProposal(session, proposal, { status: "error", error: err.message || String(err) });
+        resumeDriver(session, "[Worker execution failed]\n" + (err.message || String(err))).catch(function () {});
+      });
+      return { ok: true, status: "running", group: created.group };
+    } catch (err) {
+      updateProposal(session, proposal, { status: "pending", error: err.message || String(err) });
+      return { ok: false, status: "pending", error: err.message || String(err) };
+    }
+  }
+
+  function handleMessage(ws, msg) {
+    if (msg.type !== "worker_proposal_response") return false;
+    respondToProposal(ws, msg).catch(function (err) {
+      ctx.sendTo(ws, { type: "worker_proposal_update", proposalId: msg.proposalId, status: "pending", error: err.message || String(err) });
+    });
+    return true;
+  }
+
+  function getToolDefs(session) {
+    if (!isEligible(session)) return [];
+    return [{
+      name: "propose_worker",
+      description: "After making a concise plan for an implementation-heavy task, suggest that the user run the execution with another model in a visible Worker session. Use this only before substantial execution begins, never for small edits, explanations, or tasks the user asked you to keep in this session.",
+      inputSchema: buildShape({
+        summary: { type: "string", description: "One short sentence explaining why a Worker is useful for this task." },
+        plan: { type: "string", description: "A concise numbered implementation plan to show in the approval card." },
+        message: { type: "string", description: "Complete execution instructions for the Worker, including scope, constraints, validation, and expected result." },
+        recommendedVendor: { type: "string", description: "Optional installed vendor id for the Worker." },
+        recommendedModel: { type: "string", description: "Optional exact Worker model id. Omit when uncertain." },
+        recommendedEffort: { type: "string", description: "Optional reasoning effort: minimal, low, medium, high, xhigh, or max." },
+      }, ["summary", "plan", "message"]),
+      handler: function (args) { return propose(args || {}, session); },
+    }];
+  }
+
+  function getSystemPrompt(session) {
+    if (!isEligible(session)) return "";
+    return "You can introduce Clay's Driver/Worker workflow with propose_worker. For an implementation-heavy task that is likely to consume substantial execution time, first reason about the work and form a concise plan. Before editing files or running substantial execution, call propose_worker once with that plan and a complete Worker instruction, recommending another suitable execution model. Use it conservatively: do not suggest a Worker for questions, investigations, tiny fixes, or when the user explicitly wants you to execute here. After posting a proposal, end the turn and wait. If accepted, the Worker runs visibly and its result returns to you for review.";
+  }
+
+  return {
+    getToolDefs: getToolDefs,
+    getSystemPrompt: getSystemPrompt,
+    handleMessage: handleMessage,
+    respondToProposal: respondToProposal,
+  };
+}
+
+module.exports = {
+  attachWorkerProposal: attachWorkerProposal,
+  isFableSession: isFableSession,
+};

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;
@@ -541,6 +555,7 @@ function createProjectContext(opts) {
     usersModule: usersModule,
     getLinuxUserForSession: getLinuxUserForSession,
     onProcessingChanged: onProcessingChanged,
+    adapters: adapters,
   });
   var _sessionSpawn = attachSessionSpawn({
     cwd: cwd,
@@ -817,9 +832,10 @@ function createProjectContext(opts) {
     clayTls: serverTls,
     clayAuthToken: serverAuthToken,
     onProcessingChanged: onProcessingChanged,
-    onTurnDone: isMate ? function (session, preview) {
-      digestDmTurn(session, preview);
-    } : null,
+    onTurnDone: function (session, preview) {
+      if (isMate) digestDmTurn(session, preview);
+      else _sessionPair.handleTurnDone(session);
+    },
     scheduleMessage: function (session, text, resetsAt) {
       scheduleMessage(session, text, resetsAt);
     },
@@ -1150,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;
 
@@ -1406,6 +1419,7 @@ function createProjectContext(opts) {
     saveImageFile: saveImageFile,
     imagesDir: imagesDir,
     onProcessingChanged: onProcessingChanged,
+    gitAttribution: _gitAttribution,
     _loop: _loop,
     browserState: browserState,
     sendExtensionCommandAny: sendExtensionCommandAny,
@@ -1617,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();