clay-server 2.34.0-beta.1 → 2.34.0-beta.10

package/lib/public/index.html

@@ -197,17 +197,14 @@
         </div>
         <div id="sidebar-sessions-header">
           <div id="sessions-header-content">
-            <div class="session-list-header">
-              <span>Sessions</span>
-              <div class="session-list-header-actions">
-                <button id="new-session-btn" type="button" data-tip="New session"><i data-lucide="plus"></i></button>
-                <button id="resume-session-btn" type="button" data-tip="Import CLI session"><i data-lucide="import"></i></button>
-                <button id="search-session-btn" type="button" data-tip="Search sessions"><i data-lucide="search"></i></button>
+            <div class="sidebar-sessions-header-row">
+              <span class="sidebar-section-label">Sessions</span>
+              <span id="session-filter-count" class="session-filter-count hidden"></span>
+              <div id="session-header-search-inline" class="sidebar-sessions-search-inline hidden">
+                <input id="session-header-search-input" type="text" placeholder="Search sessions..." autocomplete="off" spellcheck="false" />
+                <button id="session-header-search-clear" type="button" aria-label="Clear search"><i data-lucide="x"></i></button>
               </div>
-            </div>
-            <div id="session-search" class="hidden">
-              <input id="session-search-input" type="text" placeholder="Search sessions..." autocomplete="off" spellcheck="false" />
-              <button id="session-search-clear" type="button" aria-label="Clear search"><i data-lucide="x"></i></button>
+              <button id="session-header-search-btn" type="button" aria-label="Search sessions" title="Search sessions"><i data-lucide="search"></i></button>
             </div>
           </div>
           <div id="files-header-content" class="hidden"></div>
@@ -270,7 +267,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 +277,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 +1852,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 +1993,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";

package/lib/public/modules/diff.js

@@ -238,25 +238,39 @@ export function renderSplitDiff(oldStr, newStr, lang) {
  * Parses hunk headers for line numbers. Optional lang for syntax highlighting.
  * Returns a DOM element.
  */
-export function renderPatchDiff(text, lang) {
+/**
+ * Reconstruct old and new source text from a unified patch string.
+ * Skips file headers, "diff --git" lines, index lines, and hunk headers.
+ * Returns { oldStr, newStr }.
+ */
+export function reconstructPatchSources(text) {
   var lines = text.split("\n");
-
-  // Reconstruct old and new source for highlighting
   var oldSrc = [];
   var newSrc = [];
   for (var p = 0; p < lines.length; p++) {
     var pl = lines[p];
-    if (pl.startsWith("-") && !pl.startsWith("---")) {
+    if (pl.startsWith("---") || pl.startsWith("+++")) continue;
+    if (pl.startsWith("diff ") || pl.startsWith("index ")) continue;
+    if (pl.startsWith("@@")) continue;
+    if (pl.startsWith("-")) {
       oldSrc.push(pl.substring(1));
-    } else if (pl.startsWith("+") && !pl.startsWith("+++")) {
+    } else if (pl.startsWith("+")) {
       newSrc.push(pl.substring(1));
     } else if (pl.startsWith(" ")) {
       oldSrc.push(pl.substring(1));
       newSrc.push(pl.substring(1));
     }
   }
-  var oldHL = highlightLines(oldSrc.join("\n"), lang);
-  var newHL = highlightLines(newSrc.join("\n"), lang);
+  return { oldStr: oldSrc.join("\n"), newStr: newSrc.join("\n") };
+}
+
+export function renderPatchDiff(text, lang) {
+  var lines = text.split("\n");
+
+  // Reconstruct old and new source for highlighting
+  var sources = reconstructPatchSources(text);
+  var oldHL = highlightLines(sources.oldStr, lang);
+  var newHL = highlightLines(sources.newStr, lang);
   var oldHLIdx = 0;
   var newHLIdx = 0;
 

package/lib/public/modules/mate-datastore-ui.js

@@ -7,29 +7,85 @@ var panelEl = null;
 var tableListEl = null;
 var tableNameEl = null;
 var tableSchemaEl = null;
-var queryInputEl = null;
-var paramsInputEl = null;
 var resultEl = null;
 var statusEl = null;
 var dataBtnEl = null;
-var conversationsEl = null;
-var memoryEl = null;
-var knowledgeEl = null;
+var mainColumnEl = null;
 var currentTables = [];
 var currentTable = null;
 var panelOpen = false;
+var routingToScheduler = false;
 
 function sendWs(msg) {
   var ws = wsGetter ? wsGetter() : getWs();
   if (ws && ws.readyState === 1) ws.send(JSON.stringify(msg));
 }
 
+function quoteIdentifier(name) {
+  return '"' + String(name || "").replace(/"/g, '""') + '"';
+}
+
+function ensurePanel() {
+  if (panelEl) return;
+  mainColumnEl = document.getElementById("main-column");
+  if (!mainColumnEl) return;
+
+  panelEl = document.createElement("div");
+  panelEl.id = "mate-datastore-panel";
+  panelEl.className = "hidden";
+
+  panelEl.innerHTML =
+    '<div class="scheduler-top-bar mate-datastore-top-bar">' +
+      '<span class="scheduler-top-title mate-datastore-top-title"><i data-lucide="database"></i>Data</span>' +
+      '<div class="mate-datastore-top-actions">' +
+        '<button id="mate-db-refresh-btn" class="scheduler-close-btn" type="button" title="Refresh tables"><i data-lucide="refresh-cw"></i></button>' +
+        '<button id="mate-db-back-btn" class="scheduler-close-btn" type="button" title="Close"><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>' +
+        '<div class="mate-db-section-title">Rows</div>' +
+        '<pre id="mate-db-result" class="mate-db-result"></pre>' +
+      '</div>' +
+    '</div>';
+
+  mainColumnEl.appendChild(panelEl);
+  tableListEl = document.getElementById("mate-db-table-list");
+  tableNameEl = document.getElementById("mate-db-table-name");
+  tableSchemaEl = document.getElementById("mate-db-table-schema");
+  resultEl = document.getElementById("mate-db-result");
+  statusEl = document.getElementById("mate-db-status");
+
+  var refreshBtn = document.getElementById("mate-db-refresh-btn");
+  var backBtn = document.getElementById("mate-db-back-btn");
+
+  if (refreshBtn) {
+    refreshBtn.addEventListener("click", function () {
+      requestTables();
+    });
+  }
+
+  if (backBtn) {
+    backBtn.addEventListener("click", function () {
+      setSectionVisibility(false);
+    });
+  }
+
+  refreshIcons();
+}
+
 function setSectionVisibility(open) {
+  ensurePanel();
   panelOpen = open;
   if (panelEl) panelEl.classList.toggle("hidden", !open);
-  if (conversationsEl) conversationsEl.classList.toggle("hidden", open);
-  if (memoryEl) memoryEl.classList.toggle("hidden", true);
-  if (knowledgeEl) knowledgeEl.classList.toggle("hidden", true);
+  if (mainColumnEl) mainColumnEl.classList.toggle("mate-datastore-open", open);
   if (dataBtnEl) dataBtnEl.classList.toggle("active", open);
   refreshIcons();
 }
@@ -49,6 +105,21 @@ function renderResult(payload) {
   resultEl.textContent = JSON.stringify(payload, null, 2);
 }
 
+function formatColumns(columns) {
+  var list = Array.isArray(columns) ? columns : [];
+  if (!list.length) return "No column information available.";
+  var lines = [];
+  for (var i = 0; i < list.length; i++) {
+    var col = list[i] || {};
+    var line = (col.name || "?") + " " + (col.type || "");
+    if (col.pk) line += " PRIMARY KEY";
+    if (col.notnull) line += " NOT NULL";
+    if (typeof col.dflt_value !== "undefined" && col.dflt_value !== null) line += " DEFAULT " + col.dflt_value;
+    lines.push(line.trim());
+  }
+  return lines.join("\n");
+}
+
 function renderTableList(objects) {
   currentTables = objects || [];
   if (!tableListEl) return;
@@ -101,94 +172,43 @@ function selectTable(tableName) {
   if (obj.type !== "table" && obj.type !== "view") {
     renderStatus("Selected " + (obj.type || "object") + " " + tableName + ".", "ok");
     if (tableNameEl) tableNameEl.textContent = tableName;
-    if (tableSchemaEl) tableSchemaEl.textContent = obj.sql || "";
+    if (tableSchemaEl) tableSchemaEl.textContent = (obj.type || "object") + ": " + tableName;
     renderResult(obj);
     return;
   }
   renderStatus("Loading " + tableName + "...", "info");
   sendWs({ type: "mate_db_describe", table: tableName });
-  if (queryInputEl) queryInputEl.value = 'SELECT * FROM "' + tableName.replace(/"/g, '""') + '" LIMIT 50;';
-}
-
-function parseParams() {
-  if (!paramsInputEl) return [];
-  var text = paramsInputEl.value.trim();
-  if (!text) return [];
-  try {
-    var parsed = JSON.parse(text);
-    if (Array.isArray(parsed)) return parsed;
-    renderStatus("Parameters must be a JSON array.", "error");
-  } catch (e) {
-    renderStatus("Parameters must be valid JSON.", "error");
-  }
-  return null;
-}
-
-function sendQueryMessage(type) {
-  var sql = queryInputEl ? queryInputEl.value : "";
-  var params = parseParams();
-  if (params === null) return;
-  if (!sql || !sql.trim()) {
-    renderStatus("Enter SQL before running it.", "error");
-    return;
-  }
-  sendWs({ type: type, sql: sql, params: params });
+  sendWs({ type: "mate_db_query", sql: "SELECT * FROM " + quoteIdentifier(tableName) + " LIMIT 100", params: [] });
 }
 
 export function initMateDatastoreUI(getWsFn) {
   wsGetter = getWsFn;
-  panelEl = document.getElementById("mate-sidebar-datastore");
-  tableListEl = document.getElementById("mate-db-table-list");
-  tableNameEl = document.getElementById("mate-db-table-name");
-  tableSchemaEl = document.getElementById("mate-db-table-schema");
-  queryInputEl = document.getElementById("mate-db-query");
-  paramsInputEl = document.getElementById("mate-db-params");
-  resultEl = document.getElementById("mate-db-result");
-  statusEl = document.getElementById("mate-db-status");
   dataBtnEl = document.getElementById("mate-data-btn");
-  conversationsEl = document.getElementById("mate-sidebar-conversations");
-  memoryEl = document.getElementById("mate-sidebar-memory");
-  knowledgeEl = document.getElementById("mate-sidebar-knowledge");
-
-  var refreshBtn = document.getElementById("mate-db-refresh-btn");
-  var queryBtn = document.getElementById("mate-db-query-btn");
-  var execBtn = document.getElementById("mate-db-exec-btn");
-  var backBtn = document.getElementById("mate-db-back-btn");
-
-  if (dataBtnEl) {
-    dataBtnEl.addEventListener("click", function () {
-      if (panelOpen) {
-        setSectionVisibility(false);
-      } else {
-        setSectionVisibility(true);
-        requestTables();
-      }
-    });
-  }
+  if (!dataBtnEl) return;
 
-  if (refreshBtn) {
-    refreshBtn.addEventListener("click", function () {
+  dataBtnEl.addEventListener("click", function () {
+    if (panelOpen) {
+      setSectionVisibility(false);
+    } else {
+      setSectionVisibility(true);
       requestTables();
-    });
-  }
-
-  if (queryBtn) {
-    queryBtn.addEventListener("click", function () {
-      sendQueryMessage("mate_db_query");
-    });
-  }
-
-  if (execBtn) {
-    execBtn.addEventListener("click", function () {
-      sendQueryMessage("mate_db_exec");
-    });
-  }
+    }
+  });
 
-  if (backBtn) {
-    backBtn.addEventListener("click", function () {
-      setSectionVisibility(false);
-    });
-  }
+  document.addEventListener("click", function (e) {
+    var btn = e.target && e.target.closest ? e.target.closest("#scheduler-btn, #mate-scheduler-btn") : null;
+    if (!btn || !panelOpen || routingToScheduler) return;
+    e.preventDefault();
+    e.stopPropagation();
+    if (typeof e.stopImmediatePropagation === "function") e.stopImmediatePropagation();
+    routingToScheduler = true;
+    setSectionVisibility(false);
+    setTimeout(function () {
+      var schedulerBtn = document.getElementById("scheduler-btn");
+      if (schedulerBtn) schedulerBtn.click();
+      routingToScheduler = false;
+    }, 0);
+  }, true);
 
   setSectionVisibility(false);
 }
@@ -234,8 +254,7 @@ export function handleMateDatastoreDescribeResult(msg) {
   }
   renderStatus(msg.warning || ("Described " + (msg.table || "table") + "."), msg.warning ? "warn" : "ok");
   if (tableNameEl) tableNameEl.textContent = msg.table || "Table";
-  if (tableSchemaEl) tableSchemaEl.textContent = msg.createSql || "";
-  renderResult(msg);
+  if (tableSchemaEl) tableSchemaEl.textContent = formatColumns(msg.columns);
 }
 
 export function handleMateDatastoreQueryResult(msg) {
@@ -244,19 +263,10 @@ export function handleMateDatastoreQueryResult(msg) {
     renderResult(msg);
     return;
   }
-  renderStatus(msg.warning || ("Returned " + (msg.rowCount || 0) + " row(s)."), msg.warning ? "warn" : "ok");
-  renderResult(msg);
-}
-
-export function handleMateDatastoreExecResult(msg) {
-  if (msg.ok === false) {
-    renderStatus(msg.message || "Execution failed.", "error");
-    renderResult(msg);
-    return;
-  }
-  renderStatus(msg.warning || ("Applied " + (msg.changes || 0) + " change(s)."), msg.warning ? "warn" : "ok");
-  renderResult(msg);
-  requestTables();
+  var status = "Showing " + (msg.rows ? msg.rows.length : 0) + " row(s).";
+  if (msg.truncated) status = status.replace(".", " (truncated).");
+  renderStatus(msg.warning || status, msg.warning ? "warn" : "ok");
+  renderResult(msg.rows || []);
 }
 
 export function handleMateDatastoreError(msg) {

package/lib/public/modules/mate-sidebar.js

@@ -225,15 +225,6 @@ export function showMateSidebar(mateId, mateData) {
     if (sd.communicationStyle && sd.communicationStyle.length > 0) {
       seedTooltip.appendChild(makeSeedTags("Style", sd.communicationStyle.map(function (s) { return s.replace(/_/g, " "); })));
     }
-    if (sd.autonomy) {
-      var autonomyLabels = {
-        always_ask: "Ask me everything",
-        minor_stuff_ok: "Small stuff is fine",
-        mostly_autonomous: "Mostly free",
-        fully_autonomous: "Full freedom",
-      };
-      seedTooltip.appendChild(makeSeedRow("Autonomy", autonomyLabels[sd.autonomy] || sd.autonomy.replace(/_/g, " ")));
-    }
   }
 
   // Clear session list

package/lib/public/modules/mate-wizard.js

@@ -6,7 +6,7 @@ var mateWizardData = {
   relationship: null,
   activity: [],
   communicationStyle: [],
-  autonomy: "minor_stuff_ok",
+  vendor: "claude",
 };
 
 var _sendWs = null;
@@ -85,19 +85,19 @@ export function initMateWizard(sendWs, onMateCreated) {
     })(styleCards[i]);
   }
 
-  // Step 4: Autonomy button clicks
-  var autonomyBtns = document.querySelectorAll("#mate-wizard .mate-autonomy-btn");
-  for (var i = 0; i < autonomyBtns.length; i++) {
+  // Step 4: Vendor button clicks
+  var vendorBtns = document.querySelectorAll("#mate-wizard .mate-vendor-option-btn");
+  for (var i = 0; i < vendorBtns.length; i++) {
     (function (btn) {
       btn.addEventListener("click", function () {
-        var allBtns = document.querySelectorAll("#mate-wizard .mate-autonomy-btn");
+        var allBtns = document.querySelectorAll("#mate-wizard .mate-vendor-option-btn");
         for (var j = 0; j < allBtns.length; j++) {
           allBtns[j].classList.remove("active");
         }
         btn.classList.add("active");
-        mateWizardData.autonomy = btn.dataset.value;
+        mateWizardData.vendor = btn.dataset.value;
       });
-    })(autonomyBtns[i]);
+    })(vendorBtns[i]);
   }
 }
 
@@ -107,7 +107,7 @@ export function openMateWizard() {
     relationship: null,
     activity: [],
     communicationStyle: [],
-    autonomy: "minor_stuff_ok",
+    vendor: "claude",
   };
 
   // Reset UI
@@ -136,12 +136,12 @@ export function openMateWizard() {
     styleCards[i].classList.remove("selected");
   }
 
-  // Reset autonomy
-  var autonomyBtns = el.querySelectorAll(".mate-autonomy-btn");
-  for (var i = 0; i < autonomyBtns.length; i++) {
-    autonomyBtns[i].classList.remove("active");
-    if (autonomyBtns[i].dataset.value === "minor_stuff_ok") {
-      autonomyBtns[i].classList.add("active");
+  // Reset vendor
+  var vendorBtns = el.querySelectorAll(".mate-vendor-option-btn");
+  for (var i = 0; i < vendorBtns.length; i++) {
+    vendorBtns[i].classList.remove("active");
+    if (vendorBtns[i].dataset.value === "claude") {
+      vendorBtns[i].classList.add("active");
     }
   }
 
@@ -220,7 +220,7 @@ function collectMateWizardData() {
     mateWizardData.communicationStyle.push(selectedStyles[i].dataset.value);
   }
 
-  // Autonomy (already set via button clicks)
+  // Vendor (already set via button clicks)
 }
 
 function mateWizardNext() {

package/lib/public/modules/sidebar-mobile.js

@@ -11,7 +11,8 @@ import { getMateSessions } from './mate-sidebar.js';
 import { openProjectSettings } from './project-settings.js';
 import {
   getCachedSessions,
-  getDateGroup
+  getDateGroup,
+  openResumePicker
 } from './sidebar-sessions.js';
 import {
   getCachedProjectList,
@@ -389,12 +390,6 @@ function createMobileSessionItem(s) {
 
   var titleSpan = document.createElement("span");
   titleSpan.className = "mobile-session-title";
-  if (s.bookmarked) {
-    var bookmarkIcon = document.createElement("span");
-    bookmarkIcon.className = "mobile-session-bookmark";
-    bookmarkIcon.innerHTML = iconHtml("star");
-    titleSpan.appendChild(bookmarkIcon);
-  }
   titleSpan.appendChild(document.createTextNode(s.title || "New Session"));
   el.appendChild(titleSpan);
 
@@ -720,8 +715,7 @@ function renderMobileSessionsInto(container) {
   importBtn.innerHTML = '<i data-lucide="import" style="width:16px;height:16px"></i> Import session';
   importBtn.addEventListener("click", function () {
     closeMobileSheet();
-    var targetBtn = document.getElementById("resume-session-btn");
-    if (targetBtn) setTimeout(function () { targetBtn.click(); }, 250);
+    setTimeout(function () { openResumePicker(); }, 250);
   });
   container.appendChild(importBtn);
 
@@ -784,7 +778,7 @@ function renderMobileSessionsInto(container) {
   if (bookmarkedItems.length > 0) {
     var bookmarkedHeader = document.createElement("div");
     bookmarkedHeader.className = "mobile-sheet-group";
-    bookmarkedHeader.textContent = "Bookmarked";
+    bookmarkedHeader.textContent = "Favorites";
     container.appendChild(bookmarkedHeader);
 
     for (var bi = 0; bi < bookmarkedItems.length; bi++) {
@@ -798,10 +792,12 @@ function renderMobileSessionsInto(container) {
     var group = getDateGroup(item.lastActivity || 0);
     if (group !== currentGroup) {
       currentGroup = group;
-      var header = document.createElement("div");
-      header.className = "mobile-sheet-group";
-      header.textContent = group;
-      container.appendChild(header);
+      if (group !== "Today") {
+        var header = document.createElement("div");
+        header.className = "mobile-sheet-group";
+        header.textContent = group;
+        container.appendChild(header);
+      }
     }
     if (item.type === "loop") {
       container.appendChild(createMobileLoopGroup(item.loopId, item.children, item.groupKey));
@@ -977,12 +973,6 @@ function renderSearchResults(container, query) {
 
     var titleSpan = document.createElement("span");
     titleSpan.className = "mobile-session-title";
-    if (s.bookmarked) {
-      var bookmarkIcon = document.createElement("span");
-      bookmarkIcon.className = "mobile-session-bookmark";
-      bookmarkIcon.innerHTML = iconHtml("star");
-      titleSpan.appendChild(bookmarkIcon);
-    }
     titleSpan.appendChild(document.createTextNode(title));
     el.appendChild(titleSpan);