clay-server 2.34.0-beta.2 → 2.34.0-beta.4

package/lib/project.js

@@ -162,7 +162,7 @@ function createProjectContext(opts) {
   var latestVersion = null;
 
   // --- YOKE adapters (multi-vendor, lazy init) ---
-  var _yokeState = yoke.createAdapters({ cwd: cwd });
+  var _yokeState = yoke.createAdapters({ cwd: cwd, slug: slug });
   var adapters = _yokeState.adapters;
   var defaultVendor = adapters.claude ? "claude" : Object.keys(adapters)[0] || "claude";
   var adapter = adapters[defaultVendor] || null;
@@ -496,6 +496,63 @@ function createProjectContext(opts) {
       console.error("[project] Failed to create debate MCP server:", e.message);
     }
 
+    // Ask-user MCP server (mates only)
+    if (isMate) {
+      try {
+        var askUserMcp = require("./ask-user-mcp-server");
+        var askUserToolDefs = askUserMcp.getToolDefs(function onAsk(input) {
+          // Stateless: the tool's job is to *post* the question card.
+          // We do NOT hold a promise open waiting for the user. When the
+          // user answers, the answer is injected as a fresh user message
+          // on the next turn (see project-sessions.js ask_user_response).
+          // This avoids HTTP long-poll timeouts on the MCP bridge and
+          // matches the natural multi-turn agent loop.
+          var session = sm.getActiveSession();
+          if (!session) {
+            // No active session means we have no way to show a card or
+            // route the answer. Fail closed rather than pretend success.
+            return Promise.resolve({
+              content: [{ type: "text", text: "Error: no active session in " + slug + "; cannot display question card." }],
+              isError: true,
+            });
+          }
+          if (session.loop && session.loop.active && session.loop.role !== "crafting") {
+            return Promise.resolve({
+              content: [{ type: "text", text: "Error: Autonomous mode. Make your own decision." }],
+              isError: true,
+            });
+          }
+
+          var toolId = "ask_" + Date.now() + "_" + crypto.randomUUID().slice(0, 8);
+          // Track for UI card lifecycle + answer routing. No resolve function.
+          session.pendingAskUser[toolId] = {
+            input: input,
+            mode: "mcp",
+            sessionId: session.localId,
+            postedAt: Date.now(),
+          };
+
+          sm.sendAndRecord(session, {
+            type: "tool_executing",
+            id: toolId,
+            name: "AskUserQuestion",
+            input: input,
+          });
+
+          return Promise.resolve({
+            content: [{
+              type: "text",
+              text: "The question card has been posted to the user. End this turn now without further commentary; the user's answer will arrive as the next user message.",
+            }],
+          });
+        });
+        var askUserMcpConfig = adapter.createToolServer({ name: "clay-ask-user", version: "1.0.0", tools: askUserToolDefs });
+        if (askUserMcpConfig) servers[askUserMcpConfig.name || "clay-ask-user"] = askUserMcpConfig;
+      } catch (e) {
+        console.error("[project] Failed to create ask-user MCP server:", e.message);
+      }
+    }
+
     // Browser MCP server (main project only, not mates)
     if (!isMate) {
       try {
@@ -1318,6 +1375,13 @@ function createProjectContext(opts) {
     getLatestVersion: function () { return latestVersion; },
     getTitle: function () { return title; },
     getProject: function () { return project; },
+    // Exposed so the first websocket connection can lazily warm up the
+    // adapters for this project (see project-connection handleConnection).
+    warmup: function () {
+      sdk.warmup();
+      sdk.startIdleReaper();
+      sm.migrateSessionTitles(adapter, cwd);
+    },
   });
 
   // --- Destroy ---
@@ -1376,6 +1440,15 @@ function createProjectContext(opts) {
       var tmpDir = path.join(os.tmpdir(), "clay-" + cwdHash);
       fs.rmSync(tmpDir, { recursive: true, force: true });
     } catch (e) {}
+
+    var codexShutdown = Promise.resolve(true);
+    if (adapters && adapters.codex && typeof adapters.codex.shutdown === "function") {
+      codexShutdown = adapters.codex.shutdown().catch(function(err) {
+        console.error("[project] Codex shutdown failed for " + slug + ":", err && err.message ? err.message : err);
+        return false;
+      });
+    }
+    return codexShutdown;
   }
 
   // --- Status info ---
@@ -1523,15 +1596,9 @@ function createProjectContext(opts) {
       broadcastClientCount();
       broadcastPresence();
     },
-    warmup: function () {
-      sdk.warmup();
-      sdk.startIdleReaper();
-      // Migrate existing relay session titles to SDK format (one-time, async)
-      sm.migrateSessionTitles(adapter, cwd);
-    },
     destroy: function () {
       sdk.stopIdleReaper();
-      destroy();
+      return destroy();
     },
   };
 }

package/lib/public/css/mates.css

@@ -410,18 +410,18 @@
   line-height: 1.4;
 }
 
-/* Step 4: Autonomy options */
-.mate-autonomy-options {
+/* Step 4: Vendor options */
+.mate-vendor-option-list {
   display: flex;
   flex-direction: column;
-  gap: 8px;
+  gap: 10px;
 }
-.mate-autonomy-btn {
+.mate-vendor-option-btn {
   display: flex;
-  flex-direction: column;
+  flex-direction: row;
   align-items: flex-start;
-  gap: 2px;
-  padding: 12px 16px;
+  gap: 14px;
+  padding: 14px 16px;
   background: var(--input-bg, #1a1a2e);
   border: 2px solid var(--border, #333);
   border-radius: 10px;
@@ -430,21 +430,36 @@
   text-align: left;
   color: var(--text, #fff);
   font-family: inherit;
+  width: 100%;
 }
-.mate-autonomy-btn:hover {
+.mate-vendor-option-btn:hover {
   border-color: var(--text-dimmer, #6272a4);
 }
-.mate-autonomy-btn.active {
+.mate-vendor-option-btn.active {
   border-color: var(--accent, #6c5ce7);
   background: var(--accent-bg, rgba(108,92,231,0.12));
 }
-.mate-autonomy-title {
+.mate-vendor-option-icon {
+  width: 36px;
+  height: 36px;
+  border-radius: 8px;
+  flex-shrink: 0;
+  object-fit: cover;
+}
+.mate-vendor-option-text {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  min-width: 0;
+}
+.mate-vendor-option-title {
   font-weight: 600;
   font-size: 14px;
 }
-.mate-autonomy-desc {
+.mate-vendor-option-desc {
   font-size: 12px;
   color: var(--text-muted, #9ea8c7);
+  line-height: 1.4;
 }
 
 /* Footer */
@@ -1997,19 +2012,60 @@ body.mate-dm-active #layout.sidebar-collapsed .mate-collapsed-info {
 }
 
 /* Mate datastore inspector */
-#mate-sidebar-datastore {
+#mate-datastore-panel {
+  position: absolute;
+  inset: 0;
+  z-index: 40;
+  background: var(--bg);
   display: flex;
   flex-direction: column;
-  flex: 1;
-  min-height: 0;
+  overflow: hidden;
+}
+
+#mate-datastore-panel.hidden {
+  display: none !important;
 }
 
-#mate-sidebar-datastore.hidden {
+#main-column.mate-datastore-open > .title-bar-content,
+#main-column.mate-datastore-open > .dm-header-bar,
+#main-column.mate-datastore-open > #main-panels {
   display: none !important;
 }
 
+.mate-datastore-top-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 48px;
+  padding: 0 16px;
+  border-bottom: 1px solid var(--border-subtle);
+  flex-shrink: 0;
+}
+
+.mate-datastore-top-title {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-weight: 700;
+  font-size: 15px;
+  color: var(--text);
+}
+
+.mate-datastore-top-title .lucide {
+  width: 14px;
+  height: 14px;
+  color: var(--accent);
+  opacity: 0.85;
+}
+
+.mate-datastore-top-actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
 .mate-db-status {
-  padding: 8px 12px 0;
+  padding: 10px 14px 0;
   font-size: 12px;
   color: var(--text-secondary, #8e8e8e);
 }
@@ -2028,9 +2084,9 @@ body.mate-dm-active #layout.sidebar-collapsed .mate-collapsed-info {
 
 .mate-db-layout {
   display: grid;
-  grid-template-columns: 130px minmax(0, 1fr);
+  grid-template-columns: 220px minmax(0, 1fr);
   gap: 10px;
-  padding: 8px 8px 12px;
+  padding: 12px 10px 10px;
   min-height: 0;
   flex: 1;
 }
@@ -2044,10 +2100,10 @@ body.mate-dm-active #layout.sidebar-collapsed .mate-collapsed-info {
 
 .mate-db-table-list {
   overflow-y: auto;
-  border: 1px solid var(--border-subtle, rgba(255,255,255,0.08));
-  border-radius: 10px;
-  background: var(--bg-alt, rgba(255,255,255,0.03));
-  padding: 4px;
+  border: 1px solid var(--border-subtle, rgba(255,255,255,0.06));
+  border-radius: 12px;
+  background: var(--sidebar-bg, rgba(255,255,255,0.03));
+  padding: 6px;
   flex: 1;
 }
 
@@ -2123,46 +2179,32 @@ body.mate-dm-active #layout.sidebar-collapsed .mate-collapsed-info {
 }
 
 .mate-db-table-schema {
-  max-height: 120px;
+  max-height: 180px;
 }
 
-.mate-db-query,
-.mate-db-params {
-  width: 100%;
-  min-height: 72px;
-  padding: 10px;
-  border-radius: 10px;
-  border: 1px solid var(--border-subtle, rgba(255,255,255,0.1));
-  background: var(--bg-secondary, rgba(255,255,255,0.04));
-  color: var(--text, #fff);
-  font-family: var(--mono-font, ui-monospace, SFMono-Regular, Menlo, Consolas, monospace);
-  font-size: 11px;
-  resize: vertical;
+@media (max-width: 900px) {
+  .mate-db-layout {
+    grid-template-columns: 1fr;
+  }
 }
 
-.mate-db-params {
-  min-height: 54px;
+body.mate-dm-active .mate-datastore-top-bar {
+  background: var(--mate-color);
+  color: #fff;
 }
 
-.mate-db-actions {
-  display: flex;
-  gap: 8px;
+body.mate-dm-active .mate-datastore-top-title,
+body.mate-dm-active .mate-datastore-top-title .lucide {
+  color: #fff;
 }
 
-.mate-db-actions button {
-  flex: 1;
-  height: 30px;
-  border: none;
-  border-radius: 8px;
-  background: var(--sidebar-active, rgba(255,255,255,0.08));
-  color: var(--text, #fff);
-  font-size: 12px;
-  font-weight: 600;
-  cursor: pointer;
+body.mate-dm-active .mate-datastore-top-bar .scheduler-close-btn {
+  color: rgba(255, 255, 255, 0.85);
 }
 
-.mate-db-actions button:hover {
-  background: var(--sidebar-hover, rgba(255,255,255,0.12));
+body.mate-dm-active .mate-datastore-top-bar .scheduler-close-btn:hover {
+  color: #fff;
+  background: rgba(255, 255, 255, 0.15);
 }
 
 .mate-session-item.search-match {

package/lib/public/index.html

@@ -270,7 +270,6 @@
         <div class="mate-sidebar-sessions-header">
           <span>Conversations</span>
           <div class="mate-sidebar-actions">
-            <button id="mate-data-btn" type="button" title="Data inspector"><i data-lucide="database"></i></button>
             <button id="mate-search-session-btn" type="button" title="Search sessions"><i data-lucide="search"></i></button>
             <button id="mate-new-session-btn" type="button" title="New session"><i data-lucide="plus"></i></button>
           </div>
@@ -281,33 +280,6 @@
         </div>
         <div id="mate-session-list" class="mate-session-list"></div>
       </div>
-      <div id="mate-sidebar-datastore" class="hidden">
-        <div class="mate-sidebar-sessions-header">
-          <span>Data</span>
-          <div class="mate-sidebar-actions">
-            <button id="mate-db-refresh-btn" type="button" title="Refresh tables"><i data-lucide="refresh-cw"></i></button>
-            <button id="mate-db-back-btn" type="button" title="Back to conversations"><i data-lucide="x"></i></button>
-          </div>
-        </div>
-        <div class="mate-db-status" id="mate-db-status"></div>
-        <div class="mate-db-layout">
-          <div class="mate-db-table-column">
-            <div class="mate-db-section-title">Objects</div>
-            <div id="mate-db-table-list" class="mate-db-table-list"></div>
-          </div>
-          <div class="mate-db-detail">
-            <div class="mate-db-section-title" id="mate-db-table-name">No table selected</div>
-            <pre id="mate-db-table-schema" class="mate-db-table-schema"></pre>
-            <textarea id="mate-db-query" class="mate-db-query" spellcheck="false" placeholder="SELECT * FROM table LIMIT 50;"></textarea>
-            <textarea id="mate-db-params" class="mate-db-params" spellcheck="false" placeholder='[]'></textarea>
-            <div class="mate-db-actions">
-              <button id="mate-db-query-btn" type="button">Query</button>
-              <button id="mate-db-exec-btn" type="button">Exec</button>
-            </div>
-            <pre id="mate-db-result" class="mate-db-result"></pre>
-          </div>
-        </div>
-      </div>
       <div id="mate-sidebar-memory" class="hidden"></div>
       <div id="mate-sidebar-knowledge" class="hidden">
         <div class="mate-sidebar-sessions-header">
@@ -1883,7 +1855,7 @@
             <div class="mate-intro-step"><span class="mate-intro-step-num">2</span> Have a short interview where your Mate gets to know you</div>
             <div class="mate-intro-step"><span class="mate-intro-step-num">3</span> Start talking</div>
           </div>
-          <p class="mate-intro-privacy">Mates run on Claude Code. No separate API keys or external services needed. Your conversations stay on your Clay server and are never stored elsewhere.</p>
+          <p class="mate-intro-privacy">Mates run on Claude Code or ChatGPT Codex, your choice. No separate API keys or external services needed. Your conversations stay on your Clay server and are never stored elsewhere.</p>
         </div>
       </div>
       <!-- Step 1: Relationship -->
@@ -2024,26 +1996,24 @@
         </div>
       </div>
 
-      <!-- Step 4: Autonomy -->
+      <!-- Step 4: Vendor -->
       <div class="mate-step" data-step="4">
-        <h3>How much should they do on their own?</h3>
-        <p class="mate-hint">This is about how much freedom your mate gets before checking with you.</p>
-        <div class="mate-autonomy-options">
-          <button class="mate-autonomy-btn" data-value="always_ask">
-            <span class="mate-autonomy-title">Ask me everything</span>
-            <span class="mate-autonomy-desc">"Before you do anything, run it by me first."</span>
-          </button>
-          <button class="mate-autonomy-btn active" data-value="minor_stuff_ok">
-            <span class="mate-autonomy-title">Small stuff is fine</span>
-            <span class="mate-autonomy-desc">"Little things, just do it. Anything big, ask me."</span>
-          </button>
-          <button class="mate-autonomy-btn" data-value="mostly_autonomous">
-            <span class="mate-autonomy-title">Mostly free</span>
-            <span class="mate-autonomy-desc">"Do your thing. Only check if it's really important."</span>
+        <h3>Which model should power them?</h3>
+        <p class="mate-hint">You can switch this anytime from the mate's settings.</p>
+        <div class="mate-vendor-option-list">
+          <button class="mate-vendor-option-btn active" data-value="claude">
+            <img src="/claude-code-avatar.png" class="mate-vendor-option-icon" alt="Claude Code">
+            <div class="mate-vendor-option-text">
+              <span class="mate-vendor-option-title">Claude Code</span>
+              <span class="mate-vendor-option-desc">Anthropic's Claude. Thoughtful, conversational, strong at nuanced reasoning and long-form writing. A good default for most mates.</span>
+            </div>
           </button>
-          <button class="mate-autonomy-btn" data-value="fully_autonomous">
-            <span class="mate-autonomy-title">Full freedom</span>
-            <span class="mate-autonomy-desc">"Just get it done and tell me after."</span>
+          <button class="mate-vendor-option-btn" data-value="codex">
+            <img src="/codex-avatar.png" class="mate-vendor-option-icon" alt="ChatGPT Codex">
+            <div class="mate-vendor-option-text">
+              <span class="mate-vendor-option-title">ChatGPT Codex</span>
+              <span class="mate-vendor-option-desc">OpenAI's GPT coding agent. Fast and direct, strong at code generation and tight execution loops. Good for builder-type mates.</span>
+            </div>
           </button>
         </div>
       </div>

package/lib/public/modules/app-dm.js

@@ -474,8 +474,6 @@ export function buildMateInterviewPrompt(mate) {
     var styles = sd.communicationStyle.map(function (s) { return styleLabels[s] || s.replace(/_/g, " "); });
     parts.push("Communication: " + styles.join(", "));
   }
-  if (sd.autonomy) parts.push("Autonomy: " + sd.autonomy.replace(/_/g, " "));
-
   return "Use the /clay-mate-interview skill to start the interview.\n\n" +
     "Mate ID: " + mate.id + "\n" +
     "Mate Directory: .claude/mates/" + mate.id + "\n\n" +

package/lib/public/modules/app-messages.js

@@ -14,7 +14,7 @@ import { renderSessionList, updateSessionPresence, populateCliSessionList, handl
 import { updateDmBadge, renderSidebarPresence, setMentionActive, renderUserStrip } from './sidebar-mates.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { renderMateSessionList, handleMateSearchResults, updateMateSidebarProfile } from './mate-sidebar.js';
-import { handleMateDatastoreTablesResult, handleMateDatastoreDescribeResult, handleMateDatastoreQueryResult, handleMateDatastoreExecResult, handleMateDatastoreError, handleMateDatastoreChange } from './mate-datastore-ui.js';
+import { handleMateDatastoreTablesResult, handleMateDatastoreDescribeResult, handleMateDatastoreQueryResult, handleMateDatastoreError, handleMateDatastoreChange } from './mate-datastore-ui.js';
 import { renderKnowledgeList, handleKnowledgeContent } from './mate-knowledge.js';
 import { renderMemoryList } from './mate-memory.js';
 import { handlePaletteSessionSwitch, setPaletteVersion } from './command-palette.js';
@@ -288,10 +288,6 @@ export function processMessage(msg) {
         handleMateDatastoreQueryResult(msg);
         break;
 
-      case "mate_db_exec_result":
-        handleMateDatastoreExecResult(msg);
-        break;
-
       case "mate_db_error":
         handleMateDatastoreError(msg);
         break;
@@ -736,6 +732,8 @@ export function processMessage(msg) {
           getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
         } else if (msg.name === "propose_debate" || (msg.name && msg.name.indexOf("propose_debate") !== -1)) {
           getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
+        } else if (msg.name === "ask_user_questions") {
+          getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
         } else if (getTodoTools()[msg.name]) {
           getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
         } else {

package/lib/public/modules/app-rendering.js

@@ -17,12 +17,10 @@ import { getScheduledMsgEl } from './app-rate-limit.js';
 export var VENDOR_AVATARS = {
   claude: "/claude-code-avatar.png",
   codex: "/codex-avatar.png",
-  gemini: "/claude-code-avatar.png",
 };
 export var VENDOR_NAMES = {
   claude: "Claude Code",
   codex: "Codex",
-  gemini: "Gemini",
 };
 var NEW_MSG_BTN_DEFAULT = "\u2193 Latest";
 var NEW_MSG_BTN_ACTIVITY = "\u2193 New activity";