clay-server 5.2.0-beta.5 → 5.2.0-beta.7

package/lib/public/modules/settings-defaults.js

@@ -2,9 +2,9 @@
 // Used by both server-settings.js and project-settings.js
 
 export var MODE_OPTIONS = [
-  { value: "default", label: "Default", desc: "Claude asks for permission before running tools and editing files." },
-  { value: "plan", label: "Plan", desc: "Claude creates a plan first and asks for approval before making changes." },
-  { value: "acceptEdits", label: "Auto-accept edits", desc: "File edits are applied automatically. Claude still asks before running commands." },
+  { value: "default", label: "Default", desc: "The agent asks for permission before running tools and editing files." },
+  { value: "plan", label: "Plan", desc: "The agent creates a plan first and asks for approval before making changes." },
+  { value: "acceptEdits", label: "Auto-accept edits", desc: "File edits are applied automatically. The agent still asks before running commands." },
 ];
 
 export var EFFORT_LEVELS = [
@@ -16,29 +16,17 @@ export var EFFORT_LEVELS = [
 
 export var THINKING_OPTIONS = [
   { value: "disabled", label: "Off", desc: "Disable extended thinking." },
-  { value: "adaptive", label: "Adaptive", desc: "Claude decides when to use extended thinking." },
+  { value: "adaptive", label: "Adaptive", desc: "The agent decides when to use extended thinking." },
   { value: "budget", label: "Budget", desc: "Set a token budget for extended thinking." },
 ];
 
-export var MODEL_DESCRIPTIONS = {
-  "default": "Automatically selects the best model for the task.",
-  "sonnet": "Fast and capable. Great balance of speed and intelligence.",
-  "haiku": "Fastest model. Best for quick tasks and simple questions.",
-  "opus": "Most powerful model. Best for complex reasoning and analysis.",
-};
-
 export function getModelDesc(model) {
-  if (!model) return "";
-  var lower = (model.value || model).toLowerCase();
-  for (var key in MODEL_DESCRIPTIONS) {
-    if (lower.indexOf(key) !== -1) return MODEL_DESCRIPTIONS[key];
-  }
-  return "";
+  return model && typeof model === "object" && typeof model.description === "string" ? model.description : "";
 }
 
+// Compatibility name for the retired beta control; model metadata owns support.
 export function isSonnetModel(model) {
-  if (!model) return false;
-  return model.toLowerCase().indexOf("sonnet") !== -1;
+  return !!(model && typeof model === "object" && model.supportsBetaContext === true);
 }
 
 // --- Render functions ---
@@ -75,7 +63,7 @@ export function renderModelList(prefix, opts) {
       nameSpan.textContent = label;
       item.appendChild(nameSpan);
 
-      var desc = getModelDesc(value);
+      var desc = getModelDesc(m);
       if (desc) {
         var descSpan = document.createElement("span");
         descSpan.className = "settings-model-desc";
@@ -106,7 +94,9 @@ export function renderModeList(prefix, opts) {
   var currentMode = opts.currentMode || "default";
   listEl.innerHTML = "";
 
-  for (var i = 0; i < MODE_OPTIONS.length; i++) {
+  var modes = (opts.configuration || {}).permissionModes || [];
+  if (listEl.parentElement) listEl.parentElement.style.display = modes.length ? "" : "none";
+  for (var i = 0; i < modes.length; i++) {
     (function (opt) {
       var item = document.createElement("div");
       item.className = "settings-model-item" + (opt.value === currentMode ? " active" : "");
@@ -129,7 +119,7 @@ export function renderModeList(prefix, opts) {
       });
 
       listEl.appendChild(item);
-    })(MODE_OPTIONS[i]);
+    })(modes[i]);
   }
 }
 
@@ -143,7 +133,12 @@ export function renderEffortBar(prefix, opts) {
   var currentEffort = opts.currentEffort || "medium";
   bar.innerHTML = "";
 
-  for (var i = 0; i < EFFORT_LEVELS.length; i++) {
+  var levels = opts.effortLevels || [];
+  var model = (opts.models || []).find(function (item) { return item.value === opts.currentModel; });
+  if (model && model.supportsEffort === false) levels = [];
+  else if (model && Array.isArray(model.supportedEffortLevels)) levels = model.supportedEffortLevels;
+  if (bar.parentElement) bar.parentElement.style.display = levels.length ? "" : "none";
+  for (var i = 0; i < levels.length; i++) {
     (function (lvl) {
       var btn = document.createElement("button");
       btn.className = "settings-btn-option" + (lvl.value === currentEffort ? " active" : "");
@@ -156,7 +151,7 @@ export function renderEffortBar(prefix, opts) {
         btn.classList.add("active");
       });
       bar.appendChild(btn);
-    })(EFFORT_LEVELS[i]);
+    })({ value: levels[i], desc: (EFFORT_LEVELS.find(function (item) { return item.value === levels[i]; }) || {}).desc || "" });
   }
 }
 
@@ -173,7 +168,10 @@ export function renderThinkingBar(prefix, opts) {
   var budgetInput = document.getElementById(prefix + "-thinking-budget");
   bar.innerHTML = "";
 
-  for (var i = 0; i < THINKING_OPTIONS.length; i++) {
+  var thinking = (opts.configuration || {}).thinking;
+  if (bar.parentElement) bar.parentElement.style.display = thinking ? "" : "none";
+  var thinkingOptions = thinking ? THINKING_OPTIONS.filter(function(opt) { return thinking.options.indexOf(opt.value) >= 0; }) : [];
+  for (var i = 0; i < thinkingOptions.length; i++) {
     (function (opt) {
       var btn = document.createElement("button");
       btn.className = "settings-btn-option" + (opt.value === currentThinking ? " active" : "");
@@ -191,10 +189,10 @@ export function renderThinkingBar(prefix, opts) {
         if (budgetRow) budgetRow.style.display = opt.value === "budget" ? "" : "none";
       });
       bar.appendChild(btn);
-    })(THINKING_OPTIONS[i]);
+    })(thinkingOptions[i]);
   }
 
-  if (budgetRow) budgetRow.style.display = currentThinking === "budget" ? "" : "none";
+  if (budgetRow) budgetRow.style.display = thinking && currentThinking === "budget" ? "" : "none";
   if (budgetInput) {
     budgetInput.value = currentBudget;
     budgetInput.addEventListener("change", function () {
@@ -212,7 +210,8 @@ export function renderBetaCard(prefix, opts) {
   var model = opts.overrideModel || opts.currentModel || "";
   var card = document.getElementById(prefix + "-beta-card");
   if (card) {
-    card.style.display = isSonnetModel(model) ? "" : "none";
+    var descriptor = (opts.models || []).find(function(item) { return item.value === model; });
+    card.style.display = isSonnetModel(descriptor) ? "" : "none";
   }
 
   var toggle = document.getElementById(prefix + "-beta-1m");

package/lib/public/modules/shared-browser.js

@@ -1,3 +1,4 @@
+import { registerStudioPaint } from './clay-studio-render.js';
 import { browserLinkTarget, initBrowserLinks } from './clay-browser-links.js';
 import { browserSettingsHtml, bindBrowserSettings, renderBrowserSettings, closeBrowserSettings, handleBrowserSettingsMessage } from './shared-browser-settings.js';
 import { renderBrowserTabs } from './shared-browser-tabs.js';
@@ -229,6 +230,7 @@ export function handleSharedBrowserMessage(msg) {
         var canvas = panel().querySelector('canvas'); canvas.width = image.naturalWidth; canvas.height = image.naturalHeight;
         canvas.getContext('2d').drawImage(image, 0, 0);
         ui({ decoding: false, hasFrame: true }); render();
+        registerStudioPaint(msg, canvas, null, canvas);
       }
     };
     image.onerror = function () { if (store.get('activeSessionId') === sessionId) ui({ decoding: false }); };

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

@@ -1,4 +1,5 @@
-import { openMateWorkspace, isMateWorkspace } from './project-mate-navigation.js';
+import { contextualMate } from './contextual-mate-identity.js';
+import { activateContextualMate, isMateWorkspace } from './project-mate-navigation.js';
 import { appendGithubWork } from './session-github.js';
 // sidebar-mobile.js - Mobile sheet overlays, tab bar, and mobile-specific rendering
 // Extracted from sidebar.js (PR-38)
@@ -258,7 +259,7 @@ function renderSheetSessions(listEl) {
   }
 
   var visibleChipMates = getCachedMates().filter(function (m) {
-    return m && !m.archived;
+    return m && !m.archived && contextualMate(m.id);
   });
   var sortedChipMates = visibleChipMates.sort(function (a, b) {
     var aBuiltin = a.builtinKey ? 1 : 0;
@@ -327,7 +328,7 @@ function renderSheetSessions(listEl) {
       renderMobileSessionsInto(sessionListEl);
     } else if (type === "mate") {
       closeMobileSheet();
-      openMateWorkspace(mateId);
+      activateContextualMate(mateId);
     }
 
     refreshIcons();

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

@@ -822,6 +822,7 @@ function createIconItem(p, currentSlug) {
   var el = document.createElement("a");
   var isActive = p.slug === currentSlug && !currentDmUserId;
   el.className = "icon-strip-item" + (isActive ? " active" : "");
+  el.dataset.controlRuntime = p.controlRuntimeId || "";
   el.href = "/p/" + p.slug + "/";
   el.dataset.slug = p.slug;
 

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

@@ -826,6 +826,7 @@ function renderSessionItem(s, options) {
   el.className = "session-item" + (displaySession.active ? " active" : "") + (isMatch ? " search-match" : "");
   if (itemOptions.worker) el.classList.add("session-worker-item");
   el.dataset.sessionId = s.id;
+  el.dataset.controlSessionOrigin = s.sessionOriginId || '';
 
   var textSpan = document.createElement("span");
   textSpan.className = "session-item-text";

package/lib/public/modules/split-view.js

@@ -1,3 +1,5 @@
+import { adoptDocumentSource } from './clay-studio-document.js';
+import { trustedStudioFrame } from './clay-studio-render.js';
 import { handlePaneBrowserMessage } from './pane-browser-bridge.js';
 import { openWireframe } from './wireframe-workbench.js';
 // Two-pane iframe shell for the split-view spike.
@@ -144,22 +146,11 @@ function handlePaneMessage(event) {
   if (event.origin !== window.location.origin) return;
   var msg = event.data;
   if (!msg || !host) return;
-  if (msg.type === "clay-pane-present-wireframe") {
-    var frames = host.querySelectorAll(".split-pane-frame");
-    var split = store.get('splitPanes');
-    var trusted = Array.prototype.some.call(frames, function (frame) {
-      if (frame.contentWindow !== event.source || frame.dataset.projectSlug !== msg.projectSlug || String(frame.dataset.sessionId) !== String(msg.sessionId) || msg.projectSlug !== store.get('currentSlug')) return false;
-      return split && split.panes.some(function (pane) {
-        var expected = new URL('/p/' + encodeURIComponent(pane.slug) + '/?pane=1&session=' + encodeURIComponent(pane.sessionId), window.location.href).href;
-        return pane.slug === msg.projectSlug && String(pane.sessionId) === String(msg.sessionId) && frame.src === expected;
-      });
-    });
-    if (trusted && msg.message) openWireframe(msg.message);
-    return;
-  }
-  if (msg.type === "clay-pane-present-markdown") {
-    var present = msg.message;
-    if (present) presentMarkdownEdit(present);
+  if (msg.type === "clay-pane-present-wireframe" || msg.type === "clay-pane-present-markdown") {
+    if (msg.message && !msg.message.controlPresentation && trustedStudioFrame(event, msg)) {
+      if (msg.type === "clay-pane-present-wireframe") openWireframe(msg.message);
+      else { adoptDocumentSource(event, msg, trustedStudioFrame(event, msg)); presentMarkdownEdit(msg.message); }
+    }
     return;
   }
   // Both panes can report auth_required for their own sessions. The shell runs

package/lib/public/modules/terminal.js

@@ -1,3 +1,4 @@
+import { store } from './store.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { closeSidebar } from './sidebar.js';
 import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
@@ -538,6 +539,8 @@ function renderTabBar() {
     (function (t) {
       var el = document.createElement("div");
       el.className = "terminal-tab";
+      el.dataset.controlTerminalId = String(t.id);
+      el.dataset.controlRuntime = store.get("controlRuntimeId") || "";
       if (t.id === activeTabId) el.classList.add("active");
       if (t.exited) el.classList.add("exited");
 
@@ -696,6 +699,7 @@ function updateTerminalBadge() {
 // --- Handle server messages ---
 
 export function handleTermList(msg) {
+  store.set({ clayControlTerminalViews: (msg.terminals || []).map(function (item) { return { id: item.id, identity: item.controlIdentity, revision: item.controlRevision, runtimeId: store.get('controlRuntimeId') }; }) });
   // TUI session terminals are owned by session-tui-view.js and must not
   // appear in the bottom terminal panel. Filter them out before any tab
   // bookkeeping so the panel never tries to render or auto-attach them.
@@ -762,7 +766,11 @@ export function handleTermCreated(msg) {
   }
 }
 
+export function handleTerminalProjection(msg) {
+  if (msg.controlIdentity && msg.controlRevision) store.set({ clayControlTerminalViews: (store.get('clayControlTerminalViews') || []).map(function (item) { return item.id === msg.id && item.identity === msg.controlIdentity ? Object.assign({}, item, { revision: msg.controlRevision }) : item; }) });
+}
 export function handleTermOutput(msg) {
+  handleTerminalProjection(msg);
   if (!msg.id) return;
   var tab = tabs.get(msg.id);
   if (tab && tab.xterm && msg.data) {
@@ -771,6 +779,7 @@ export function handleTermOutput(msg) {
 }
 
 export function handleTermResized(msg) {
+  handleTerminalProjection(msg);
   if (!msg.id) return;
   var tab = tabs.get(msg.id);
   if (tab && tab.xterm && msg.cols > 0 && msg.rows > 0) {

package/lib/public/modules/tools.js

@@ -1,3 +1,4 @@
+import { renderProductReview } from './product-review.js';
 import { clayToolGroupSummary } from './clay-tool-presentation.js';
 import { applyClayToolItem, applyClayToolResult, finishClayToolItem, findEndedClayTool, clayToolResultGroup, bindToolGroupDisclosure, syncToolGroupDisclosure, syncClayToolGroup } from './clay-tool-activity.js';
 import { escapeHtml, copyToClipboard } from './utils.js';
@@ -176,7 +177,8 @@ function updateToolGroupHeader(group) {
 }
 
 function isPlanFile(filePath) {
-  return filePath && filePath.indexOf(".claude/plans/") !== -1;
+  var info = (store.get('vendorInfo') || {})[store.get('currentVendor')] || {};
+  return !!filePath && (info.planPathSegments || []).some(function (segment) { return filePath.indexOf(segment) !== -1; });
 }
 
 export function toolSummary(name, input) {
@@ -297,6 +299,7 @@ export function renderAskUserQuestion(toolId, input) {
     var qText = document.createElement("div");
     qText.className = "ask-user-question-text";
     qText.textContent = q.question || "";
+    if (renderProductReview(qText, q)) qDiv.dataset.answerLabel = q.review.action;
     qDiv.appendChild(qText);
 
     var optionsDiv = document.createElement("div");
@@ -475,7 +478,8 @@ function showAnswerSummary(container, questions, answers) {
     var row = document.createElement("div");
     row.className = "ask-user-answer-row";
     var qi = parseInt(key, 10);
-    var label = (questions && questions[qi] && questions[qi].question) ? questions[qi].question : "Answer";
+    var questionNode = container.querySelectorAll(".ask-user-question")[qi];
+    var label = questionNode && questionNode.dataset.answerLabel || (questions && questions[qi] && (questions[qi].header || questions[qi].question)) || "Answer";
     row.innerHTML = '<span class="ask-user-answer-label">' + escapeHtml(label) + '</span>' +
       '<span class="ask-user-answer-value">' + escapeHtml(String(answers[key])) + '</span>';
     summary.appendChild(row);

package/lib/public/modules/tui-grab.js

@@ -635,10 +635,9 @@ export function attachTuiGrab(xterm, containerEl, localId, opts) {
   if (opts && opts.vendor) {
     var vendors = store.get('vendorInfo') || {};
     var info = vendors[opts.vendor];
-    var legacyTuiVendors = ["claude"];
     var supportsTui = info
       ? Array.isArray(info.sessionModes) && info.sessionModes.indexOf("tui") !== -1
-      : legacyTuiVendors.indexOf(opts.vendor) !== -1;
+      : false;
     if (!supportsTui) return;
   }
 

package/lib/public/modules/vendor-login-browser.js

@@ -1,3 +1,4 @@
+import { escapeHtml } from './utils.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { iconHtml, refreshIcons } from './icons.js';
@@ -33,7 +34,8 @@ export function openLoginBrowser(msg) {
   }
   closeLoginBrowser();
   var isMcp = msg.kind === 'mcp';
-  var title = isMcp ? 'Sign in to ' + (msg.label || 'MCP server') : (msg.vendor === "codex" ? "Sign in to Codex" : "Sign in to Claude");
+  var provider = (store.get('vendorInfo') || {})[msg.vendor] || {};
+  var title = 'Sign in to ' + (isMcp ? msg.label || 'MCP server' : provider.displayName || msg.vendor || 'Provider');
   store.set({ vendorLoginBrowser: {
     browserId: msg.browserId, vendor: msg.vendor, kind: msg.kind, connectionId: msg.connectionId, slug: msg.slug || store.get('currentSlug'),
     previousFocus: document.activeElement, decoding: false, pointerY: null, pointerId: null, mouseDown: false, moveTimer: null, pendingMove: null, resizeObserver: null, requestedSize: null, phase: "loading",
@@ -43,7 +45,7 @@ export function openLoginBrowser(msg) {
   dialog.className = "login-browser";
   dialog.setAttribute("aria-labelledby", "login-browser-title");
   dialog.innerHTML = '<header class="login-browser-header">' +
-    '<img class="login-browser-vendor" src="/' + (msg.vendor === "codex" ? 'codex-avatar.png' : 'claude-code-avatar.png') + '" alt="">' +
+    '<img class="login-browser-vendor" src="' + escapeHtml(provider.avatar || '') + '" alt="">' +
     '<div class="login-browser-heading"><h2 id="login-browser-title"></h2>' +
     '<span class="login-browser-origin">Opening sign-in page…</span></div>' +
     '<div class="login-browser-actions">' +
@@ -56,7 +58,7 @@ export function openLoginBrowser(msg) {
     '<div class="login-browser-loading"><span class="login-browser-spinner" aria-hidden="true"></span><strong>Opening your sign-in page</strong><span>This may take a moment.</span></div>' +
     '<textarea class="login-browser-keyboard" aria-label="Type into the remote sign-in page" autocomplete="off" autocapitalize="off" spellcheck="false"></textarea></div>' +
     '<footer class="login-browser-footer"><div class="login-browser-info"><div class="login-browser-status"><span class="login-browser-status-dot" aria-hidden="true"></span><p role="status">Preparing sign-in…</p></div>' +
-    '<p class="login-browser-privacy">Browser cookies are discarded when this session ends. You stay signed in to ' + (msg.vendor === "codex" ? 'Codex' : 'Claude') + ' after this browser closes.</p></div>' +
+    '<p class="login-browser-privacy">Browser cookies are discarded when this session ends. You stay signed in to ' + escapeHtml(provider.displayName || msg.vendor || 'the provider') + ' after this browser closes.</p></div>' +
     '<button type="button" data-action="terminal" class="login-browser-terminal">' + iconHtml("terminal") + '<span>Use terminal sign-in</span>' + iconHtml("arrow-up-right") + '</button></footer>';
   dialog.querySelector("h2").textContent = title;
   document.body.appendChild(dialog);

package/lib/public/modules/vendor-login.js

@@ -31,7 +31,7 @@ function vendorDisplayName(vendor) {
   var vendors = store.get('vendorInfo') || {};
   var info = vendors[vendor];
   if (info && info.displayName) return info.displayName;
-  return vendor === "codex" ? "Codex" : "Claude Code";
+  return vendor || "Provider";
 }
 
 function currentProjectSlug() {
@@ -170,7 +170,7 @@ export function requestVendorLogin(vendor, opts) {
     vendor: target,
     auto: !!options.auto,
     sessionId: options.sessionId || store.get('activeSessionId') || null,
-    mode: options.mode || ((target === "claude" || target === "codex") ? "browser" : "terminal"),
+    mode: options.mode || ((((store.get("vendorInfo") || {})[target] || {}).browserLoginSupported === true) ? "browser" : "terminal"),
   }));
   showLoginStartedBanner(target);
   return true;

package/lib/public/modules/vendor-priority.js

@@ -1,4 +1,18 @@
-export var VENDOR_ORDER = ["claude", "codex", "grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode", "kiro"];
+export var VENDOR_ORDER = ["claude", "codex", "muse", "grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode", "kiro"];
+
+// Availability comes from the caller's server catalog. Unknown providers keep
+// their catalog order within each availability group.
+export function sortVendorEntries(entries) {
+  return entries.map(function (entry, index) { return { entry: entry, index: index }; }).sort(function (a, b) {
+    var installed = Number(!!b.entry.installed) - Number(!!a.entry.installed);
+    if (installed) return installed;
+    var aRank = VENDOR_ORDER.indexOf(a.entry.id);
+    var bRank = VENDOR_ORDER.indexOf(b.entry.id);
+    if (aRank === -1) aRank = VENDOR_ORDER.length;
+    if (bRank === -1) bRank = VENDOR_ORDER.length;
+    return aRank - bRank || a.index - b.index;
+  }).map(function (item) { return item.entry; });
+}
 export var EXPERIMENTAL_VENDORS = ["grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode"];
 
 export function isExperimentalVendor(vendor) {

package/lib/public/modules/wireframe-workbench.js

@@ -1,3 +1,4 @@
+import { forwardStudioPresentation, registerStudioPaint } from './clay-studio-render.js';
 import { sketchBrand, sketchCredit } from './wireframe-style.js';
 import { store } from './store.js';
 import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
@@ -80,7 +81,7 @@ function createPanel() {
 export function openWireframe(message) {
   if (!message || typeof message.source !== 'string' || new TextEncoder().encode(message.source).length > 100000) return;
   if (store.get('paneMode') && window.parent !== window) {
-    window.parent.postMessage({ type: 'clay-pane-present-wireframe', message: message, projectSlug: store.get('currentSlug'), sessionId: store.get('activeSessionId') }, window.location.origin);
+    forwardStudioPresentation(message, 'clay-pane-present-wireframe');
     return;
   }
   claimRightWorkbench('wireframe');
@@ -92,7 +93,8 @@ export function openWireframe(message) {
   el.querySelector('header strong').textContent = draft.title;
   el.querySelector('.wireframe-save-status').textContent = '';
   el.querySelector('form').hidden = true;
-  draw(draft, el).catch(function () {});
+  var painted = draw(draft, el); registerStudioPaint(Object.assign({}, message, { source: draft.source }), el.querySelector("header"), painted, el.querySelector(".wireframe-workbench-canvas"));
+  painted.catch(function () {});
 }
 function draw(draft, el) {
   var canvas = el.querySelector('.wireframe-workbench-canvas');
@@ -104,6 +106,7 @@ function draw(draft, el) {
     var image = wireframeImage(svg, draft.title);
     canvas.replaceChildren(image);
     mountWireframeViewport(canvas, image, el.querySelector('.wireframe-zoom'));
+    return image.decode ? image.decode() : undefined;
   }).catch(function (error) {
     if (store.get('wireframeDraft') !== active) throw error;
     status.textContent = error.name === 'AbortError' ? 'Rendering was interrupted. Reopen the wireframe to retry.' : error.message;

package/lib/public/muse-avatar.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="Muse Code">
+  <rect width="64" height="64" rx="14" fill="#111827"/>
+  <path d="M14 45V19h7l11 14 10-14h8v26h-7V30L32 45 21 30v15z" fill="#f8fafc"/>
+</svg>

package/lib/public/style.css

@@ -90,3 +90,5 @@
 @import url("css/project-settings-modal.css");
 
 @import url("css/clay-tool-activity.css");
+
+@import url("css/contextual-clay.css");

package/lib/safe-bash-commands.js

@@ -115,51 +115,9 @@ function isSafeBashSegment(seg) {
 // Emit the `Bash(...)` permission patterns for ~/.claude/settings.json. Each
 // standalone command gets a bare form (zero-arg) and a space-wildcard form
 // (claude 2.x prefix matching); subcommands and exact commands likewise.
-function buildClayBashAllowPatterns() {
-  var patterns = [];
-  for (var i = 0; i < STANDALONE.length; i++) {
-    patterns.push("Bash(" + STANDALONE[i] + ")");
-    patterns.push("Bash(" + STANDALONE[i] + " *)");
-  }
-  var bins = Object.keys(SUBCOMMAND);
-  for (var b = 0; b < bins.length; b++) {
-    var subs = SUBCOMMAND[bins[b]];
-    for (var s = 0; s < subs.length; s++) {
-      var base = bins[b] + " " + subs[s];
-      patterns.push("Bash(" + base + ")");
-      patterns.push("Bash(" + base + " *)");
-    }
-  }
-  for (var e = 0; e < EXACT.length; e++) {
-    patterns.push("Bash(" + EXACT[e] + ")");
-    patterns.push("Bash(" + EXACT[e] + " *)");
-  }
-  return patterns;
-}
-
-var GENERATED_SET = {};
-(function () {
-  var p = buildClayBashAllowPatterns();
-  for (var i = 0; i < p.length; i++) GENERATED_SET[p[i]] = true;
-})();
-
-// Recognize a `permissions.allow` entry that Clay owns, so the installer can
-// strip stale variants on upgrade (including shapes a previous version wrote)
-// WITHOUT clobbering user-authored patterns. Rules:
-//   - Standalone commands: own every shape of `Bash(ls ...)` (any args), since
-//     a user pattern for a command we manage is redundant with our broad one.
-//   - Subcommand binaries (git, npm, ...) and exact commands: only strip the
-//     precise patterns we generate, so a user's `Bash(git push)` survives.
-// Legacy colon shapes are handled separately by the installer.
-function isClayManagedBashPattern(p) {
-  if (typeof p !== "string") return false;
-  if (p.indexOf("Bash(") !== 0 || p.charAt(p.length - 1) !== ")") return false;
-  if (GENERATED_SET[p]) return true;
-  var inner = p.slice(5, -1).trim();
-  if (!inner) return false;
-  var word = inner.split(/[\s:]/)[0];
-  return STANDALONE_SET[word] === true;
-}
+var patternCodec = require("./yoke/claude-permission-patterns").attachPatterns({ STANDALONE: STANDALONE, SUBCOMMAND: SUBCOMMAND, EXACT: EXACT });
+function buildClayBashAllowPatterns() { return patternCodec.build(); }
+function isClayManagedBashPattern(pattern) { return patternCodec.isManaged(pattern); }
 
 module.exports = {
   STANDALONE: STANDALONE,