synabun 2.0.9 → 2.1.0

package/neural-interface/public/shared/ui-settings.js

@@ -1,18 +1,26 @@
+import { fetchToolCatalog } from './agent-runtime-options.js';
+import { configureToolPickerTranslation, toolPickerHTML, readToolPicker, toolWord } from './tool-list-picker.js';
 import { mountMemoryMaintenance } from './ui-memory-maintenance.js';
 import { buildJudgmentsTab, wireJudgmentsTab } from './ui-judgments.js';
 import { buildWhatsAppTab, wireWhatsAppTab } from './ui-whatsapp.js';
 import { buildCodeEditorTab, wireCodeEditorTab } from './settings/settings-code-editor-pane.js';
 import { buildAboutTab, wireAboutTab } from './settings/settings-about-pane.js';
+import { buildAppTab, wireAppTab } from './settings/settings-app-pane.js';
 import { SETTINGS_GROUPS, SETTINGS_PAGES, DEFAULT_SETTINGS_PAGE, pageKeys, getSettingsPage, resolveSettingsTarget, homeOfControl } from './settings/settings-ia.js';
 import * as kit from './settings/settings-kit.js';
+import { skillFoldersHTML, wireSkillFolders, refreshSkillChips, chipState, installedToast } from './settings/settings-skill-folders-pane.js';
 import { RULES_HOST_LABELS, describeRulesHost, describeRulesInstall, describeRulesInstallAll } from './settings/settings-rules.js';
 import { readUserContextResponse, describeUserContext, describeUserContextSaveFailure } from './settings/settings-user-context.js';
+import { readWorkerGuardResponse, describeWorkerGuard, describeWorkerGuardSaveFailure } from './settings/settings-worker-guard.js';
+import { CLAUDE_HOOK_ROWS, readClaudeHooksResponse, describeClaudeHooks, describeClaudeHooksSaveFailure } from './settings/settings-claude-hooks.js';
 import { readGreetingStatus, describeGreeting, describeGreetingSaveFailure } from './settings/settings-greeting.js';
+import { describeOpencodeInstall } from './settings/settings-opencode.js';
 import { renderGreeting, clearGreeting } from './greeting/greeting-card.js';
 import { createTunnelCard, drawInto, mcpKeyNeededText, readTunnel } from './ui-tunnel.js';
 import { remoteMcpAddress } from './tunnel-view.js';
 import { recheckCliStatus, getCliStatus, addCliToPath } from './cli-status.js';
 import { cliInstallText, setCliInstallTranslator } from './cli-install-view.js';
+import { dropdownHTML, wireDropdowns } from './cc-dropdown.js';
 setCliInstallTranslator((key, params) => kit.tx(`cliInstall.${key}`, params));
 import { setGitBashTranslator } from './git-bash-view.js';
 import { gitBashRowHtml, wireGitBashRow } from './ui-git-bash.js';
@@ -20,12 +28,14 @@ setGitBashTranslator((key, params) => kit.tx(`gitBash.${key}`, params));
 import { initI18n, isReady as i18nReady, SUPPORTED_LOCALES, LOCALE_NAMES, SYSTEM_LOCALE, getLocale, getLocaleChoice, setLocaleChoice, getSystemLocale, englishTranslator, loadEnglishTranslator } from './i18n.js';
 import { wireSettingsShell, wireSettingsSearch, collectSearchRows, revealSettingsTarget, followSettingsTarget, onSettingsTakeover, applyStoredSections, storeSectionState } from './settings/settings-shell.js';
 import { buildSettingsSearchIndex } from './settings/settings-search.js';
+import { prefetchSettingsData, readSettingsData, refreshSettingsData } from './settings/settings-data.js';
+import { registerLaunchPrefetch } from './launch-prefetch.js';
 // ═══════════════════════════════════════════
 // UI-SETTINGS — Settings modal with shared tabs + variant tab injection
 // ═══════════════════════════════════════════
 //
 // The most complex shared UI module. Builds a floating settings panel with
-// thirteen task pages in six groups (./settings/settings-ia.js). A page is a
+// fourteen task pages in six groups (./settings/settings-ia.js). A page is a
 // title, a one-line purpose and section cards (./settings/settings-kit.js);
 // each builder below owns one pane of a page. Variant-registered tabs (the 2D
 // Graphics tab) join the Appearance page. Old tab ids still open the right page.
@@ -34,6 +44,7 @@ import { state, emit, on } from './state.js';
 import { getSettingsTabs } from './registry.js';
 import { escapeHtml } from './utils.js';
 import { storage } from './storage.js';
+import { normalizeViewConfig } from './view-variant.js';
 import { KEYS } from './constants.js';
 import { registerAction } from './ui-keybinds.js';
 import { CLI_PROFILES, ensureModelsForProfile, getModelsForProfile } from './agent-runtime-options.js';
@@ -44,6 +55,7 @@ import { getNotifSettings, playTestSound, sendTestBanner, SOUND_PRESETS } from '
 import {
   fetchRulesStatus, fetchRulesTextWithFallback, installRules, removeRules, installAllRules, setRulesAutoUpdate, removeLegacyRules,
 } from './api.js';
+import { centeredInFrame } from './app-frame.js';
 
 // ── SVG icon constants ──
 
@@ -76,6 +88,8 @@ const TAB_ICONS = {
   whatsapp: '<svg viewBox="0 0 24 24"><path d="M3.5 20.5l1.3-3.9A8.5 8.5 0 1 1 8 19.6z"/><path d="M9.5 8.5c.4 2.6 2.9 5.2 5.5 5.6l1-1.2 1.6.8c-.3 1-1.1 1.6-2.1 1.5-2.9-.3-5.8-3.2-6.1-6.1-.1-1 .5-1.8 1.5-2.1l.8 1.6z"/></svg>',
   morelogin: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round"><path d="M12 11.5a1 1 0 0 0-1 1c0 1.8-.3 3.6-1.2 5.2"/><path d="M7.8 14.5a8 8 0 0 0-.6 4.3"/><path d="M12 7.5a4.5 4.5 0 0 1 4.5 4.5c0 .6 0 1.2-.1 1.8"/><path d="M5 9.2a7 7 0 0 1 11-1.9"/><path d="M15 13a3 3 0 0 1-3 3"/></svg>',
   editor: '<svg viewBox="0 0 24 24"><polyline points="16 18 22 12 16 6"/><polyline points="8 6 2 12 8 18"/><line x1="13.5" y1="5" x2="10.5" y2="19"/></svg>',
+  // Settings > App: the software's own controls (a window with its title bar)
+  app: '<svg viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="16" rx="2"/><line x1="3" y1="9" x2="21" y2="9"/><line x1="6.5" y1="6.5" x2="6.51" y2="6.5"/><line x1="9.5" y1="6.5" x2="9.51" y2="6.5"/></svg>',
   about: '<svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="11"/><line x1="12" y1="7.5" x2="12.01" y2="7.5"/></svg>',
 };
 
@@ -108,6 +122,7 @@ function showCCToast(msg, duration = 3500) {
 // INTERFACE CUSTOMIZATION — config, presets, apply
 // ═══════════════════════════════════════════
 
+// Optional legacy view preferences must never reintroduce a 2D selection.
 const IFACE_DEFAULTS = {
   visualizationEnabled: true,
   scale: 1,
@@ -156,7 +171,7 @@ const IFACE_SLIDERS = {
 export function loadIfaceConfig() {
   try {
     const raw = storage.getItem('neural-interface-config');
-    if (raw) return { ...IFACE_DEFAULTS, ...JSON.parse(raw) };
+    if (raw) return { ...IFACE_DEFAULTS, ...normalizeViewConfig(JSON.parse(raw)) };
     // Migrate legacy ui-scale if present
     const legacyScale = storage.getItem('neural-ui-scale');
     if (legacyScale) {
@@ -169,7 +184,7 @@ export function loadIfaceConfig() {
 }
 
 export function saveIfaceConfig(cfg) {
-  storage.setItem('neural-interface-config', JSON.stringify(cfg));
+  storage.setItem('neural-interface-config', JSON.stringify(normalizeViewConfig(cfg)));
   // Keep legacy key in sync for backwards compat
   storage.setItem('neural-ui-scale', cfg.scale);
 }
@@ -546,7 +561,7 @@ function buildSearchHTML() {
 }
 
 // What search reads from the panel beside its index (settings-search.js): the labelled rows of the panes that draw
-// themselves, and the names of what the panes load (projects, providers, tools, tool profiles and servers, skills,
+// themselves, and the names of what the panes load (projects, providers, tools, tool lists and servers, skills,
 // browser profiles, themes, the linked WhatsApp account). Labels and names only: a source names label elements and
 // the shell reads their text, never a value; `help` is given only where it is the app's own copy. `named` rows may
 // sit inside an inventory control (a list it tags).
@@ -952,7 +967,7 @@ function buildSetupTab(setupStatus) {
     { id: 'claude',   name: 'Claude',   icon: ANTHROPIC_ICON, file: '~/.claude.json',                 ids: { toggle: 'SET004', cli: 'SET005',                      primary: 'SET006', remove: 'SET007', view: 'SET008', copy: 'SET009' } },
     { id: 'gemini',   name: 'Gemini',   icon: GEMINI_ICON,    file: '~/.gemini/settings.json',        ids: { toggle: 'SET010',                    config: 'SET011', primary: 'SET012', remove: 'SET013', view: 'SET014', copy: 'SET015' } },
     { id: 'codex',    name: 'Codex',    icon: OPENAI_ICON,    file: '~/.codex/config.toml',           ids: { toggle: 'SET016', cli: 'SET017', config: 'SET018', primary: 'SET019', remove: 'SET020', view: 'SET021', copy: 'SET022' } },
-    { id: 'opencode', name: 'OpenCode', icon: OPENCODE_ICON,  file: '~/.config/opencode/config.json', ids: { toggle: 'SET023',                    config: 'SET024', primary: 'SET025', remove: 'SET026', view: 'SET027', copy: 'SET028' } },
+    { id: 'opencode', name: 'OpenCode', icon: OPENCODE_ICON,  file: '~/.config/opencode/opencode.json', ids: { toggle: 'SET023',                    config: 'SET024', primary: 'SET025', remove: 'SET026', view: 'SET027', copy: 'SET028' } },
   ].map((p) => ({ ...p, on: setupStatus[p.id]?.connected || false }));
 
   const copyLabel = (invId) => `${COPY_ICON} ${kit.L(invId)}`;
@@ -1170,23 +1185,23 @@ function buildMcpTab() {
   return `
       <div class="stg-pane" data-stg-pane="mcp">
         <div class="stg-mcp-page-tabs" role="tablist" aria-label="${kit.L('MCP001')}" ${kit.inv('MCP001')}>
-          ${tab('stg-mcp-page-tab', 'data-pane', 'profiles', m('tab.profiles'), true)}
+          ${tab('stg-mcp-page-tab', 'data-pane', 'tools', m('tab.tools'), true)}
           ${tab('stg-mcp-page-tab', 'data-pane', 'installed', m('tab.installed'), false)}
         </div>
 
-        <div class="stg-mcp-pane" data-pane="profiles" data-stg-reveal='.stg-mcp-page-tab[data-pane="profiles"]'>
+        <div class="stg-mcp-pane" data-pane="tools" data-stg-reveal='.stg-mcp-page-tab[data-pane="tools"]'>
           ${kit.card({
-            id: 'stg-sec-tool-profiles', section: 'connected_tools.tool_profiles',
+            id: 'stg-sec-default-tools', section: 'connected_tools.default_tools',
             body: `
             <div class="stg-mcp-intro">
-              <div class="stg-help" style="margin-top:0">${m('profilesHelp')}</div>
+              <div class="stg-help" style="margin-top:0">${m('defaultToolsHelp')}</div>
               <div class="stg-mcp-note">
                 <strong>${m('noteTitle')}</strong>
                 <span>${m('noteBody')}</span>
               </div>
             </div>
-            <div id="stg-mcp-matrix-wrap" class="stg-mcp-matrix-wrap stg-mcp-block" ${kit.inv('MCP022')} role="group" aria-label="${kit.L('MCP022')}">
-              <div class="stg-mcp-matrix-empty">${m('loading')}</div>
+            <div id="stg-mcp-default-tools" class="stg-mcp-default-tools stg-mcp-block" ${kit.inv('MCP022')} role="group" aria-label="${kit.L('MCP022')}">
+              <div class="stg-mcp-empty-note">${m('loading')}</div>
             </div>
             <div id="stg-mcp-always-on" class="stg-mcp-subsection" ${kit.inv('MCP024')}></div>
             <div class="stg-mcp-subsection stg-mcp-servers-section">
@@ -1298,6 +1313,7 @@ function buildOpencodeTab() {
                 <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 2v6h-6"/><path d="M3 12a9 9 0 0 1 15-6.7L21 8"/><path d="M3 22v-6h6"/><path d="M21 12a9 9 0 0 1-15 6.7L3 16"/></svg>
               </button>
             </span>`, { forId: 'stg-ocp-port', className: 'ocp-server-bar' })}
+            <div class="stg-help ocp-install-note" id="stg-ocp-install" role="status" aria-live="polite" hidden></div>
           </div>
 
           <div class="ocp-group-head">
@@ -1323,9 +1339,10 @@ function buildOpencodeTab() {
           <div class="ocp-group">
           ${kit.advanced(`
           <div class="ocp-config-footer" ${kit.inv('OCP019')}>
-            <span class="ocp-config-path">${kit.th('settings.redesign.opencode.configPath', { path: '<code class="stg-code">~/.config/opencode/config.json</code>' })}</span>
+            <span class="ocp-config-path">${kit.th('settings.redesign.opencode.configPath', { path: '<code class="stg-code" id="stg-ocp-config-path">~/.config/opencode/opencode.json</code>' })}</span>
             <button type="button" class="ocp-config-link" id="stg-ocp-open-config" aria-describedby="stg-ocp-open-config-help">${kit.L('OCP019')}</button>
           </div>
+          <p class="stg-help" id="stg-ocp-config-jsonc" hidden></p>
           ${kit.help('OCP019', { forId: 'stg-ocp-open-config' })}`)}
           </div>`,
         })}
@@ -1336,8 +1353,7 @@ function buildOpencodeTab() {
           body: `
           <div class="ocp-compact-group ocp-rows">
             ${check('OCP013', 'stg-ocp-compact-auto')}
-            ${check('OCP014', 'stg-ocp-compact-prune')}
-            ${kit.field('OCP015', `<input type="number" class="ocp-reserved-input" id="stg-ocp-compact-reserved" value="10000" min="1000" max="50000" step="1000" aria-describedby="stg-ocp-compact-reserved-help">`, { forId: 'stg-ocp-compact-reserved' })}
+            ${kit.field('OCP015', `<input type="number" class="ocp-reserved-input" id="stg-ocp-compact-reserved" value="" placeholder="${kit.te('settings.redesign.opencode.bufferDefault')}" min="0" max="1000000" step="1000" aria-describedby="stg-ocp-compact-reserved-help">`, { forId: 'stg-ocp-compact-reserved' })}
             ${kit.toggleField('OCP016', `<button type="button" class="cc-toggle on" id="stg-ocp-snapshot-toggle" aria-labelledby="stg-ocp-snapshot-toggle-label" aria-describedby="stg-ocp-snapshot-toggle-help"></button>`, { forId: 'stg-ocp-snapshot-toggle', className: 'ocp-snapshot-row' })}
           </div>
           <p class="ocp-footnote">${kit.te('settings.redesign.opencode.snapshotDetail')}</p>`,
@@ -1663,19 +1679,24 @@ function buildSkillsTab(ccSkills) {
   const row = (skill) => {
     const installed = skill.installedTargets || { claude: !!skill.installed, codex: false, opencode: false };
     const anyOn = targets.some(t => installed[t.id]);
-    const chips = targets.map(t => `
-              <button type="button" class="cc-skill-target${installed[t.id] ? ' on' : ''}"
-                      data-cc-skill="${skill.dirName}"
+    // What each runtime has of it: a native skill folder, an old bridge not moved yet, or a folder of that name
+    // SynaBun did not install (settings/settings-skill-folders.js chipState).
+    const chips = targets.map(t => {
+      const chip = chipState(skill.targetStates?.[t.id], installed[t.id]);
+      return `
+              <button type="button" class="cc-skill-target${chip.on ? ' on' : ''}"
+                      data-cc-skill="${kit.esc(skill.dirName)}"
                       data-cc-target="${t.id}"
-                      data-state="${installed[t.id] ? 'on' : 'off'}"
-                      ${kit.inv('SKL001')} data-stg-pressed="on" aria-pressed="${installed[t.id] ? 'true' : 'false'}"
-                      title="${kit.te('settings.redesign.skills.installFor', { skill: skill.name, assistant: t.label })}">${t.label}</button>
-          `).join('');
+                      data-state="${chip.on ? 'on' : 'off'}" data-install-state="${chip.state}"
+                      ${kit.inv('SKL001')} data-stg-pressed="on" aria-pressed="${chip.on ? 'true' : 'false'}"
+                      title="${kit.te(chip.key, { skill: skill.name, assistant: t.label })}">${t.label}</button>
+          `;
+    }).join('');
     return `
-          <div class="cc-skill-row${anyOn ? ' installed' : ''}" data-skill-name="${skill.dirName}">
+          <div class="cc-skill-row${anyOn ? ' installed' : ''}" data-skill-name="${kit.esc(skill.dirName)}">
             <div class="cc-skill-info">
-              <span class="cc-skill-name">/${skill.name}</span>
-              <span class="cc-skill-desc">${skill.description || ''}</span>
+              <span class="cc-skill-name">/${kit.esc(skill.name)}</span>
+              <span class="cc-skill-desc">${kit.esc(skill.description || '')}</span>
             </div>
             <div class="cc-skill-targets" role="group" aria-label="${kit.te('settings.redesign.skills.targets', { skill: skill.name })}">${chips}</div>
           </div>`;
@@ -1685,10 +1706,14 @@ function buildSkillsTab(ccSkills) {
       <div class="stg-pane" data-stg-pane="skills">
         ${kit.card({
           id: 'stg-sec-skills', section: 'tool_access.skills',
-          body: skills.length
+          body: (skills.length
             ? `<div ${kit.inv('SKL004')} role="group" aria-label="${kit.L('SKL004')}">${skills.map(row).join('')}</div>
           ${kit.help('SKL001')}`
-            : `<div class="stg-help" style="margin-top:0">${kit.te('settings.redesign.skills.none')}</div>`,
+            : `<div class="stg-help" style="margin-top:0">${kit.te('settings.redesign.skills.none')}</div>`)
+            // Skills Studio is where a skill is edited, versioned and published; these chips stay for what SynaBun ships.
+            + `<div class="cc-skill-studio"><button type="button" class="stg-action-btn compact" data-cc-open-studio="1">${kit.te('settings.redesign.skills.openStudio')}</button>
+            <span class="stg-help">${kit.te('settings.redesign.skills.openStudioHelp')}</span></div>`
+            + skillFoldersHTML(),
         })}
       </div>`;
 }
@@ -1699,7 +1724,7 @@ function buildPermissionsTab(toolCategories, toolPermissions) {
   // The inventory ids of the "all tools of this group" switches, by group.
   const ALL_SWITCH = {
     memory: 'PER001', browser: 'PER003', whiteboard: 'PER004', cards: 'PER005', automation: 'PER006',
-    leonardo: 'PER007', images: 'PER008', gsc: 'PER009', youtube: 'PER010', thirdparty: 'PER011',
+    images: 'PER008', gsc: 'PER009', youtube: 'PER010', thirdparty: 'PER011',
   };
 
   let totalOn = 0, totalAll = 0;
@@ -1819,6 +1844,52 @@ const userContextDigestHTML = (digest) => (digest.rows.length
   ? digest.rows.map(row => `<button type="button" class="uc-digest-row" role="listitem" data-uc-memory="${kit.esc(row.id)}" title="${kit.te('settings.redesign.hooks.uc.openMemory')}"><span class="uc-digest-statement">${kit.esc(row.statement)}</span><span class="uc-digest-facet">${kit.esc(row.facet)}${row.seed ? ` · ${kit.te('settings.redesign.hooks.uc.seed')}` : ''}</span></button>`).join('')
   : `<div class="stg-help uc-digest-message" role="listitem" style="margin:0">${kit.esc(digest.message)}</div>`);
 
+/**
+ * Put a view (describeClaudeHooks) on the section: the line above, the switch, its notes and Repair, and the
+ * per-moment rows and their count in the Hooks card, which show nothing on or off that was not read.
+ */
+function drawClaudeHooks(overlay, view) {
+  const section = overlay.querySelector('#stg-sec-automation-behavior');
+  if (!section) return;
+  const note = section.querySelector('#ch-status-note');
+  if (note) { note.hidden = !view.note; note.textContent = view.note?.text || ''; note.dataset.chState = view.state; }
+  const rowBox = section.querySelector('#ch-row');
+  if (rowBox) { rowBox.dataset.chReady = view.ready ? '1' : '0'; rowBox.dataset.chState = view.state; }
+  const toggle = section.querySelector('.cc-toggle[data-ch-master]');
+  if (toggle) {
+    toggle.classList.toggle('on', view.on);
+    toggle.setAttribute('aria-pressed', view.on ? 'true' : 'false');
+    toggle.disabled = view.disabled;
+    toggle.setAttribute('aria-describedby', `ch-master-help ch-notes${view.note ? ' ch-status-note' : ''}`);
+    const item = toggle.closest('.cc-integration-item');
+    item?.classList.toggle('enabled', view.on);
+    item?.classList.toggle('uc-disabled', view.disabled);
+  }
+  const notes = section.querySelector('#ch-notes');
+  if (notes) notes.innerHTML = userContextNotesHTML(view.notes);
+  const repair = section.querySelector('#ch-repair');
+  if (repair) repair.hidden = !(view.repair && !view.disabled);
+  const applies = section.querySelector('#ch-applies');
+  if (applies) applies.textContent = view.applies;
+  const locked = !view.ready || view.disabled;
+  for (const row of CLAUDE_HOOK_ROWS) {
+    const rowToggle = section.querySelector(`.cc-toggle[data-cc-hook="${row.key}"]`);
+    if (!rowToggle) continue;
+    const on = !!view.rows?.[row.key];
+    rowToggle.classList.toggle('on', on);
+    rowToggle.setAttribute('aria-pressed', on ? 'true' : 'false');
+    rowToggle.disabled = locked;
+    const item = rowToggle.closest('.cc-integration-item');
+    item?.classList.toggle('enabled', on);
+    item?.classList.toggle('uc-disabled', locked);
+  }
+  const badge = section.querySelector('#cc-hooks-badge');
+  if (badge) {
+    badge.textContent = view.ready ? `${view.onRows}/${view.totalRows}` : '—';
+    badge.classList.toggle('all-on', view.ready && view.onRows === view.totalRows);
+  }
+}
+
 /** Put a view (describeUserContext) on the section: the note, each switch and its notes, the digest. */
 function drawUserContext(overlay, view) {
   const section = overlay.querySelector('#stg-sec-automation-behavior');
@@ -1895,16 +1966,19 @@ function tunnelExtraHtml(view, mcpKeyInfo) {
   ].filter(Boolean).join('');
 }
 
-function buildConnectionsTab(ccIntegrations, ccSkills, tunnelStatus, mcpKeyInfo, openclawBridge, greeting, toolPermissions, toolCategories, userContext = null) {
-  const gh = ccIntegrations.global.hooks || {};
-  const ssOn = !!gh.SessionStart;
-  const psOn = !!gh.UserPromptSubmit;
-  const pcOn = !!gh.PreCompact;
-  const stOn = !!gh.Stop;
-  const prOn = !!gh.PreToolUse && !!gh.PostToolBatch;
-  const ptOn = !!gh.PostToolUse;
-  const subStartOn = !!gh.SubagentStart;
-  const subStopOn = !!gh.SubagentStop;
+function buildConnectionsTab(ccIntegrations, ccSkills, tunnelStatus, mcpKeyInfo, openclawBridge, greeting, toolPermissions, toolCategories, userContext = null, workerGuard = null, claudeHooks = null) {
+  // SynaBun's Claude Code hooks (settings-claude-hooks.js): the switch and the rows below show what is really in the
+  // settings files, and nothing (disabled, with the reason) when that could not be read: never "off" by default.
+  const ch = claudeHooks || describeClaudeHooks(null, { tx: kit.tx });
+  const rowOn = (key) => !!ch.rows?.[key];
+  const ssOn = rowOn('SessionStart');
+  const psOn = rowOn('UserPromptSubmit');
+  const pcOn = rowOn('PreCompact');
+  const stOn = rowOn('Stop');
+  const prOn = rowOn('PreToolUse');
+  const ptOn = rowOn('PostToolUse');
+  const subStartOn = rowOn('SubagentStart');
+  const subStopOn = rowOn('SubagentStop');
   const hf = ccIntegrations.hookFeatures || {};
   const cmOn = hf.conversationMemory !== false;
   const ulOn = hf.userLearning !== false;
@@ -1921,7 +1995,8 @@ function buildConnectionsTab(ccIntegrations, ccSkills, tunnelStatus, mcpKeyInfo,
     { key: 'SubagentStart', on: subStartOn, inv: 'AUT034' }, { key: 'SubagentStop', on: subStopOn, inv: 'AUT035' },
   ];
   const onCount = hookRows.filter(r => r.on).length;
-  const allOn = onCount === hookRows.length;
+  const allOn = ch.ready && onCount === hookRows.length;
+  const hookRowsLocked = !ch.ready || ch.disabled;
 
   const copyIcon = COPY_ICON;
 
@@ -2046,6 +2121,44 @@ function buildConnectionsTab(ccIntegrations, ccSkills, tunnelStatus, mcpKeyInfo,
             <button type="button" class="conn-add-btn" id="uc-digest-all" ${kit.inv('AUT057')} title="${kit.H('AUT057')}" style="margin:0;width:auto;padding:4px 10px;border-style:solid">${kit.L('AUT057')}</button>
           </div>`;
 
+  // Protect workers (lib/worker-guard-setting.js): what capability read-only / workspace means for every worker the
+  // Assistant dispatches. `workerGuard` is the view of what the server answered (describeWorkerGuard): a server
+  // started before the setting shows the default, disabled, under a line that says a restart is missing.
+  const wg = workerGuard || describeWorkerGuard(null, { tx: kit.tx });
+  const workerGuardBlock = `
+          <div class="cc-hook-toggles" id="wg-row" data-wg-ready="${wg.ready ? '1' : '0'}">
+            <div class="cc-integration-item enabled${wg.disabled ? ' uc-disabled' : ''}" data-wg-row>
+              <div class="cc-integration-info">
+                <div class="cc-integration-label" id="wg-mode-label">${kit.L('AUT061')}</div>
+                <div class="cc-integration-path" id="wg-mode-help">${kit.H('AUT061')}</div>
+                <div class="uc-layer-notes" id="wg-notes" data-stg-data>${userContextNotesHTML(wg.note ? [wg.note] : [])}</div>
+                <div class="stg-help" id="wg-mode-detail" data-stg-data style="margin:4px 0 0">${kit.esc(wg.options.find(o => o.value === wg.mode)?.help || '')}</div>
+              </div>
+              ${kit.dropdown('wg-mode', wg.options.map(o => ({ value: o.value, label: kit.esc(o.label) })), { value: wg.mode, classes: 'stg-dropdown stg-dropdown-inline', label: kit.L('AUT061'), attrs: `${kit.inv('AUT061')} aria-describedby="wg-mode-help wg-notes"`, disabled: wg.disabled })}
+            </div>
+          </div>
+          <div class="stg-help uc-save-status" id="wg-save-status" role="alert" data-stg-data hidden></div>
+          <div class="stg-help" id="wg-applies">${kit.esc(wg.applies)}</div>`;
+
+  // SynaBun's hooks in Claude Code: one switch for all of them (POST / DELETE /api/claude-code/integrations, target
+  // global), what is really installed under it, and Repair when the files are out of step. Outside the collapsed
+  // card below, so it can be found; the per-moment rows stay in that card.
+  const claudeHooksBlock = `
+          <div class="stg-help uc-status-note" id="ch-status-note" role="status" data-ch-state="${ch.state}" data-stg-data${ch.note ? '' : ' hidden'}>${ch.note ? kit.esc(ch.note.text) : ''}</div>
+          <div class="cc-hook-toggles" id="ch-row" data-ch-ready="${ch.ready ? '1' : '0'}" data-ch-state="${ch.state}">
+            <div class="cc-integration-item${ch.on ? ' enabled' : ''}${ch.disabled ? ' uc-disabled' : ''}" data-ch-master-row>
+              <div class="cc-integration-info">
+                <div class="cc-integration-label" id="ch-master-label">${kit.L('AUT062')}</div>
+                <div class="cc-integration-path" id="ch-master-help">${kit.H('AUT062')}</div>
+                <div class="uc-layer-notes" id="ch-notes" data-stg-data>${userContextNotesHTML(ch.notes)}</div>
+                <button type="button" class="cc-copy-btn stg-text-btn ch-repair" id="ch-repair" title="${kit.te('settings.redesign.hooks.claudeHooks.repair.title')}"${ch.repair && !ch.disabled ? '' : ' hidden'}>${kit.te('settings.redesign.hooks.claudeHooks.repair.action')}</button>
+              </div>
+              <button type="button" class="cc-toggle${ch.on ? ' on' : ''}" data-ch-master ${kit.inv('AUT062')} aria-pressed="${ch.on ? 'true' : 'false'}" aria-labelledby="ch-master-label" aria-describedby="ch-master-help ch-notes${ch.note ? ' ch-status-note' : ''}"${ch.disabled ? ' disabled' : ''}></button>
+            </div>
+          </div>
+          <div class="stg-help uc-save-status" id="ch-save-status" role="alert" data-stg-data hidden></div>
+          <div class="stg-help uc-applies" id="ch-applies">${kit.esc(ch.applies)}</div>`;
+
   return `
       <div class="stg-pane" data-stg-pane="hooks">
 
@@ -2060,11 +2173,16 @@ function buildConnectionsTab(ccIntegrations, ccSkills, tunnelStatus, mcpKeyInfo,
           body: `
           ${userContextBlock}
 
+          ${workerGuardBlock}
+
+          ${claudeHooksBlock}
+
           ${kit.card({
             id: 'stg-sec-hooks', level: 'h4', collapsible: true, collapsed: true, advanced: true, attrs: 'data-cc-target="global"',
             title: h('hooksTitle'), purpose: h('hooksPurpose'),
             // These hooks are Claude Code's own (~/.claude/settings.json, hooks/claude-code): no other assistant runs them.
-            status: `<span class="cc-hooks-badge${allOn ? ' all-on' : ''}" id="cc-hooks-badge">${onCount}/${hookRows.length}</span>${providerBadge({ cli: true, vscode: true, web: false, cowork: false, codex: false })}`,
+            // A count only from a state that was read: "—" otherwise, never "0/8".
+            status: `<span class="cc-hooks-badge${allOn ? ' all-on' : ''}" id="cc-hooks-badge">${ch.ready ? `${onCount}/${hookRows.length}` : '—'}</span>${providerBadge({ cli: true, vscode: true, web: false, cowork: false, codex: false })}`,
             body: `
             <div class="stg-help" style="margin:0 0 10px">${h('claudeOnly')}</div>
             <div class="cc-hook-toggles">
@@ -2083,12 +2201,12 @@ function buildConnectionsTab(ccIntegrations, ccSkills, tunnelStatus, mcpKeyInfo,
             </div>
             <div class="cc-hook-toggles" style="margin-top:10px">
               ${hookRows.map(r => `
-              <div class="cc-integration-item${r.on ? ' enabled' : ''}" data-hook="${r.key}">
+              <div class="cc-integration-item${r.on ? ' enabled' : ''}${hookRowsLocked ? ' uc-disabled' : ''}" data-hook="${r.key}">
                 <div class="cc-integration-info">
                   <div class="cc-integration-label" id="cc-hook-${r.key}-label">${kit.L(r.inv)}</div>
                   <div class="cc-integration-path" id="cc-hook-${r.key}-help">${kit.H(r.inv)}</div>
                 </div>
-                <button type="button" class="cc-toggle${r.on ? ' on' : ''}" data-cc-hook="${r.key}" data-cc-scope="global" ${kit.inv(r.inv)} aria-labelledby="cc-hook-${r.key}-label" aria-describedby="cc-hook-${r.key}-help"></button>
+                <button type="button" class="cc-toggle${r.on ? ' on' : ''}" data-cc-hook="${r.key}" data-cc-scope="global" ${kit.inv(r.inv)} aria-pressed="${r.on ? 'true' : 'false'}" aria-labelledby="cc-hook-${r.key}-label" aria-describedby="cc-hook-${r.key}-help"${hookRowsLocked ? ' disabled' : ''}></button>
               </div>`).join('')}
             </div>`,
           })}`,
@@ -3168,10 +3286,45 @@ function landOnSearchEntry(overlay, entry, { focus = false, watch = true } = {})
 }
 
 // ═══════════════════════════════════════════
+// The search index of a locale (and of the variant tabs the page registered): what the strings are, not what
+// the panes hold, so it is made once (at launch idle, or by the first open) and every open reuses it.
+let _searchIndexMemo = null;
+function memoSearchIndex(en, variantTabs, build) {
+  const key = JSON.stringify([getLocale(), typeof en === 'function', (variantTabs || []).map(tab => [tab.id, tab.label || ''])]);
+  if (_searchIndexMemo?.key !== key) _searchIndexMemo = { key, index: build() };
+  return _searchIndexMemo.index;
+}
+
+/** Make the index now (launch idle), with the English names when the locale is another (loaded once, here). */
+function prebuildSettingsSearchIndex() {
+  const variantTabs = getSettingsTabs();
+  const make = (en) => memoSearchIndex(en, variantTabs, () => buildSettingsSearchIndex({ t: kit.tx, en, variants: variantTabs.map(tab => ({ id: tab.id, label: tab.label })) }));
+  if (getLocale() === 'en') { make(null); return undefined; }
+  const english = englishTranslator();
+  if (english) { make(english); return undefined; }
+  make(null);
+  return loadEnglishTranslator().then((en) => { if (en) make(en); }).catch(() => {});
+}
+
 // MAIN ENTRY — openSettingsModal
 // ═══════════════════════════════════════════
 
-export async function openSettingsModal(options = {}) {
+// An open that comes while another is still reading its data joins it: one panel, the later options applied.
+let _settingsOpening = null;
+export function openSettingsModal(options = {}) {
+  if (_settingsOpening) {
+    return _settingsOpening.then(() => {
+      const panel = document.getElementById('settings-panel');
+      if (panel) { panel.style.zIndex = '300001'; applySettingsOpenOptions(panel, options); }
+    });
+  }
+  const opening = openSettingsModalNow(options);
+  const guarded = opening.catch(() => {}).finally(() => { if (_settingsOpening === guarded) _settingsOpening = null; });
+  _settingsOpening = guarded;
+  return opening;
+}
+
+async function openSettingsModalNow(options = {}) {
   // If already open, just bring it to front
   const existing = document.getElementById('settings-panel');
   if (existing) {
@@ -3205,33 +3358,32 @@ export async function openSettingsModal(options = {}) {
   // The Assistant's user context (lib/assistant-user-context.js): what its endpoint answered, as a reading.
   // No answer is a reading too: the section says what is true instead of showing switches that do nothing.
   let userContextReading = readUserContextResponse({ status: 0 });
+  // Protect workers (lib/worker-guard-setting.js): what its endpoint answered, as a reading.
+  let workerGuardReading = readWorkerGuardResponse({ status: 0 });
+  // SynaBun's Claude Code hooks (lib/claude-hooks-status.js): the `claudeHooks` of the integrations read, as a reading.
+  let claudeHooksReading = readClaudeHooksResponse({ status: 0 });
 
   try {
-    const [settingsRes, connRes, ccRes, skillsRes, tunnelRes, keyRes, bridgeRes, greetRes, setupRes, cliRes, toolPermsRes, toolCatsRes, discordRes, skinsRes, iconsRes, youtubeRes, typesafeRes, userContextRes] = await Promise.allSettled([
-      fetch('/api/settings').then(r => r.json()),
-      fetch('/api/connections').then(r => r.json()),
-      fetch('/api/claude-code/integrations').then(r => r.json()),
-      fetch('/api/claude-code/skills').then(r => r.json()),
-      fetch('/api/tunnel/status').then(r => r.json()),
-      fetch('/api/mcp-key').then(r => r.json()),
-      fetch('/api/bridges/openclaw').then(r => r.json()),
-      loadGreetingReading(),
-      fetch('/api/setup/status').then(r => r.json()),
-      fetch('/api/cli/config').then(r => r.json()),
-      fetch('/api/claude-code/tool-permissions').then(r => r.json()),
-      fetch('/api/claude-code/tool-categories').then(r => r.json()),
-      fetch('/api/discord/config').then(r => r.json()),
-      fetch('/api/skins').then(r => r.json()),
-      fetch('/api/file-icons').then(r => r.json()),
-      fetch('/api/youtube/config').then(r => r.json()),
-      fetch('/api/typesafe/config').then(r => r.json()),
-      loadUserContextReading(),
-    ]);
+    // Read through the page's data cache (settings/settings-data.js): kept answers at once (each open its own
+    // copy; read again in the background when old), so Settings waits only the first time.
+    const reads = await readSettingsData();
+    // The greeting and the user context are readings of what their endpoints answered (no answer is a reading too).
+    const readingOf = (entry, make) => ({ status: 'fulfilled', value: entry?.status === 'fulfilled' ? make(entry.value) : make({ status: 0, error: entry?.reason?.message }) });
+    const greetRes = readingOf(reads.greeting, readGreetingStatus);
+    const userContextRes = readingOf(reads.userContext, readUserContextResponse);
+    const workerGuardRes = readingOf(reads.workerGuard, readWorkerGuardResponse);
+    const settingsRes = reads.settings, connRes = reads.connections, ccRes = reads.integrations, skillsRes = reads.skills;
+    const tunnelRes = reads.tunnel, keyRes = reads.mcpKey, bridgeRes = reads.openclaw, setupRes = reads.setup, cliRes = reads.cli;
+    const toolPermsRes = reads.toolPermissions, toolCatsRes = reads.toolCategories, discordRes = reads.discord, skinsRes = reads.skins;
+    const iconsRes = reads.icons, youtubeRes = reads.youtube, typesafeRes = reads.typesafe;
     if (typesafeRes.status === 'fulfilled' && typesafeRes.value.ok) typesafeConfig = typesafeRes.value;
     if (userContextRes.status === 'fulfilled') userContextReading = userContextRes.value;
+    if (workerGuardRes.status === 'fulfilled') workerGuardReading = workerGuardRes.value;
     if (settingsRes.status === 'fulfilled') settings = settingsRes.value;
     if (connRes.status === 'fulfilled' && connRes.value.connections) connections = connRes.value.connections;
-    if (ccRes.status === 'fulfilled' && ccRes.value.ok) ccIntegrations = ccRes.value;
+    // Read as it came (status and body): a refusal or an old server is said as what it is, never as hooks that are off.
+    if (ccRes.status === 'fulfilled' && ccRes.value?.status >= 200 && ccRes.value.status < 300 && ccRes.value.body?.ok) ccIntegrations = ccRes.value.body;
+    claudeHooksReading = readingOf(ccRes, readClaudeHooksResponse).value;
     if (skillsRes.status === 'fulfilled' && skillsRes.value.ok) ccSkills = skillsRes.value.skills || [];
     if (tunnelRes.status === 'fulfilled' && tunnelRes.value.ok) tunnelStatus = tunnelRes.value;
     if (keyRes.status === 'fulfilled' && keyRes.value.ok) mcpKeyInfo = keyRes.value;
@@ -3256,15 +3408,18 @@ export async function openSettingsModal(options = {}) {
     || getSettingsPage(storage.getItem(KEYS.SETTINGS_LAST_PAGE))?.id
     || DEFAULT_SETTINGS_PAGE;
   const openerEl = document.activeElement;
+  // Listeners on document and window that belong to this panel end with it (close aborts it).
+  const panelLife = new AbortController();
 
   // ── Panel ──
   const overlay = document.createElement('div');
   overlay.className = 'settings-panel glass resizable';
   overlay.id = 'settings-panel';
 
-  // Always open centered at default size
-  overlay.style.left = Math.max(20, (window.innerWidth - 900) / 2) + 'px';
-  overlay.style.top = Math.max(48, (window.innerHeight - 650) / 2) + 'px';
+  // Always open centered at default size, in the app frame
+  const at = centeredInFrame(900, 650);
+  overlay.style.left = at.left + 'px';
+  overlay.style.top = at.top + 'px';
 
   // ── Assemble HTML ──
   overlay.innerHTML = `
@@ -3297,7 +3452,7 @@ export async function openSettingsModal(options = {}) {
         <div class="settings-content">
           ${buildPagesHTML({
             server: buildServerTab(settings, connections),
-            hooks: buildConnectionsTab(ccIntegrations, ccSkills, tunnelStatus, mcpKeyInfo, openclawBridge, describeGreeting(greetingReading, null, { tx: kit.tx, t: kit.tx }), toolPermissions, toolCategories, describeUserContext(userContextReading, { tx: kit.tx })),
+            hooks: buildConnectionsTab(ccIntegrations, ccSkills, tunnelStatus, mcpKeyInfo, openclawBridge, describeGreeting(greetingReading, null, { tx: kit.tx, t: kit.tx }), toolPermissions, toolCategories, describeUserContext(userContextReading, { tx: kit.tx }), describeWorkerGuard(workerGuardReading, { tx: kit.tx }), describeClaudeHooks(claudeHooksReading, { tx: kit.tx })),
             terminal: buildTerminalTab(cliConfig),
             opencode: buildOpencodeTab(),
             notifications: buildNotificationsTab(),
@@ -3320,6 +3475,7 @@ export async function openSettingsModal(options = {}) {
             skins: buildSkinsTab(skinsData.skins, skinsData.active),
             interface: buildInterfaceTab(),
             icons: buildIconsTab(customIconsData),
+            app: buildAppTab(),
             about: buildAboutTab(),
           }, variantTabs, initialPage)}
         </div>
@@ -3361,10 +3517,14 @@ export async function openSettingsModal(options = {}) {
   // ── Close helper ──
   const close = () => {
     document.removeEventListener('keydown', onSettingsEsc);
+    const first = !panelLife.signal.aborted;
+    panelLife.abort();
     // Tabs that poll (Judgments) clear their timers on this event.
     overlay.dispatchEvent(new CustomEvent('settings-close'));
     backdrop.remove();
     overlay.remove();
+    // What was changed here is what the next open shows: its reads are asked for again now, in the background.
+    if (first) refreshSettingsData();
     // Give the keyboard back to whatever opened Settings.
     if (openerEl && openerEl !== document.body && document.body.contains(openerEl)) { try { openerEl.focus({ preventScroll: true }); } catch {} }
   };
@@ -3525,12 +3685,12 @@ export async function openSettingsModal(options = {}) {
           + '</div>';
         html += '<div style="padding:4px 0">';
         if (data.parent) {
-          html += `<div class="cc-browse-item" data-path="${escapeHtml(data.parent)}" style="padding:4px 10px;cursor:pointer;font-size:12px;display:flex;align-items:center;gap:6px;color:var(--t-muted)">`
+          html += `<div class="cc-browse-item" data-path="${kit.esc(data.parent)}" style="padding:4px 10px;cursor:pointer;font-size:12px;display:flex;align-items:center;gap:6px;color:var(--t-muted)">`
             + '<svg viewBox="0 0 24 24" style="width:13px;height:13px;fill:none;stroke:currentColor;stroke-width:2"><polyline points="15 18 9 12 15 6"/></svg>'
             + '' + kit.te('settings.redesign.server.parent') + '</div>';
         }
         for (const d of data.directories) {
-          html += `<div class="cc-browse-item" data-path="${escapeHtml(data.current + '/' + d)}" style="padding:4px 10px;cursor:pointer;font-size:12px;display:flex;align-items:center;gap:6px">`
+          html += `<div class="cc-browse-item" data-path="${kit.esc(data.current + '/' + d)}" style="padding:4px 10px;cursor:pointer;font-size:12px;display:flex;align-items:center;gap:6px">`
             + '<svg viewBox="0 0 24 24" style="width:13px;height:13px;fill:none;stroke:currentColor;stroke-width:2"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/></svg>'
             + escapeHtml(d) + '</div>';
         }
@@ -3914,7 +4074,7 @@ export async function openSettingsModal(options = {}) {
       container.querySelectorAll('.stg-dropdown.open').forEach(dd => {
         if (!dd.contains(e.target)) dd.classList.remove('open');
       });
-    });
+    }, { signal: panelLife.signal });
   }
 
   function syncStgDropdown(container, hiddenId) {
@@ -4410,6 +4570,9 @@ export async function openSettingsModal(options = {}) {
   // ── Code editor: AI autocomplete (loads and saves itself) ──
   wireCodeEditorTab(overlay);
 
+  // ── App: updates, start at login, the window, maintenance (loads itself when its page is shown) ──
+  wireAppTab(overlay, { toast: showCCToast });
+
   // ── About: version, links, system and dependencies (loads itself the first time its page is shown) ──
   wireAboutTab(overlay, { toast: showCCToast });
 
@@ -4598,9 +4761,14 @@ export async function openSettingsModal(options = {}) {
           });
           const data = await res.json();
           showPathAction(profileId, data);
+          const refusal = profileId === 'opencode' && data.support ? describeOpencodeInstall(data.support, { th: kit.th, tx: kit.tx }) : null;
           if (data.ok && data.found && data.path && data.state === 'broken') {
             // Found, but it does not start: not put in the field, so a broken path is never saved by accident.
             showCCToast(kit.tx('settings.redesign.terminal.detectionFailed', { message: data.error ? `${data.path}: ${data.error}` : data.path }));
+          } else if (data.ok && data.found && data.path && refusal?.status === 'notSupported') {
+            // An OpenCode SynaBun does not drive (OpenCode 1, say): put in the field, with the sentence that says why it will not start.
+            input.value = data.path;
+            showCCToast(refusal.text, 12000);
           } else if (data.ok && data.found && data.path) {
             input.value = data.path;
             showCCToast(kit.tx('settings.redesign.terminal.found', { path: data.version ? `${data.path} (${data.version})` : data.path }));
@@ -4788,7 +4956,7 @@ export async function openSettingsModal(options = {}) {
 
     // Re-poll when tab regains visibility (covers Permissions API gaps on Safari).
     const visHandler = () => { if (!document.hidden) refreshNotifPermRow(); };
-    document.addEventListener('visibilitychange', visHandler);
+    document.addEventListener('visibilitychange', visHandler, { signal: panelLife.signal });
 
     // Request permission
     if (requestPermBtn) {
@@ -4858,9 +5026,15 @@ export async function openSettingsModal(options = {}) {
       if (data.ok) {
         const nowOn = !isOn;
         toggleBtn.classList.toggle('on');
+        toggleBtn.setAttribute('aria-pressed', nowOn ? 'true' : 'false');
         const row = toggleBtn.closest('.cc-integration-item');
         if (row) row.classList.toggle('enabled', nowOn);
-        if (target === 'global') { updateGlobalHookBadge(); }
+        if (target === 'global') {
+          updateGlobalHookBadge();
+          // The answer's state of every hook (a server from before it sends none): the switch above follows it.
+          if (data.claudeHooks) { claudeHooksReading = readClaudeHooksResponse({ status: res.status, body: { ok: true, claudeHooks: data.claudeHooks } }); redrawClaudeHooks(); }
+          refreshSettingsData(['integrations']);
+        }
         else { toggleBtn.textContent = nowOn ? kit.tx('settings.redesign.hooks.enabled') : kit.tx('settings.redesign.hooks.enable'); if (panel) panel.classList.toggle('enabled'); const badge = panel?.querySelector('.cc-panel-status'); if (badge) { badge.textContent = nowOn ? kit.tx('settings.redesign.hooks.active') : kit.tx('settings.redesign.hooks.off'); badge.className = 'cc-panel-status ' + (nowOn ? 'active' : 'inactive'); } updateProjectCount(); }
       } else { alert(data.error || kit.tx('settings.redesign.hooks.failedToToggleHook')); }
     } catch (err) { alert(kit.tx('settings.redesign.hooks.failed2', { message: err.message })); }
@@ -4872,6 +5046,41 @@ export async function openSettingsModal(options = {}) {
     toggle.addEventListener('click', () => { ccToggleHook('global', null, toggle, overlay.querySelector('.iface-section[data-cc-target="global"]'), toggle.dataset.ccHook); });
   });
 
+  // ── SynaBun hooks in Claude Code: one switch for all of them, and Repair ──
+  // Each change is the server's: the row is drawn again from the state its answer carries (what the files hold now),
+  // and a change that failed leaves the row as it was, with the reason under it. One change at a time.
+  function redrawClaudeHooks() { drawClaudeHooks(overlay, describeClaudeHooks(claudeHooksReading, { tx: kit.tx })); }
+  const setClaudeHooksSaveStatus = (text = '') => {
+    const status = overlay.querySelector('#ch-save-status');
+    if (status) { status.hidden = !text; status.textContent = text; }
+  };
+  let claudeHooksBusy = false;
+  async function changeClaudeHooks(action) {
+    if (claudeHooksBusy || claudeHooksReading.state !== 'ready') return;
+    claudeHooksBusy = true;
+    setClaudeHooksSaveStatus('');
+    const row = overlay.querySelector('[data-ch-master-row]');
+    if (row) row.style.opacity = '0.6';
+    let failure = null;
+    try {
+      // On and Repair ask for the hooks to run (unblock: Claude Code's own disableAllHooks in the same file goes too).
+      const payload = action === 'off' ? { target: 'global' } : { target: 'global', unblock: true };
+      const res = await fetch('/api/claude-code/integrations', { method: action === 'off' ? 'DELETE' : 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) });
+      const body = await res.json().catch(() => null);
+      if (res.ok && body?.ok) {
+        claudeHooksReading = readClaudeHooksResponse({ status: res.status, body: { ok: true, claudeHooks: body.claudeHooks } });
+        refreshSettingsData(['integrations']);
+      } else failure = { status: res.status, body };
+    } catch (err) { failure = { status: 0, error: err?.message }; }
+    finally { claudeHooksBusy = false; if (row) row.style.opacity = ''; }
+    redrawClaudeHooks();
+    if (failure) setClaudeHooksSaveStatus(describeClaudeHooksSaveFailure({ action, ...failure }, { tx: kit.tx }));
+  }
+  overlay.querySelector('.cc-toggle[data-ch-master]')?.addEventListener('click', (e) => {
+    changeClaudeHooks(e.currentTarget.classList.contains('on') ? 'off' : 'on');
+  });
+  overlay.querySelector('#ch-repair')?.addEventListener('click', () => changeClaudeHooks('repair'));
+
   // ── The Assistant's user context: layers and the digest preview ──
   const ucRowsEl = overlay.querySelector('#uc-digest-rows');
   const redrawUserContext = (reading = userContextReading) => drawUserContext(overlay, describeUserContext(reading, { tx: kit.tx }));
@@ -4898,6 +5107,47 @@ export async function openSettingsModal(options = {}) {
     if (!link) return;
     try { applySettingsOpenOptions(overlay, JSON.parse(link.dataset.ucGoto)); } catch { /* a malformed target goes nowhere */ }
   });
+  // Protect workers: the choice is saved at once and follows the server's answer; a save that failed puts the
+  // dropdown back where it was, with the reason under it. Saves go one after the other, in the order of the picks.
+  {
+    const input = overlay.querySelector('#wg-mode');
+    const dd = overlay.querySelector('.cc-dropdown[data-for="wg-mode"]');
+    const status = overlay.querySelector('#wg-save-status');
+    const detail = overlay.querySelector('#wg-mode-detail');
+    const setStatus = (text) => { if (status) { status.textContent = text; status.hidden = !text; } };
+    const showMode = (mode) => {
+      if (input) input.value = mode;
+      const view = describeWorkerGuard(workerGuardReading, { tx: kit.tx });
+      const option = view.options.find(o => o.value === mode);
+      dd?.querySelector('.cc-dropdown-value') && (dd.querySelector('.cc-dropdown-value').textContent = option?.label || mode);
+      dd?.querySelectorAll('.cc-dropdown-item').forEach(item => item.classList.toggle('active', item.dataset.value === mode));
+      if (detail) detail.textContent = option?.help || '';
+    };
+    let saves = Promise.resolve();
+    input?.addEventListener('change', () => {
+      if (workerGuardReading.state !== 'ready') return;
+      const mode = String(input.value || '');
+      if (!mode || mode === workerGuardReading.mode) { showMode(workerGuardReading.mode); return; }
+      setStatus('');
+      showMode(mode);
+      if (dd) dd.style.opacity = '0.4';
+      saves = saves.then(async () => {
+        let failure = null;
+        try {
+          const res = await fetch('/api/assistant/worker-guard', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ mode }) });
+          const body = await res.json().catch(() => null);
+          const reading = readWorkerGuardResponse({ status: res.status, body });
+          if (res.ok && reading.state === 'ready') workerGuardReading = reading;
+          else failure = { status: res.status, body };
+        } catch (err) {
+          failure = { status: 0, error: err?.message };
+        }
+        if (dd) dd.style.opacity = '';
+        showMode(workerGuardReading.mode);
+        if (failure) setStatus(describeWorkerGuardSaveFailure({ ...failure, mode }, { tx: kit.tx }));
+      });
+    });
+  }
   // The switch moves at once and follows the server's answer: the stored settings when the save went through,
   // back where it was (with the reason next to the switches) when it did not. Saves go one after the other, in
   // the order of the clicks, so a second click made before the first was answered is kept, not dropped.
@@ -5151,6 +5401,12 @@ export async function openSettingsModal(options = {}) {
     btn.addEventListener('click', () => { const idx = btn.dataset.ccProjectToggle; const panel = overlay.querySelector(`.cc-panel[data-cc-idx="${idx}"]`); const projectPath = panel?.dataset.ccPath; if (projectPath) ccToggleHook('project', projectPath, btn, panel); });
   });
 
+  // Skills Studio, from Settings → Skills: Settings closes, the Studio opens on its Library.
+  overlay.querySelector('[data-cc-open-studio]')?.addEventListener('click', () => {
+    close();
+    emit('skills:open', { place: 'library' });
+  });
+
   // Skill target chips — one skill can be installed independently into Claude / Codex / OpenCode
   const runtimeLabels = { claude: 'Claude Code', codex: 'Codex CLI', opencode: 'OpenCode CLI' };
   overlay.querySelectorAll('.cc-skill-target[data-cc-skill]').forEach(chip => {
@@ -5160,28 +5416,48 @@ export async function openSettingsModal(options = {}) {
       const isOn = chip.classList.contains('on');
       try {
         chip.style.opacity = '0.4'; chip.style.pointerEvents = 'none';
-        const res = await fetch('/api/skills/install', {
+        const send = (extra = {}) => fetch('/api/skills/install', {
           method: isOn ? 'DELETE' : 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ name: skillName, target }),
-        });
-        const data = await res.json();
+          body: JSON.stringify({ name: skillName, target, ...extra }),
+        }).then((res) => res.json());
+        let data = await send();
+        // A skill of that name that SynaBun did not install, or that was changed since, is neither replaced nor
+        // removed unasked: the server says what it is, and only a yes sends its digest back (a backup is kept).
+        if (!data.ok && data.currentDigest && (data.code === 'skill_unowned' || data.code === 'skill_modified')) {
+          if (!confirm(data.question || data.error)) return;
+          data = await send({ expectedDestinationDigest: data.currentDigest });
+        }
         if (data.ok) {
           chip.classList.toggle('on');
           chip.dataset.state = isOn ? 'off' : 'on';
+          // (a server from before the skill folders answers without `destination`: the chip then only says it is installed)
+          const now = chipState(isOn ? null : (data.destination ? (data.shared ? { native: 'absent', shared: 'native' } : { native: 'native', bridge: !!data.bridge }) : undefined), !isOn);
+          chip.dataset.installState = now.state;
+          chip.setAttribute('aria-pressed', now.on ? 'true' : 'false');
+          chip.title = kit.tx(now.key, { skill: skillName, assistant: chip.textContent.trim() });
           const row = chip.closest('.cc-skill-row');
           if (row) {
             const anyOn = !!row.querySelector('.cc-skill-target.on');
             row.classList.toggle('installed', anyOn);
           }
           const runtime = runtimeLabels[target] || target;
-          showCCToast(isOn ? kit.tx('settings.redesign.hooks.skillUninstalledRestartToApply', { runtime: runtime }) : kit.tx('settings.redesign.hooks.skillInstalledRestartToApply', { runtime: runtime }));
+          // The shared ~/.agents/skills is read by Codex and OpenCode both: the other chips of the skill follow.
+          if (data.shared) refreshSkillChips(overlay);
+          // An install is a native skill folder now; the server says when an old bridge of it is still there.
+          if (isOn) showCCToast(kit.tx('settings.redesign.hooks.skillUninstalledRestartToApply', { runtime: runtime }));
+          else if (data.destination) showCCToast(kit.tx(installedToast(data), { skill: skillName, runtime: runtime }), 6000);
+          else showCCToast(kit.tx('settings.redesign.hooks.skillInstalledRestartToApply', { runtime: runtime }));
         } else { alert(data.error || kit.tx('settings.redesign.hooks.failedToToggleSkill')); }
       } catch (err) { alert(kit.tx('settings.redesign.hooks.failed2', { message: err.message })); }
       finally { chip.style.opacity = ''; chip.style.pointerEvents = ''; }
     });
   });
 
+  // Skill folders: the move of the old bridges to native skill folders, and the shared ~/.agents/skills switch.
+  // After a move, an undo, or a change made anywhere else, the chips are read again in place.
+  wireSkillFolders(overlay, { toast: (message, ms) => showCCToast(message, ms), onChanged: () => refreshSkillChips(overlay), signal: panelLife.signal });
+
   // ── Setup tab: per-provider MCP toggles, CLI copy, config copy, SynaBun rules ──
   {
     const checkIcon = '<svg viewBox="0 0 24 24" style="width:12px;height:12px"><polyline points="20 6 9 17 4 12"/></svg>';
@@ -5337,7 +5613,7 @@ export async function openSettingsModal(options = {}) {
         // An edited copy is removed only on an explicit yes (force). A file without SynaBun's markers is the
         // user's own and stays whatever is sent, so there is nothing to confirm for it.
         const edited = info?.state === 'modified' && info.replaceable !== false;
-        // OpenCode: a line in config.json that SynaBun did not add keeps the file on a plain remove (the answer
+        // OpenCode: a line in opencode.json that SynaBun did not add keeps the file on a plain remove (the answer
         // says so, and the host is then no longer managed). Asked again, the confirm sends force, which takes that line too.
         const listed = info?.entry === 'user';
         const force = edited || (listed && info.managed === false);
@@ -5480,8 +5756,8 @@ export async function openSettingsModal(options = {}) {
     wireRulesControls('codex', 'codex');
 
     // ── OpenCode ──
-    wireSetupMcpToggle('opencode', '/api/opencode/mcp', '~/.config/opencode/config.json');
-    // Config preview — OpenCode stores MCP servers under the "mcp" key of config.json
+    wireSetupMcpToggle('opencode', '/api/opencode/mcp', '~/.config/opencode/opencode.json');
+    // Config preview — OpenCode 2 keeps MCP servers under "mcp" → "servers" of opencode.json
     {
       const preview = overlay.querySelector('#setup-opencode-config-preview');
       let cachedConfig = '';
@@ -5489,15 +5765,18 @@ export async function openSettingsModal(options = {}) {
         const ep = setupStatus.paths?.envPath || '<path-to>/synabun/.env';
         fetch('/api/opencode/mcp').then(r => r.json()).then(data => {
           if (data.ok && data.data && Object.keys(data.data).length) {
-            cachedConfig = JSON.stringify({ mcp: data.data }, null, 2);
+            cachedConfig = JSON.stringify({ mcp: { servers: data.data } }, null, 2);
             preview.textContent = cachedConfig;
           } else if (data.ok) {
+            const launch = mcpLaunch();
             cachedConfig = JSON.stringify({
               mcp: {
-                SynaBun: {
-                  type: 'stdio',
-                  ...mcpLaunch(),
-                  env: { DOTENV_PATH: ep },
+                servers: {
+                  SynaBun: {
+                    type: 'local',
+                    command: [launch.command, ...launch.args],
+                    environment: { DOTENV_PATH: ep },
+                  },
                 },
               },
             }, null, 2);
@@ -5591,7 +5870,7 @@ export async function openSettingsModal(options = {}) {
       overlay.querySelectorAll('.bc-dropdown.open').forEach(dd => {
         if (!dd.contains(e.target)) dd.classList.remove('open');
       });
-    });
+    }, { signal: panelLife.signal });
 
     // Sync dropdown display from hidden input value (for applyBrowserConfig)
     function syncBcDropdowns() {
@@ -6091,12 +6370,12 @@ export async function openSettingsModal(options = {}) {
             + '</div>';
           html += '<div style="padding:4px 0">';
           if (data.parent) {
-            html += `<div class="cc-browse-item" data-path="${escapeHtml(data.parent)}" style="padding:4px 10px;cursor:pointer;font-size:12px;display:flex;align-items:center;gap:6px;color:var(--t-muted)">`
+            html += `<div class="cc-browse-item" data-path="${kit.esc(data.parent)}" style="padding:4px 10px;cursor:pointer;font-size:12px;display:flex;align-items:center;gap:6px;color:var(--t-muted)">`
               + '<svg viewBox="0 0 24 24" style="width:13px;height:13px;fill:none;stroke:currentColor;stroke-width:2"><polyline points="15 18 9 12 15 6"/></svg>'
               + '' + kit.te('settings.redesign.browser.parent') + '</div>';
           }
           for (const d of data.directories) {
-            html += `<div class="cc-browse-item" data-path="${escapeHtml(data.current + '/' + d)}" style="padding:4px 10px;cursor:pointer;font-size:12px;display:flex;align-items:center;gap:6px">`
+            html += `<div class="cc-browse-item" data-path="${kit.esc(data.current + '/' + d)}" style="padding:4px 10px;cursor:pointer;font-size:12px;display:flex;align-items:center;gap:6px">`
               + '<svg viewBox="0 0 24 24" style="width:13px;height:13px;fill:none;stroke:currentColor;stroke-width:2"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/></svg>'
               + escapeHtml(d) + '</div>';
           }
@@ -7274,7 +7553,10 @@ export async function openSettingsModal(options = {}) {
     const ocpToolsEl = overlay.querySelector('#stg-ocp-tools');
     const ocpHistoryMetaEl = overlay.querySelector('#stg-ocp-history-meta');
     const ocpHistoryClearBtn = overlay.querySelector('#stg-ocp-clear-history');
-    const esc = s => String(s || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    const ocpInstallEl = overlay.querySelector('#stg-ocp-install');
+    const ocpConfigPathEl = overlay.querySelector('#stg-ocp-config-path');
+    const ocpConfigJsoncEl = overlay.querySelector('#stg-ocp-config-jsonc');
+    const esc = s => String(s || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 
     // ── Helpers ──
     let _ocpConnected = new Set();
@@ -7296,6 +7578,7 @@ export async function openSettingsModal(options = {}) {
     let _ollamaConfiguring = false;
     let _ollamaPollTimer = null;
     let _ollamaLastModelNames = '';
+    let _ollamaConfigureError = '';
     let _ocpHistoryStats = null;
 
     function formatBytes(bytes) {
@@ -7326,7 +7609,7 @@ export async function openSettingsModal(options = {}) {
           ocpHistoryMetaEl.textContent = kit.tx('settings.redesign.opencode.historyWipeInProgress');
           return;
         }
-        const totalBytes = (Number(data.databaseBytes) || 0) + (Number(data.artifactBytes) || 0);
+        const totalBytes = Number(data.databaseBytes) || 0;
         ocpHistoryMetaEl.textContent = kit.tx('settings.redesign.opencode.stored', { formatCount: formatCount(data.sessions, 'session'), formatBytes: formatBytes(totalBytes) });
         ocpHistoryClearBtn.disabled = false;
       } catch (error) {
@@ -7338,8 +7621,7 @@ export async function openSettingsModal(options = {}) {
       if (document.querySelector('.ocp-history-clear-overlay')) return;
       const confirmation = _ocpHistoryStats?.confirmationPhrase || 'DELETE OPENCODE HISTORY';
       const sessionCount = Number(_ocpHistoryStats?.sessions) || 0;
-      const totalBytes = (Number(_ocpHistoryStats?.databaseBytes) || 0)
-        + (Number(_ocpHistoryStats?.artifactBytes) || 0);
+      const totalBytes = Number(_ocpHistoryStats?.databaseBytes) || 0;
       const modal = document.createElement('div');
       modal.className = 'tag-delete-overlay ocp-history-clear-overlay';
       modal.innerHTML = `
@@ -7353,9 +7635,9 @@ export async function openSettingsModal(options = {}) {
               <p class="ocp-history-modal-subtitle">${formatCount(sessionCount, 'session')} ${kit.th('settings.redesign.opencode.currentlyStored', { formatBytes: formatBytes(totalBytes) })}</p>
             </div>
           </div>
-          <div class="ocp-history-warning"><strong>${kit.te('settings.redesign.opencode.thisCannotBeUndone')}</strong> ${kit.te('settings.redesign.opencode.activeConversationsOrAutomationsMustBe')}</div>
+          <div class="ocp-history-warning"><strong>${kit.te('settings.redesign.opencode.thisCannotBeUndone')}</strong> ${kit.te('settings.redesign.opencode.historyClearSteps')}</div>
           <ul class="ocp-history-scope">
-            <li>${kit.te('settings.redesign.opencode.deletesConversationsMessagesToolOutputTo')}</li>
+            <li>${kit.te('settings.redesign.opencode.historyClearDeletes')}</li>
             <li>${kit.te('settings.redesign.opencode.deletesSynabunSDerivedOpencodeResume')}</li>
             <li>${kit.te('settings.redesign.opencode.keepsProviderCredentialsAccountConfigSet')}</li>
           </ul>
@@ -7403,7 +7685,7 @@ export async function openSettingsModal(options = {}) {
         confirmButton.disabled = true;
         confirmButton.textContent = kit.tx('settings.redesign.opencode.clearing');
         feedback.dataset.state = 'working';
-        feedback.textContent = kit.tx('settings.redesign.opencode.stoppingOpencodeAndClearingItsHistory');
+        feedback.textContent = kit.tx('settings.redesign.opencode.historyClearWorking');
         const requestId = crypto.randomUUID?.() || `${Date.now()}-${Math.random()}`;
         sessionStorage.setItem('synabun-opencode-history-clear-request', requestId);
         try {
@@ -7416,9 +7698,7 @@ export async function openSettingsModal(options = {}) {
           if (!response.ok || !data.ok) throw new Error(data.error || kit.tx('settings.redesign.opencode.historyWipeFailedHttp', { status: response.status }));
 
           const result = data.result || {};
-          const reclaimed = Math.max(0,
-            (Number(result.databaseBytesBefore) || 0) - (Number(result.databaseBytesAfter) || 0)
-              + (Number(result.artifactBytesDeleted) || 0));
+          const reclaimed = Math.max(0, (Number(result.databaseBytesBefore) || 0) - (Number(result.databaseBytesAfter) || 0));
           const warnings = Array.isArray(result.warnings) ? result.warnings.filter(Boolean) : [];
           feedback.dataset.state = warnings.length ? 'warning' : 'working';
           feedback.textContent = warnings.length
@@ -7459,7 +7739,7 @@ export async function openSettingsModal(options = {}) {
         dotColor = '#facc15';
         statusText = kit.tx('settings.redesign.opencode.configuring');
         statusCls = 'stg-provider-status-key';
-        bodyHtml = '<div class="stg-provider-note">' + kit.te('settings.redesign.opencode.writingProviderConfigAndRestartingOpenco') + '</div>';
+        bodyHtml = '<div class="stg-provider-note">' + kit.te('settings.redesign.opencode.writingProviderConfig') + '</div>';
       } else if (!_ollamaRunning) {
         dotColor = 'rgba(248,113,113,0.7)';
         statusText = kit.tx('settings.redesign.opencode.notDetected');
@@ -7470,6 +7750,11 @@ export async function openSettingsModal(options = {}) {
         statusText = kit.tx('settings.redesign.opencode.runningVersion', { version: _ollamaVersion ? ' v' + _ollamaVersion : '' });
         statusCls = 'stg-provider-status-key';
         bodyHtml = '<div class="stg-provider-note">' + kit.te('settings.redesign.opencode.noModelsRun') + ' <code class="stg-code">ollama pull &lt;model&gt;</code></div>';
+      } else if (_ollamaConfigureError) {
+        dotColor = 'rgba(248,113,113,0.7)';
+        statusText = kit.tx('settings.redesign.opencode.runningVersion', { version: _ollamaVersion ? ' v' + _ollamaVersion : '' });
+        statusCls = 'stg-provider-status-disconnected';
+        bodyHtml = '<div class="stg-provider-note">' + esc(kit.tx('settings.redesign.opencode.error2', { message: _ollamaConfigureError })) + '</div>';
       } else if (_ollamaConfigured) {
         dotColor = '#4ade80';
         statusText = kit.tx('settings.redesign.opencode.runningVersion', { version: _ollamaVersion ? ' v' + _ollamaVersion : '' });
@@ -7505,27 +7790,16 @@ export async function openSettingsModal(options = {}) {
         const btn = existing.querySelector('.stg-ollama-remove');
         if (btn) { btn.disabled = true; btn.textContent = kit.tx('settings.redesign.opencode.removing'); }
         try {
-          await fetch('/api/ollama/configure', { method: 'DELETE' });
+          const resp = await fetch('/api/ollama/configure', { method: 'DELETE' });
+          const data = await resp.json().catch(() => ({}));
+          if (!resp.ok || data.ok === false) throw new Error(data.error || `HTTP ${resp.status}`);
           _ollamaConfigured = false;
           _ollamaConfiguredCount = 0;
           _ollamaUserRemoved = true;
           renderOllamaCard();
-          showCCToast(kit.tx('settings.redesign.opencode.ollamaProviderRemovedServerRestarting'));
-          // Poll for server restart then refresh providers
-          let polls = 0;
-          const pollId = setInterval(async () => {
-            polls++;
-            if (polls > 8) { clearInterval(pollId); return; }
-            try {
-              const sr = await fetch('/api/opencode/status');
-              const sd = await sr.json();
-              if (sd.running) {
-                clearInterval(pollId);
-                await refreshOcpProviders();
-                document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
-              }
-            } catch {}
-          }, 2000);
+          showCCToast(kit.tx('settings.redesign.opencode.ollamaProviderRemoved'));
+          await refreshOcpProviders();
+          document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
         } catch (e) {
           showCCToast(kit.tx('settings.redesign.opencode.error2', { message: e.message }));
         }
@@ -7559,7 +7833,9 @@ export async function openSettingsModal(options = {}) {
 
         // Auto-configure if: running + has models + not configured + not user-removed
         // Also re-configure if models changed while already configured
-        const shouldConfigure = _ollamaRunning && _ollamaModels.length > 0 && !_ollamaUserRemoved
+        // A refusal (an opencode.json SynaBun cannot change now) is asked again only when the models change.
+        if (modelsChanged) _ollamaConfigureError = '';
+        const shouldConfigure = _ollamaRunning && _ollamaModels.length > 0 && !_ollamaUserRemoved && !_ollamaConfigureError
           && (!_ollamaConfigured || modelsChanged);
 
         if (shouldConfigure && !_ollamaConfiguring) {
@@ -7567,31 +7843,16 @@ export async function openSettingsModal(options = {}) {
           renderOllamaCard();
           try {
             const cfgResp = await fetch('/api/ollama/configure', { method: 'POST' });
-            const cfgData = await cfgResp.json();
-            if (cfgData.ok) {
+            const cfgData = await cfgResp.json().catch(() => ({}));
+            _ollamaConfiguring = false;
+            if (cfgResp.ok && cfgData.ok) {
+              // OpenCode reads the provider at once: its models are listed now.
               _ollamaConfigured = true;
               _ollamaConfiguredCount = cfgData.modelsConfigured;
-              // Wait for OpenCode server restart then refresh providers
-              setTimeout(async () => {
-                let polls = 0;
-                const pollId = setInterval(async () => {
-                  polls++;
-                  if (polls > 8) { clearInterval(pollId); _ollamaConfiguring = false; renderOllamaCard(); return; }
-                  try {
-                    const sr = await fetch('/api/opencode/status');
-                    const sd = await sr.json();
-                    if (sd.running) {
-                      clearInterval(pollId);
-                      _ollamaConfiguring = false;
-                      await refreshOcpProviders();
-                      renderOllamaCard();
-                      document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
-                    }
-                  } catch {}
-                }, 2000);
-              }, 1000);
+              await refreshOcpProviders();
+              document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
             } else {
-              _ollamaConfiguring = false;
+              _ollamaConfigureError = cfgData.error || `HTTP ${cfgResp.status}`;
             }
           } catch {
             _ollamaConfiguring = false;
@@ -7843,7 +8104,7 @@ export async function openSettingsModal(options = {}) {
           }
           for (const om of oauthMethods) {
             const label = om.label || om.name || kit.tx('settings.redesign.opencode.reconnectProvider', { name });
-            btns.push(`<button type="button" class="stg-action-btn compact stg-text-btn stg-ocp-oauth-btn" data-provider="${esc(id)}" data-method="${om._idx}">${esc(label)}</button>`);
+            btns.push(`<button type="button" class="stg-action-btn compact stg-text-btn stg-ocp-oauth-btn" data-provider="${esc(id)}" data-method="${om._idx}" data-method-id="${esc(om.id || '')}">${esc(label)}</button>`);
           }
           authHtml = btns.join('');
           removeHtml = `<button type="button" class="stg-action-btn compact stg-text-btn stg-text-btn-danger stg-ocp-remove-btn" data-provider="${esc(id)}" data-env="${esc(primaryEnv)}">${kit.te('settings.redesign.opencode.removeConfirm')}</button>`;
@@ -7857,7 +8118,7 @@ export async function openSettingsModal(options = {}) {
           }
           for (const om of oauthMethods) {
             const label = om.label || om.name || kit.tx('settings.redesign.opencode.loginWith', { name: name });
-            btns.push(`<button type="button" class="stg-action-btn compact stg-ocp-oauth-btn" data-provider="${esc(id)}" data-method="${om._idx}">${esc(label)}</button>`);
+            btns.push(`<button type="button" class="stg-action-btn compact stg-ocp-oauth-btn" data-provider="${esc(id)}" data-method="${om._idx}" data-method-id="${esc(om.id || '')}">${esc(label)}</button>`);
           }
           authHtml = btns.join('');
         }
@@ -7873,9 +8134,16 @@ export async function openSettingsModal(options = {}) {
         </div>`;
 
         // OAuth wait indicator (hidden via inline style — JS removes it to show)
+        // OAuth wait (hidden via inline style — JS removes it to show): OpenCode's instructions (a device code),
+        // and, for a sign-in that ends with a code the provider shows, the field it is pasted in.
         const oauthWaitHtml = `<div class="stg-ocp-oauth-wait" data-provider="${esc(id)}" style="display:none">
-          ${kit.te('settings.redesign.opencode.waitingForAuthorization')}
+          <span class="stg-ocp-oauth-status">${kit.te('settings.redesign.opencode.waitingForAuthorization')}</span>
           <span class="stg-ocp-oauth-code" style="display:none"></span>
+          <div class="stg-ocp-key-row stg-ocp-oauth-code-row" style="display:none">
+            <input type="text" class="stg-input stg-input-sm stg-ocp-oauth-code-input" placeholder="${kit.te('settings.redesign.opencode.oauthCodePlaceholder')}" aria-label="${kit.te('settings.redesign.opencode.oauthCodeFor', { name })}" autocomplete="off" spellcheck="false" style="flex:1">
+            <button type="button" class="stg-action-btn compact stg-ocp-oauth-code-submit">${kit.te('settings.redesign.opencode.oauthConnect')}</button>
+          </div>
+          <div class="stg-ocp-key-error"></div>
         </div>`;
 
         const hiddenSet = getHiddenModels();
@@ -8071,28 +8339,15 @@ export async function openSettingsModal(options = {}) {
           try {
             const resp = await fetch(`/api/opencode/auth/${encodeURIComponent(provId)}`, {
               method: 'PUT', headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ type: 'api', key }),
+              body: JSON.stringify({ key }),
             });
-            const data = await resp.json();
+            const data = await resp.json().catch(() => ({}));
             if (resp.ok && data.ok !== false) {
               form.style.display = 'none';
               input.value = '';
-              showCCToast(kit.tx('settings.redesign.opencode.apiKeySavedForServerRestarting', { provId: provId }));
-              // Poll until server is back (takeover kills + respawns, ~5-6s)
-              let polls = 0;
-              const pollId = setInterval(async () => {
-                polls++;
-                if (polls > 8) { clearInterval(pollId); return; }
-                try {
-                  const sr = await fetch('/api/opencode/status');
-                  const sd = await sr.json();
-                  if (sd.running) {
-                    clearInterval(pollId);
-                    await refreshOcpProviders();
-                    document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
-                  }
-                } catch {}
-              }, 2000);
+              showCCToast(kit.tx('settings.redesign.opencode.apiKeySaved', { provId: provId }));
+              await refreshOcpProviders();
+              document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
             } else {
               const msg = data.error || kit.tx('settings.redesign.opencode.failedToSaveKey');
               if (errEl) { errEl.textContent = msg; errEl.style.display = ''; }
@@ -8125,24 +8380,11 @@ export async function openSettingsModal(options = {}) {
               method: 'DELETE',
               headers: { 'Content-Type': 'application/json' },
             });
-            const data = await resp.json();
+            const data = await resp.json().catch(() => ({}));
             if (resp.ok && data.ok !== false) {
-              showCCToast(kit.tx('settings.redesign.opencode.apiKeyRemovedForServerRestarting', { provId: provId }));
-              // Poll until server is back (takeover kills + respawns, ~5-6s)
-              let polls = 0;
-              const pollId = setInterval(async () => {
-                polls++;
-                if (polls > 8) { clearInterval(pollId); return; }
-                try {
-                  const sr = await fetch('/api/opencode/status');
-                  const sd = await sr.json();
-                  if (sd.running) {
-                    clearInterval(pollId);
-                    await refreshOcpProviders();
-                    document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
-                  }
-                } catch {}
-              }, 2000);
+              showCCToast(kit.tx('settings.redesign.opencode.apiKeyRemoved', { provId: provId }));
+              await refreshOcpProviders();
+              document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
             } else {
               showCCToast(data.error || kit.tx('settings.redesign.opencode.failedToRemoveKey'));
             }
@@ -8159,42 +8401,22 @@ export async function openSettingsModal(options = {}) {
         btn.addEventListener('click', async () => {
           const provId = btn.dataset.provider;
           const methodIdx = parseInt(btn.dataset.method, 10);
+          const card = btn.closest('.stg-provider-card');
+          const providerName = card?.querySelector('.stg-provider-name')?.textContent?.trim() || provId;
           btn.disabled = true; btn.textContent = kit.tx('settings.redesign.opencode.connecting');
-          const waitEl = ocpProvidersEl.querySelector(`.stg-ocp-oauth-wait[data-provider="${provId}"]`);
-          const codeEl = waitEl?.querySelector('.stg-ocp-oauth-code');
           try {
             const resp = await fetch(`/api/opencode/oauth/${encodeURIComponent(provId)}/authorize`, {
               method: 'POST',
               headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ method: isNaN(methodIdx) ? 0 : methodIdx }),
+              body: JSON.stringify({ methodID: btn.dataset.methodId || undefined, method: isNaN(methodIdx) ? 0 : methodIdx }),
             });
-            const data = await resp.json();
-            const authData = data.data || data;
-            if (authData.url) {
-              window.open(authData.url, '_blank');
-              if (waitEl) waitEl.style.display = '';
-              if (authData.code && codeEl) { codeEl.textContent = authData.code; codeEl.style.display = ''; }
-              if (authData.instructions) showCCToast(authData.instructions);
-              // Poll for completion
-              let attempts = 0;
-              const poll = setInterval(async () => {
-                attempts++;
-                if (attempts > 60) { clearInterval(poll); if (waitEl) waitEl.style.display = 'none'; return; }
-                try {
-                  const pr = await fetch('/api/opencode/providers/full');
-                  const pd = await pr.json();
-                  const connected = pd.data?.connected || [];
-                  if (connected.includes(provId)) {
-                    clearInterval(poll);
-                    if (waitEl) waitEl.style.display = 'none';
-                    showCCToast(kit.tx('settings.redesign.opencode.connected', { provId: provId }));
-                    await refreshOcpProviders();
-                    document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
-                  }
-                } catch {}
-              }, 2000);
+            const data = await resp.json().catch(() => ({}));
+            const auth = data.data || {};
+            if (resp.ok && data.ok !== false && auth.url) {
+              window.open(auth.url, '_blank', 'noopener');
+              showOcpOAuthWait(provId, providerName, auth);
             } else {
-              showCCToast(authData.error || data.error || kit.tx('settings.redesign.opencode.oauthFailedNoAuthorizationUrlReturned'));
+              showCCToast(data.error || kit.tx('settings.redesign.opencode.oauthFailedNoAuthorizationUrlReturned'));
             }
           } catch (e) {
             showCCToast(kit.tx('settings.redesign.opencode.oauthError', { message: e.message }));
@@ -8204,6 +8426,81 @@ export async function openSettingsModal(options = {}) {
       });
     }
 
+    // ── A sign-in under way (OpenCode 2's attempt: `auto` finishes by itself, `code` with the code pasted) ──
+    const _ocpOAuthPolls = new Map(); // provider id → timer
+    function endOcpOAuth(provId) {
+      clearInterval(_ocpOAuthPolls.get(provId));
+      _ocpOAuthPolls.delete(provId);
+      const waitEl = ocpProvidersEl?.querySelector(`.stg-ocp-oauth-wait[data-provider="${CSS.escape(provId)}"]`);
+      if (waitEl) waitEl.style.display = 'none';
+    }
+    async function finishOcpOAuth(provId) {
+      endOcpOAuth(provId);
+      showCCToast(kit.tx('settings.redesign.opencode.connected', { provId: provId }));
+      await refreshOcpProviders();
+      document.dispatchEvent(new CustomEvent('ocp-providers-changed'));
+    }
+    function showOcpOAuthWait(provId, providerName, auth) {
+      endOcpOAuth(provId);
+      const waitEl = ocpProvidersEl?.querySelector(`.stg-ocp-oauth-wait[data-provider="${CSS.escape(provId)}"]`);
+      const codeEl = waitEl?.querySelector('.stg-ocp-oauth-code');
+      const codeRow = waitEl?.querySelector('.stg-ocp-oauth-code-row');
+      const errEl = waitEl?.querySelector('.stg-ocp-key-error');
+      if (waitEl) waitEl.style.display = '';
+      if (codeEl) { codeEl.textContent = auth.instructions || ''; codeEl.style.display = auth.instructions ? '' : 'none'; }
+      if (errEl) errEl.textContent = '';
+      if (auth.method === 'code') {
+        if (!codeRow) return;
+        codeRow.style.display = '';
+        const input = codeRow.querySelector('.stg-ocp-oauth-code-input');
+        const submit = codeRow.querySelector('.stg-ocp-oauth-code-submit');
+        input?.focus();
+        const send = async () => {
+          const code = input?.value?.trim();
+          if (!code) return;
+          submit.disabled = true;
+          try {
+            const resp = await fetch(`/api/opencode/oauth/${encodeURIComponent(provId)}/callback`, {
+              method: 'POST', headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ attemptID: auth.attemptID, code }),
+            });
+            const data = await resp.json().catch(() => ({}));
+            if (!resp.ok || data.ok === false) throw new Error(data.error || `HTTP ${resp.status}`);
+            input.value = '';
+            await finishOcpOAuth(provId);
+          } catch (e) {
+            if (errEl) errEl.textContent = kit.tx('settings.redesign.opencode.oauthFailed', { message: e.message });
+          } finally {
+            submit.disabled = false;
+          }
+        };
+        if (submit) submit.onclick = send;
+        if (input) input.onkeydown = (event) => { if (event.key === 'Enter') { event.preventDefault(); send(); } };
+        return;
+      }
+      if (codeRow) codeRow.style.display = 'none';
+      if (!auth.attemptID) return;
+      // Every 2 s for five minutes: then the attempt is let go (OpenCode's own attempt ends by itself).
+      let attempts = 0;
+      _ocpOAuthPolls.set(provId, setInterval(async () => {
+        attempts++;
+        if (attempts > 150) { endOcpOAuth(provId); showCCToast(kit.tx('settings.redesign.opencode.oauthGaveUp')); return; }
+        try {
+          const resp = await fetch(`/api/opencode/oauth/${encodeURIComponent(provId)}/status?attemptID=${encodeURIComponent(auth.attemptID)}`);
+          const data = await resp.json().catch(() => ({}));
+          if (!resp.ok || data.ok === false) throw new Error(data.error || `HTTP ${resp.status}`);
+          const status = data.data?.status;
+          if (status === 'complete') await finishOcpOAuth(provId);
+          else if (status === 'expired') { endOcpOAuth(provId); showCCToast(kit.tx('settings.redesign.opencode.oauthExpired')); }
+          else if (status === 'failed') { endOcpOAuth(provId); showCCToast(kit.tx('settings.redesign.opencode.oauthFailed', { message: data.data?.message || status })); }
+        } catch (e) {
+          endOcpOAuth(provId);
+          showCCToast(kit.tx('settings.redesign.opencode.oauthFailed', { message: e.message }));
+        }
+      }, 2000));
+    }
+    panelLife.signal.addEventListener('abort', () => { for (const provId of [..._ocpOAuthPolls.keys()]) endOcpOAuth(provId); });
+
     // ── Delegated card click-to-expand (survives re-renders) ──
     if (ocpProvidersEl) {
       ocpProvidersEl.addEventListener('click', (e) => {
@@ -8221,64 +8518,60 @@ export async function openSettingsModal(options = {}) {
     }
 
     // ── Tools/Permissions rendering ──
-    async function renderToolPermissions() {
-      if (!ocpToolsEl) return;
-      try {
-        const [toolsResp, configResp] = await Promise.all([
-          fetch('/api/opencode/tools'),
-          fetch('/api/opencode/config'),
-        ]);
-        const toolsData = await toolsResp.json();
-        const configData = await configResp.json();
-        _ocpConfig = configData.data || {};
-        const toolIds = Array.isArray(toolsData.data) ? toolsData.data : (toolsData.data?.ids || []);
-        const permissions = _ocpConfig.permission || {};
-        const tools = _ocpConfig.tools || {};
-
-        if (!toolIds.length) {
-          ocpToolsEl.innerHTML = '<div class="settings-hint" style="opacity:0.4">' + kit.te('settings.redesign.opencode.noToolsAvailable') + '</div>';
-          return;
+    // What each of OpenCode's own tools may do: the rules of OpenCode's global opencode.json
+    // (GET /api/opencode/config: `actions`, `tools`), read and written there whether or not OpenCode runs.
+    const OCP_EFFECTS = ['allow', 'ask', 'deny'];
+    if (ocpToolsEl) {
+      wireDropdowns(ocpToolsEl, { signal: panelLife.signal });
+      ocpToolsEl.addEventListener('change', async (event) => {
+        const input = event.target;
+        const action = input?.dataset?.tool;
+        if (!action || !OCP_EFFECTS.includes(input.value)) return;
+        try {
+          const resp = await fetch('/api/opencode/config', {
+            method: 'PATCH', headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ tools: { [action]: input.value } }),
+          });
+          const data = await resp.json().catch(() => ({}));
+          if (!resp.ok || data.ok === false) throw new Error(data.error || `HTTP ${resp.status}`);
+          applyOcpConfig(data.data);
+        } catch (err) {
+          showCCToast(kit.tx('settings.redesign.opencode.saveFailed', { message: err.message }));
+          renderToolPermissions();
         }
+      }, { signal: panelLife.signal });
+    }
 
-        ocpToolsEl.innerHTML = `<div class="stg-tool-grid">${toolIds.map(t => {
-          const tid = typeof t === 'string' ? t : (t.id || t.name || '');
-          if (!tid) return '';
-          let currentVal = 'allow';
-          if (tools[tid] === false) currentVal = 'deny';
-          else if (permissions[tid] === 'ask') currentVal = 'ask';
-          return `<div class="stg-tool-row">
-            <span class="stg-tool-name">${esc(tid)}</span>
-            <select class="stg-tool-select stg-ocp-tool-perm" data-tool="${esc(tid)}" aria-label="${kit.te('settings.redesign.opencode.permissionFor', { tool: tid })}">
-              <option value="allow"${currentVal === 'allow' ? ' selected' : ''}>${kit.te('settings.redesign.opencode.allow')}</option>
-              <option value="ask"${currentVal === 'ask' ? ' selected' : ''}>${kit.te('settings.redesign.opencode.ask')}</option>
-              <option value="deny"${currentVal === 'deny' ? ' selected' : ''}>${kit.te('settings.redesign.opencode.deny')}</option>
-            </select>
+    function renderToolPermissionsFrom(view) {
+      if (!ocpToolsEl) return;
+      const actions = Array.isArray(view?.actions) ? view.actions : [];
+      if (!actions.length) {
+        ocpToolsEl.innerHTML = '<div class="settings-hint" style="opacity:0.4">' + kit.te('settings.redesign.opencode.noToolsAvailable') + '</div>';
+        return;
+      }
+      const tools = view.tools || {};
+      const labels = { allow: kit.tx('settings.redesign.opencode.allow'), ask: kit.tx('settings.redesign.opencode.ask'), deny: kit.tx('settings.redesign.opencode.deny') };
+      ocpToolsEl.innerHTML = `<div class="stg-tool-grid">${actions.map((action) => {
+        const current = OCP_EFFECTS.includes(tools[action]) ? tools[action] : 'allow';
+        const id = `stg-ocp-tool-${String(action).replace(/[^a-z0-9_-]/gi, '-')}`;
+        return `<div class="stg-tool-row">
+            <span class="stg-tool-name">${esc(action)}</span>
+            ${dropdownHTML(id, OCP_EFFECTS.map((effect) => ({ value: effect, label: labels[effect], selected: effect === current })), {
+              classes: 'stg-dropdown stg-dropdown-inline stg-ocp-tool-perm',
+              label: kit.tx('settings.redesign.opencode.permissionFor', { tool: action }),
+              inputAttrs: `data-tool="${esc(action)}"`,
+            })}
           </div>`;
-        }).join('')}</div>`;
-
-        // Wire change events
-        ocpToolsEl.querySelectorAll('.stg-ocp-tool-perm').forEach(sel => {
-          sel.addEventListener('change', async () => {
-            const tid = sel.dataset.tool;
-            const val = sel.value;
-            const patchBody = {};
-            const newPerms = { ...(_ocpConfig.permission || {}) };
-            const newTools = { ...(_ocpConfig.tools || {}) };
-            if (val === 'deny') { newTools[tid] = false; delete newPerms[tid]; }
-            else if (val === 'ask') { delete newTools[tid]; newPerms[tid] = 'ask'; }
-            else { delete newTools[tid]; delete newPerms[tid]; }
-            patchBody.permission = newPerms;
-            patchBody.tools = newTools;
-            try {
-              await fetch('/api/opencode/config', {
-                method: 'PATCH', headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(patchBody),
-              });
-              _ocpConfig.permission = newPerms;
-              _ocpConfig.tools = newTools;
-            } catch {}
-          });
-        });
+      }).join('')}</div>`;
+    }
+
+    async function renderToolPermissions() {
+      if (!ocpToolsEl) return;
+      try {
+        const resp = await fetch('/api/opencode/config');
+        const data = await resp.json();
+        if (!resp.ok || data.ok === false) throw new Error(data.error || `HTTP ${resp.status}`);
+        applyOcpConfig(data.data);
       } catch {
         ocpToolsEl.innerHTML = '<div class="settings-hint" style="opacity:0.4">' + kit.te('settings.redesign.opencode.failedToLoadTools') + '</div>';
       }
@@ -8296,155 +8589,37 @@ export async function openSettingsModal(options = {}) {
       return null;
     }
 
-    function renderMcpMatrix() {
-      const wrap = overlay.querySelector('#stg-mcp-matrix-wrap');
-      if (!wrap || !_mcpRegistry) return;
-      const tg = _mcpRegistry.toolGroups || {};
-      const profiles = _mcpRegistry.profiles || {};
-      const active = _mcpRegistry.activeProfile || '';
-      const profEntries = Object.entries(profiles);
-      const switchable = Object.entries(tg).filter(([, info]) => !info.alwaysOn);
-
-      if (!profEntries.length) {
-        wrap.innerHTML = '<div class="stg-mcp-matrix-empty">' + kit.te('settings.redesign.mcp.noProfiles') + '</div>';
-        return;
-      }
-
-      // Build table header
-      let thead = '<tr><th class="stg-mx-label-th"><div class="stg-mx-corner-head">' + kit.te('settings.redesign.mcp.toolGroups') + '</div></th>';
-      for (const [name, prof] of profEntries) {
-        const isActive = name === active;
-        thead += `<th class="stg-mx-profile-th${isActive ? ' active' : ''}" data-profile="${esc(name)}">
-          <div class="stg-mx-profile-head" data-profile="${esc(name)}">
-            <span class="stg-mx-profile-dot${isActive ? ' on' : ''}"></span>
-            <span class="stg-mx-profile-name">${esc(prof.label || name)}</span>
-            ${isActive ? '' : `<button class="stg-mx-profile-del" data-profile="${esc(name)}" title="${kit.te('settings.redesign.mcp.deleteProfile')}">\u00d7</button>`}
-          </div>
-        </th>`;
-      }
-      thead += '<th class="stg-mx-add-th"><button class="stg-mx-add-btn" title="' + kit.te('settings.redesign.mcp.newProfile') + '">+</button></th></tr>';
-
-      // Build table body — switchable groups
-      let tbody = '';
-      for (const [key, info] of switchable) {
-        tbody += `<tr>`;
-        tbody += `<td class="stg-mx-label-td"><div class="stg-mx-label-inner">
-          <span class="stg-mx-grp-name">${esc(info.label)}</span>
-          <span class="stg-mx-grp-count">${info.tools}</span>
-        </div></td>`;
-        for (const [profName, prof] of profEntries) {
-          const isOn = (prof.groups || []).includes(key);
-          tbody += `<td class="stg-mx-cell" data-profile="${esc(profName)}" data-group="${esc(key)}" data-kind="group">
-            <span class="stg-mx-toggle${isOn ? ' on' : ''}"></span>
-          </td>`;
-        }
-        tbody += '<td class="stg-mx-add-spacer"></td></tr>';
-      }
-
-      wrap.innerHTML = `<div class="stg-mcp-matrix-scroll"><table id="stg-mcp-matrix"><thead>${thead}</thead><tbody>${tbody}</tbody></table></div>`;
-
-      // --- Event handlers ---
-
-      // Toggle cells
-      wrap.querySelectorAll('.stg-mx-cell').forEach(cell => {
-        cell.addEventListener('click', async () => {
-          const profName = cell.dataset.profile;
-          const prof = _mcpRegistry.profiles[profName];
-          if (!prof) return;
-          const kind = cell.dataset.kind;
-          if (kind === 'group') {
-            const g = cell.dataset.group;
-            if ((prof.groups || []).includes(g)) {
-              prof.groups = prof.groups.filter(x => x !== g);
-            } else {
-              prof.groups = [...(prof.groups || []), g];
-            }
-          } else {
-            const s = cell.dataset.server;
-            if ((prof.servers || []).includes(s)) {
-              prof.servers = prof.servers.filter(x => x !== s);
-            } else {
-              prof.servers = [...(prof.servers || []), s];
-            }
-          }
-          await fetch(`/api/mcp/registry/profiles/${encodeURIComponent(profName)}`, {
-            method: 'PUT', headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(prof),
-          });
-          await refreshMcpTab();
-        });
-      });
-
-      // Activate profile on name click
-      wrap.querySelectorAll('.stg-mx-profile-head').forEach(head => {
-        head.addEventListener('click', async (e) => {
-          if (e.target.closest('.stg-mx-profile-del')) return;
-          const name = head.dataset.profile;
-          if (name === _mcpRegistry.activeProfile) return;
-          await fetch('/api/mcp/registry/activate', {
-            method: 'POST', headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ profile: name }),
-          });
-          showCCToast(kit.tx('settings.redesign.mcp.profileSwitchedTo', { name: name }));
-          await refreshMcpTab();
-        });
-      });
-
-      // Delete profile
-      wrap.querySelectorAll('.stg-mx-profile-del').forEach(btn => {
-        btn.addEventListener('click', async (e) => {
-          e.stopPropagation();
-          await fetch(`/api/mcp/registry/profiles/${encodeURIComponent(btn.dataset.profile)}`, { method: 'DELETE' });
-          await refreshMcpTab();
-        });
+    let _settingsToolCatalog = null;
+    const defaultToolsWrap = overlay.querySelector('#stg-mcp-default-tools');
+    if (defaultToolsWrap) wireDropdowns(defaultToolsWrap, { signal: panelLife.signal });
+    function renderDefaultTools() {
+      const wrap = overlay.querySelector('#stg-mcp-default-tools');
+      if (!wrap) return;
+      wrap.innerHTML = _settingsToolCatalog ? toolPickerHTML('stg-default-tools', _settingsToolCatalog.defaultTools, { catalog: _settingsToolCatalog, provider: 'all', label: toolWord('defaultTools') }) : '';
+      wrap.querySelector('#stg-default-tools')?.addEventListener('change', async (event) => {
+        const tools = readToolPicker(event.target, { inherit: false });
+        try {
+          const response = await fetch('/api/mcp/tools/default', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ tools }) });
+          const result = await response.json();
+          if (!response.ok || !result.ok) throw new Error(result.error || toolWord('saveFailed'));
+          _settingsToolCatalog.defaultTools = result.tools;
+          showCCToast(toolWord('saved'));
+        } catch (error) { showCCToast(error.message || toolWord('saveFailed')); }
+        renderDefaultTools();
       });
-
-      // Inline add profile
-      const addBtn = wrap.querySelector('.stg-mx-add-btn');
-      if (addBtn) {
-        addBtn.addEventListener('click', () => {
-          const th = addBtn.closest('th');
-          th.innerHTML = `<input class="stg-mx-inline-input" type="text" placeholder="${kit.te('settings.redesign.mcp.name')}" autofocus>`;
-          const input = th.querySelector('input');
-          input.focus();
-          const create = async () => {
-            const name = input.value.trim();
-            if (!name) { await refreshMcpTab(); return; }
-            await fetch(`/api/mcp/registry/profiles/${encodeURIComponent(name)}`, {
-              method: 'PUT', headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ label: name, groups: [], servers: [] }),
-            });
-            await refreshMcpTab();
-          };
-          input.addEventListener('keydown', (e) => {
-            if (e.key === 'Enter') { e.preventDefault(); e.stopPropagation(); create(); }
-            if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); refreshMcpTab(); }
-          });
-          input.addEventListener('blur', create);
-        });
-      }
     }
 
     function renderAlwaysOn() {
       const el = overlay.querySelector('#stg-mcp-always-on');
-      if (!el || !_mcpRegistry) return;
-      const tg = _mcpRegistry.toolGroups || {};
-      const alwaysOn = Object.entries(tg).filter(([, info]) => info.alwaysOn);
-      if (!alwaysOn.length) { el.innerHTML = ''; return; }
-      el.innerHTML = `
-        <div class="stg-mcp-section-header">${kit.te('settings.redesign.mcp.alwaysOn')}</div>
-        <div class="stg-mx-always-on-row">
-          ${alwaysOn.map(([, info]) =>
-            `<span class="stg-mx-always-chip">${esc(info.label)}<span class="stg-mx-grp-count">${info.tools}</span></span>`
-          ).join('')}
-        </div>`;
+      if (!el) return;
+      el.innerHTML = _settingsToolCatalog ? `<div class="stg-mcp-section-header">${esc(toolWord('alwaysOn'))}</div><div class="stg-mx-always-on-row">${_settingsToolCatalog.alwaysOnTools.map(name => `<span class="stg-mx-always-chip">${esc(name)}</span>`).join('')}</div>` : '';
     }
 
     function renderExtServerList() {
       const el = overlay.querySelector('#stg-mcp-ext-servers');
       if (!el || !_mcpRegistry) return;
-      const servers = _mcpRegistry.servers || {};
-      const profiles = Object.entries(_mcpRegistry.profiles || {});
+      const servers = { ...(_mcpRegistry.servers || {}) };
+      for (const row of _settingsToolCatalog?.servers || []) { const name = row.ref.slice(4); if (!servers[name]) servers[name] = { type: toolWord('configuredExternally'), discovered: true }; }
       const entries = Object.entries(servers).filter(([, info]) => !info.builtin);
       if (!entries.length) {
         el.innerHTML = '<div class="stg-mcp-empty-note">' + kit.te('settings.redesign.mcp.noExternalServersConfigured') + '</div>';
@@ -8459,38 +8634,31 @@ export async function openSettingsModal(options = {}) {
                 <span class="stg-mx-ext-name">${esc(name)}</span>
                 <span class="stg-mx-ext-type">${esc(info.type || '?')}</span>
               </div>
-              <div class="stg-mx-ext-sub">${kit.te('settings.redesign.mcp.availableToAnyProfileYouEnable')}</div>
+              <div class="stg-mx-ext-sub">${esc(toolWord('agentAccessHelp'))}</div>
             </div>
-            <button class="stg-mx-srv-del stg-mx-ext-remove" data-server="${esc(name)}" title="${kit.te('settings.redesign.mcp.removeServer')}">\u00d7</button>
+            ${info.discovered ? '' : `<button class="stg-mx-srv-del stg-mx-ext-remove" ${kit.inv('MCP004')} data-server="${esc(name)}" title="${kit.te('settings.redesign.mcp.removeServer')}">\u00d7</button>`}
           </div>
-          <div class="stg-mx-ext-profiles">
-            ${profiles.map(([profName, prof]) => {
-              const isOn = (prof.servers || []).includes(name);
-              return `<button class="stg-mx-ext-toggle${isOn ? ' on' : ''}" data-profile="${esc(profName)}" data-server="${esc(name)}" title="${isOn ? kit.te('settings.redesign.mcp.disable') : kit.te('settings.redesign.mcp.enable')} ${esc(name)} ${kit.te('settings.redesign.mcp.for')} ${esc(prof.label || profName)}">
-                <span class="stg-mx-ext-toggle-name">${esc(prof.label || profName)}</span>
-              </button>`;
-            }).join('')}
+          <div class="stg-field"><span>${esc(toolWord('agentAccess'))}</span>
+            <button type="button" class="cc-toggle${_mcpRegistry.agentAccess?.[name] === false ? '' : ' on'}" role="switch" ${kit.inv('MCP005')} data-agent-server="${esc(name)}" aria-label="${esc(toolWord('agentAccess'))}: ${esc(name)}" aria-checked="${_mcpRegistry.agentAccess?.[name] !== false}"></button>
           </div>
         </div>`
       ).join('');
 
-      el.querySelectorAll('.stg-mx-ext-toggle').forEach(btn => {
-        btn.addEventListener('click', async () => {
-          const profName = btn.dataset.profile;
-          const srvName = btn.dataset.server;
-          const prof = _mcpRegistry.profiles[profName];
-          if (!prof || !srvName) return;
-          if ((prof.servers || []).includes(srvName)) {
-            prof.servers = prof.servers.filter(x => x !== srvName);
-          } else {
-            prof.servers = [...(prof.servers || []), srvName];
-          }
-          await fetch(`/api/mcp/registry/profiles/${encodeURIComponent(profName)}`, {
-            method: 'PUT',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(prof),
-          });
-          await refreshMcpTab();
+      el.querySelectorAll('[data-agent-server]').forEach(input => {
+        input.addEventListener('click', async () => {
+          const enabled = input.getAttribute('aria-checked') !== 'true';
+          input.disabled = true;
+          try {
+            const response = await fetch(`/api/mcp/registry/agent-access/${encodeURIComponent(input.dataset.agentServer)}`, {
+              method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ enabled }),
+            });
+            const result = await response.json();
+            if (!response.ok || !result.ok) throw new Error(result.error || toolWord('saveFailed'));
+            _mcpRegistry.agentAccess = result.agentAccess;
+            input.classList.toggle('on', enabled);
+            input.setAttribute('aria-checked', String(enabled));
+          } catch (error) { showCCToast(error.message || toolWord('saveFailed')); }
+          finally { input.disabled = false; }
         });
       });
 
@@ -8645,7 +8813,8 @@ export async function openSettingsModal(options = {}) {
 
     async function refreshMcpTab() {
       await fetchMcpRegistry();
-      renderMcpMatrix();
+      _settingsToolCatalog = await fetchToolCatalog(true);
+      renderDefaultTools();
       renderAlwaysOn();
       renderExtServerList();
       renderPluginsList();
@@ -9157,55 +9326,62 @@ export async function openSettingsModal(options = {}) {
     });
 
     // ── Config save helpers ──
+    // PATCH /api/opencode/config (OpenCode 2's global opencode.json): the answer is the configuration as it is now.
     async function saveOcpConfig(patch) {
       try {
-        await fetch('/api/opencode/config', {
+        const resp = await fetch('/api/opencode/config', {
           method: 'PATCH', headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify(patch),
         });
-      } catch {}
+        const data = await resp.json().catch(() => ({}));
+        if (!resp.ok || data.ok === false) throw new Error(data.error || `HTTP ${resp.status}`);
+        applyOcpConfig(data.data);
+        return true;
+      } catch (err) {
+        showCCToast(kit.tx('settings.redesign.opencode.saveFailed', { message: err.message }));
+        loadOcpConfig();
+        return false;
+      }
     }
 
     // ── Compaction handlers ──
     const compactAutoEl = overlay.querySelector('#stg-ocp-compact-auto');
-    const compactPruneEl = overlay.querySelector('#stg-ocp-compact-prune');
     const compactReservedEl = overlay.querySelector('#stg-ocp-compact-reserved');
 
+    // An emptied field is OpenCode's own default again (buffer: null).
     function saveCompaction() {
-      saveOcpConfig({
-        compaction: {
-          auto: compactAutoEl?.checked ?? true,
-          prune: compactPruneEl?.checked ?? true,
-          reserved: Number(compactReservedEl?.value) || 10000,
-        },
-      });
+      const raw = String(compactReservedEl?.value ?? '').trim();
+      const buffer = raw === '' ? null : Math.round(Number(raw));
+      if (buffer !== null && !(Number.isFinite(buffer) && buffer >= 0 && buffer <= 1_000_000)) { loadOcpConfig(); return; }
+      saveOcpConfig({ compaction: { auto: compactAutoEl?.checked ?? true, buffer } });
     }
     compactAutoEl?.addEventListener('change', saveCompaction);
-    compactPruneEl?.addEventListener('change', saveCompaction);
     compactReservedEl?.addEventListener('change', saveCompaction);
 
-    // ── Snapshot toggle (persists to config.json; read by OpenCode at startup) ──
+    // ── Snapshot toggle (OpenCode's `snapshots`, read at once) ──
     const snapshotToggle = overlay.querySelector('#stg-ocp-snapshot-toggle');
-    if (snapshotToggle) {
-      // Reflect the persisted state on load (defaults on).
-      fetch('/api/opencode/snapshot')
-        .then(r => r.json())
-        .then(d => { if (d && d.ok) snapshotToggle.classList.toggle('on', d.snapshot !== false); })
-        .catch(() => {});
-      snapshotToggle.addEventListener('click', async () => {
-        const next = !snapshotToggle.classList.contains('on');
-        snapshotToggle.classList.toggle('on', next); // optimistic
-        try {
-          const r = await fetch('/api/opencode/snapshot', {
-            method: 'POST', headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ enabled: next }),
-          });
-          const d = await r.json();
-          if (!d || !d.ok) throw new Error(d?.error || 'failed');
-        } catch {
-          snapshotToggle.classList.toggle('on', !next); // revert on failure
-        }
-      });
+    snapshotToggle?.addEventListener('click', () => {
+      const next = !snapshotToggle.classList.contains('on');
+      snapshotToggle.classList.toggle('on', next); // optimistic; the answer (or a failed save's reload) sets it
+      saveOcpConfig({ snapshots: next });
+    });
+
+    // The configuration as GET / PATCH /api/opencode/config give it: the file SynaBun edits, compaction,
+    // snapshots and the tools' permissions.
+    function applyOcpConfig(view) {
+      if (!view || typeof view !== 'object') return;
+      _ocpConfig = view;
+      const comp = view.compaction || {};
+      if (compactAutoEl) compactAutoEl.checked = comp.auto !== false;
+      if (compactReservedEl && document.activeElement !== compactReservedEl) compactReservedEl.value = Number.isFinite(comp.buffer) ? String(comp.buffer) : '';
+      snapshotToggle?.classList.toggle('on', view.snapshots !== false);
+      if (ocpConfigPathEl && view.file) ocpConfigPathEl.textContent = view.file;
+      const jsonc = (Array.isArray(view.files) ? view.files : []).find((file) => file?.exists && /\.jsonc$/i.test(String(file.path || '')));
+      if (ocpConfigJsoncEl) {
+        ocpConfigJsoncEl.hidden = !jsonc;
+        ocpConfigJsoncEl.innerHTML = jsonc ? kit.th('settings.redesign.opencode.jsoncWins', { path: `<code class="stg-code">${esc(jsonc.path)}</code>` }) : '';
+      }
+      renderToolPermissionsFrom(view);
     }
 
     // Capability filter pills — use CSS vars, not inline color
@@ -9243,28 +9419,16 @@ export async function openSettingsModal(options = {}) {
     });
 
     // ── Open config file in Synabun's editor ──
+    // OpenCode 2's global opencode.json (made with its $schema when there is none yet).
     overlay.querySelector('#stg-ocp-open-config')?.addEventListener('click', async () => {
       try {
-        let filePath = '';
-
-        const revealResp = await fetch('/api/opencode/config/reveal', { method: 'POST' });
-        let revealData = null;
-        try { revealData = await revealResp.json(); } catch {}
-
-        if (revealResp.ok && revealData?.path) {
-          const basePath = String(revealData.path).replace(/\\/g, '/').replace(/\/+$/, '');
-          filePath = basePath.endsWith('/config.json') ? basePath : `${basePath}/config.json`;
-        } else {
-          const fileResp = await fetch('/api/opencode/config/file');
-          const fileData = await fileResp.json();
-          if (!fileResp.ok || !fileData?.path) {
-            showCCToast(fileData?.error || revealData?.error || kit.tx('settings.redesign.opencode.failedToOpenOpencodeConfig'));
-            return;
-          }
-          filePath = fileData.path;
+        const fileResp = await fetch('/api/opencode/config/file');
+        const fileData = await fileResp.json().catch(() => ({}));
+        if (!fileResp.ok || !fileData?.path) {
+          showCCToast(fileData?.error || kit.tx('settings.redesign.opencode.failedToOpenOpencodeConfig'));
+          return;
         }
-
-        emit('open-file-editor', { filePath });
+        emit('open-file-editor', { filePath: fileData.path });
       } catch (err) {
         console.error('[settings] Failed to open OpenCode config:', err);
         showCCToast(kit.tx('settings.redesign.opencode.failedToOpenOpencodeConfig'));
@@ -9292,38 +9456,46 @@ export async function openSettingsModal(options = {}) {
       } catch {}
     }
 
-    // ── Load config values into UI ──
+    // ── Load config values into UI (read from the files: OpenCode need not run) ──
     async function loadOcpConfig() {
-      try {
-        const resp = await fetch('/api/opencode/config');
-        const data = await resp.json();
-        _ocpConfig = data.data || {};
-        const comp = _ocpConfig.compaction || {};
-        if (compactAutoEl) compactAutoEl.checked = comp.auto !== false;
-        if (compactPruneEl) compactPruneEl.checked = comp.prune !== false;
-        if (compactReservedEl) compactReservedEl.value = comp.reserved || 10000;
-      } catch {}
+      await renderToolPermissions();
+    }
+
+    // The OpenCode SynaBun found: its version, or why SynaBun does not drive it and how to get OpenCode 2.
+    function renderOcpInstall(installed) {
+      const note = describeOpencodeInstall(installed, { th: kit.th, tx: kit.tx });
+      if (ocpInstallEl) {
+        ocpInstallEl.hidden = !note.html;
+        ocpInstallEl.dataset.tone = note.tone;
+        ocpInstallEl.innerHTML = note.html;
+      }
+      return note;
     }
 
     // ── Master refresh ──
     async function refreshOcpStatus() {
       setOcpStatus(kit.tx('settings.redesign.opencode.checking'), 'dim');
+      loadOcpConfig();
       try {
         const resp = await fetch('/api/opencode/status');
         const data = await resp.json();
+        const note = renderOcpInstall(data.installed);
         if (data.clearingHistory) {
           setOcpStatus(kit.tx('settings.redesign.opencode.clearingHistory'), 'warn');
         } else if (data.running) {
           setOcpStatus(kit.tx('settings.redesign.opencode.runningVersion', { version: data.version ? ' v' + data.version : '' }), 'ok');
-          await Promise.all([
-            refreshOcpProviders(),
-            loadOcpConfig(),
-            renderToolPermissions(),
-          ]);
+          await refreshOcpProviders();
         } else {
-          setOcpStatus(kit.tx('settings.redesign.opencode.offline'), 'dim');
+          if (note.status === 'notSupported') setOcpStatus(kit.tx('settings.redesign.opencode.notSupportedStatus'), 'err');
+          else if (note.status === 'notInstalled') setOcpStatus(kit.tx('settings.redesign.opencode.notInstalledStatus'), 'dim');
+          else setOcpStatus(kit.tx('settings.redesign.opencode.offline'), 'dim');
           if (ocpProvidersEl) ocpProvidersEl.innerHTML = '<div class="settings-hint" style="opacity:0.4">' + kit.te('settings.redesign.opencode.startTheServerToSeeProviders') + '</div>';
-          if (ocpToolsEl) ocpToolsEl.innerHTML = '<div class="settings-hint" style="opacity:0.4">' + kit.te('settings.redesign.opencode.startTheServerToLoadTools') + '</div>';
+          // Something else stands in the way (another serve on the port, a serve that did not answer): the server's sentence.
+          if (!note.html && data.problem && ocpInstallEl) {
+            ocpInstallEl.hidden = false;
+            ocpInstallEl.dataset.tone = 'warn';
+            ocpInstallEl.textContent = data.problem;
+          }
         }
       } catch (err) {
         setOcpStatus(kit.tx('settings.redesign.opencode.error'), 'err');
@@ -9382,7 +9554,7 @@ export async function openSettingsModal(options = {}) {
   // ── Search: the index is built from the strings of the active locale; what the panes load is read at query time ──
   // In another locale the English names are searched too (someone who learned the settings in English still finds
   // them): from the bundle i18n already holds as its fallback, or, when it has none, loaded once as the field is first used.
-  const searchIndex = (en) => buildSettingsSearchIndex({ t: kit.tx, en, variants: variantTabs.map(tab => ({ id: tab.id, label: tab.label })) });
+  const searchIndex = (en) => memoSearchIndex(en, variantTabs, () => buildSettingsSearchIndex({ t: kit.tx, en, variants: variantTabs.map(tab => ({ id: tab.id, label: tab.label })) }));
   const english = getLocale() === 'en' ? null : englishTranslator();
   wireSettingsSearch(overlay, {
     index: searchIndex(english),
@@ -9580,7 +9752,18 @@ export function initSettings() {
   const reopenPage = takeSettingsReopen();
   if (reopenPage) setTimeout(() => openSettingsModal({ tab: reopenPage, expand: ['stg-sec-language'] }), 0);
 
+  // Launch: what Settings is built from, and its search index (the English names too), read and made once the
+  // page has painted, so the first open and the first search wait for nothing.
+  registerLaunchPrefetch('settings-data', () => prefetchSettingsData(), { order: 60, owner: true });
+  registerLaunchPrefetch('settings-search-index', () => prebuildSettingsSearchIndex(), { order: 62 });
+  // Changes other windows announce: the next open shows them.
+  on('sync:skin:changed', () => refreshSettingsData(['skins']));
+  on('sync:greeting:changed', () => refreshSettingsData(['greeting']));
+  on('sync:assistant:user-context-changed', () => refreshSettingsData(['userContext']));
+
   // Expose sync functions for inline onclick attributes (if any remain)
   window.checkSyncStatus = checkSyncStatus;
   window.copySyncPrompt = copySyncPrompt;
 }
+
+configureToolPickerTranslation((key, params) => kit.tx(key, params));