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

package/lib/mate-datastore.js

@@ -3,10 +3,12 @@ var path = require("path");
 var config = require("./config");
 
 var sqlite;
+var _availabilityError = null;
 try {
   sqlite = require("node:sqlite");
 } catch (e) {
-  throw new Error("Mate datastores require Node 22.13.0 or newer with node:sqlite available.");
+  sqlite = null;
+  _availabilityError = "Mate datastores require Node 22.13.0 or newer with node:sqlite available.";
 }
 
 function parseNodeVersion(version) {
@@ -24,10 +26,13 @@ function assertNodeVersion() {
     throw new Error("Mate datastores require Node 22.13.0 or newer.");
   }
 }
+try {
+  assertNodeVersion();
+} catch (e) {
+  if (!_availabilityError) _availabilityError = e.message;
+}
 
-assertNodeVersion();
-
-var DatabaseSync = sqlite.DatabaseSync;
+var DatabaseSync = sqlite ? sqlite.DatabaseSync : null;
 
 var MAX_ROWS = 200;
 var MAX_RESULT_BYTES = 1024 * 1024;
@@ -37,6 +42,20 @@ var CLAY_META_VERSION = "1";
 
 var _dbCache = {};
 
+function isMateDatastoreAvailable() {
+  return !!DatabaseSync && !_availabilityError;
+}
+
+function getMateDatastoreAvailabilityError() {
+  return _availabilityError || null;
+}
+
+function assertAvailable() {
+  if (!isMateDatastoreAvailable()) {
+    throw new Error(getMateDatastoreAvailabilityError() || "Mate datastore is unavailable.");
+  }
+}
+
 function getMateDbPath(opts) {
   if (opts && opts.dbPath) return String(opts.dbPath);
   if (opts && opts.mateDir) return path.join(String(opts.mateDir), "store.db");
@@ -77,6 +96,7 @@ function initClayMeta(db) {
 }
 
 function ensureMateDatastore(opts) {
+  assertAvailable();
   var dbPath = getMateDbPath(opts);
   if (_dbCache[dbPath] && _dbCache[dbPath].db) return _dbCache[dbPath];
   ensureParentDir(dbPath);
@@ -257,7 +277,7 @@ function listSchemaObjects(handle) {
   }
   try {
     var rows = wrapper.db.prepare(
-      "SELECT name, type, sql FROM sqlite_master WHERE type IN ('table', 'view', 'index') AND name NOT LIKE 'sqlite_%' ORDER BY type, name"
+      "SELECT name, type, sql FROM sqlite_master WHERE type IN ('table', 'view', 'index') AND name NOT LIKE 'sqlite_%' AND name NOT LIKE 'clay_%' ORDER BY type, name"
     ).all();
     return { ok: true, objects: rows };
   } catch (e) {
@@ -325,6 +345,8 @@ function normalizeSqliteError(err, fallbackCode, fallbackMessage) {
 }
 
 module.exports = {
+  isMateDatastoreAvailable: isMateDatastoreAvailable,
+  getMateDatastoreAvailabilityError: getMateDatastoreAvailabilityError,
   openMateDatastore: openMateDatastore,
   ensureMateDatastore: ensureMateDatastore,
   listSchemaObjects: listSchemaObjects,

package/lib/project-mate-datastore.js

@@ -1,5 +1,6 @@
 var z = require("zod");
 var datastore = require("./mate-datastore");
+var FEATURE_ENABLED = false;
 
 function attachMateDatastore(ctx) {
   var cwd = ctx.cwd;
@@ -7,7 +8,14 @@ function attachMateDatastore(ctx) {
   var send = ctx.send;
   var sendTo = ctx.sendTo;
 
+  function isFeatureAvailable() {
+    return FEATURE_ENABLED && datastore.isMateDatastoreAvailable();
+  }
+
   function ensureProjectDatastore() {
+    if (!FEATURE_ENABLED) {
+      return { ok: false, code: "MATE_DATASTORE_NOT_ALLOWED", message: "Mate datastore is not enabled." };
+    }
     if (!isMate) {
       return { ok: false, code: "MATE_DATASTORE_NOT_ALLOWED", message: "Mate datastore is only available in Mate sessions." };
     }
@@ -87,6 +95,10 @@ function attachMateDatastore(ctx) {
       return false;
     }
 
+    if (!FEATURE_ENABLED) {
+      return false;
+    }
+
     if (!isMate) {
       sendTo(ws, {
         type: "mate_db_error",
@@ -127,7 +139,7 @@ function attachMateDatastore(ctx) {
   }
 
   function getToolDefinitions() {
-    if (!isMate) return [];
+    if (!isMate || !isFeatureAvailable()) return [];
     return [
       {
         name: "clay_db_query",
@@ -174,6 +186,7 @@ function attachMateDatastore(ctx) {
 
   function createMcpServer() {
     var defs = getToolDefinitions();
+    if (!defs.length) return null;
     var registered = {};
     for (var i = 0; i < defs.length; i++) {
       registered[defs[i].name] = {
@@ -192,7 +205,7 @@ function attachMateDatastore(ctx) {
   }
 
   function getSessionToolDefinitions() {
-    if (!isMate) return null;
+    if (!isMate || !isFeatureAvailable()) return null;
     return getToolDefinitions();
   }
 
@@ -205,6 +218,7 @@ function attachMateDatastore(ctx) {
   }
 
   return {
+    isFeatureAvailable: isFeatureAvailable,
     handleMateDatastoreMessage: handleMateDatastoreMessage,
     getToolDefinitions: getToolDefinitions,
     createMcpServer: createMcpServer,

package/lib/public/css/mates.css

@@ -1997,19 +1997,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 +2069,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 +2085,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 +2164,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">

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;

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/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/tools.js

@@ -799,7 +799,7 @@ function resolvePermissionIdentity(mateId, vendor) {
     }
   }
   // Project chat: use vendor name and avatar
-  var vendorAvatars = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png", gemini: "/gemini-avatar.png" };
+  var vendorAvatars = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png" };
   var vendorName = (vendor && VENDOR_NAMES[vendor]) || VENDOR_NAMES.claude;
   return {
     name: vendorName,

package/lib/sdk-bridge.js

@@ -1183,11 +1183,13 @@ function createSDKBridge(opts) {
       else if (session.acceptEditsAfterStart) effectiveDefault = "acceptEdits";
       else effectiveDefault = globalMode;
       var modeToApply = session._loopPermissionMode || effectiveDefault;
-      if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
       if (modeToApply && modeToApply !== "default") {
         claudeOpts.permissionMode = modeToApply;
       }
     }
+    // Clear one-shot acceptEditsAfterStart regardless of which branch ran above,
+    // so the flag does not linger into subsequent turns.
+    if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
     if (session.cliSessionId && session.lastRewindUuid) {
       claudeOpts.resumeSessionAt = session.lastRewindUuid;
       delete session.lastRewindUuid;