synabun 2.0.0-beta → 2.0.5

package/neural-interface/server.js

@@ -10,7 +10,7 @@ import { findSessionTranscript, sessionProjects, confineArtifact, confineSubPath
 import { readConfinedFile, writeConfinedFile, makeConfinedDir, removeConfinedEntry, listConfined, openConfinedStream } from './lib/confined-fs.js';
 import { createClaudeAccounts as createPanelClaudeAccounts } from './lib/claude-accounts.js';
 import { claudeLegacyPricing, claudeUsageCostUsd } from './lib/assistant-pricing.js';
-import { HOOK_SCRIPTS, hookDefinitionsForEvent, hookCommandString, isSynaBunHookCommand, sweepSettingsHooks, ensureHookRoot } from '../lib/claude-hooks.js';
+import { HOOK_SCRIPTS, hookDefinitionsForEvent, hookCommandString, hookInstallBlocker, hookInstallPlan, isSynaBunHookCommand, sweepSettingsHooks, ensureHookRoot } from '../lib/claude-hooks.js';
 import { browserV2Enabled, browserRequestMiddleware, assertBrowserRequestActive, browserActionTimeout, markBrowserActionStarted, runBrowserRequest, cancellableBrowserDelay, measureBrowserPhase, createEngagementScheduler, engagementTargetSelector, isEngagementWriteSelector, isXShortcutPublish, isXScriptedWrite } from './lib/browser-execution.js';
 import { describeLocatorMatches, healLocatorByText, validNthMatch, captureTargetIdentity, matchesTargetIdentity } from './lib/browser-targets.js';
 import { getInteractiveHints, collectSemanticContext, buildAssist, describeTargetFacts, verifyHealTarget, createAssistContextStore } from './lib/browser-semantic-context.js';
@@ -22,14 +22,19 @@ import { createMemoryMapService, createMemoryMapApi } from './lib/memory-map-api
 import { createAiSnapshotStore, settleBrowserPage } from './lib/browser-snapshots.js';
 import { runBrowserExtraction, readBrowserContentHtml } from './lib/browser-extraction.js';
 import { attachConsoleBuffer, readConsoleBuffer, parseConsoleSince } from './lib/browser-console.js';
+import { resolveBrowserLanguage, validateBrowserLanguageConfig } from './lib/browser-language.js';
 import { parseScreenshotOptions, captureScreenshot, screenshotPathRefusal, defaultScreenshotPath, writeScreenshotFile } from './lib/browser-screenshot.js';
+import { openBackgroundPage, selectedTabReading } from './lib/browser-background-tab.js';
 import { memoryRevision } from '../mcp-server/dist/services/memory-maintenance.js';
 import { startGatedMemoryMaintenance } from './lib/memory-timers.js';
 import { createEventLoopMonitor } from './lib/event-loop-monitor.js';
 import { createRulesetInstaller } from './lib/rulesets/installer.js';
 import { registerRulesetRoutes, registerLegacyRulesetRoutes } from './lib/rulesets/api.js';
 import { createPtyHostManager } from './lib/pty-host/manager.js';
-import { isAllowedHost, isAllowedWebSocketOrigin, refuseUpgrade } from './lib/http-guards.js';
+import { hostNameOf, isAllowedHost, isAllowedWebSocketOrigin, parseCookies, refuseUpgrade } from './lib/http-guards.js';
+import { createRequestGates, extraHostNames, hostsOf, savedValueOf, startedValueOf } from './lib/request-gate.js';
+import { createGitDiffRouter } from './lib/git-diff-api.js';
+import { gitRead, gitReadSync } from './lib/git-read.js';
 import { createPhoneAuthority } from './lib/remote-policy.js';
 import { buildTerminalEnv, interactiveShellArgs, cliWrapperArgs } from './lib/terminal-env.js';
 import { startJudgeBackfill, stopJudgeBackfill } from '../mcp-server/dist/services/memory-judge-backfill.js';
@@ -155,10 +160,7 @@ import {
   resolveAutomationOverrides,
   validAutomationContextMode,
 } from './public/shared/automation-context.js';
-import {
-  claudeRuntime,
-  ensureVendoredExecutables,
-} from './lib/native-binary-runtime.js';
+import { ensureVendoredExecutables } from './lib/native-binary-runtime.js';
 import {
   buildExecInvocation,
   execWrapperExtension,
@@ -174,6 +176,7 @@ import * as moreLogin from './lib/morelogin.js';
 import { createStyleGuideStore } from './lib/style-guide/store.js';
 import { registerStyleGuideRoutes } from './lib/style-guide/api.js';
 import { initBlobStore, blobGetNamespace, blobGet, blobPut, blobDelete, blobClearNamespace, blobPrune, closeBlobStore } from './lib/ui-blob-store.js';
+import { createUiBlobRouter } from './lib/ui-blob-api.js';
 import { memoCache, asyncPool } from './lib/memo-cache.js';
 import {
   buildClaudeMcpEntry,
@@ -225,10 +228,12 @@ import { generateSessionTitle } from './lib/session-title-generator.js';
 import {
   CLAUDE_EFFORT_LEVELS,
   CLAUDE_FALLBACK_MODELS,
-  alignedClaudeExecutable,
   checkClaudeCliSkew,
   discoverClaudeModels,
+  onClaudeModelsChanged,
+  shellCommand,
 } from './lib/claude-model-catalog.js';
+import { resolveClaudeLauncher, resolveClaudeSdkExecutable } from './lib/claude-executable.js';
 import { getAugmentedPath } from './lib/augmented-path.js';
 import { semverNewer, synabunReleaseChannel } from './lib/synabun-version.js';
 import { selectSynabunUpdate, buildSynabunInstallPlan, refuseStaleUpdateClick } from './lib/synabun-update-plan.js';
@@ -256,8 +261,12 @@ import {
   convertPctInPlace as wbConvertPctInPlace,
 } from '../mcp-server/dist/services/whiteboard-geometry.js';
 import { ensureProjectCategories } from '../hooks/claude-code/shared.mjs';
-import { getDataHome, getDataHomeDiagnostics, pathIsInside } from '../lib/paths.js';
+import { getDataHome, getDataHomeDiagnostics, isGlobalInstall, pathIsInside } from '../lib/paths.js';
 import { launcherLogPath } from '../lib/first-launch-protection.js';
+import { registerStartLauncher, startLauncherState } from '../lib/start-launcher.js';
+import { durableEntry, mcpStdioCommand, packagedRuntime } from '../lib/packaged-runtime.js';
+import { pruneExternalTools } from '../lib/external-tools.js';
+import { renderOfflinePage } from './lib/offline-page.js';
 import {
   getDb, closeDb, getDbPath, getEmbedding, getEmbeddingBatch, getEmbeddingDims, warmupEmbeddings,
   encodeVector, decodeVector, cosineSimilarity,
@@ -295,11 +304,11 @@ const execFileAsync = promisify(execFile);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// Restore execute permissions on every vendored native binary (Claude Agent SDK,
-// Codex, node-pty). npm and cpSync drop the execute bit, and this repo commits
-// node_modules — historically with core.filemode=false, so binaries checked out
-// 0644 and failed to spawn. The Claude sidepanel surfaced that as the SDK's
-// misleading "does not match this system's libc" error.
+// Restore execute permissions on SynaBun's own native helpers (node-pty's
+// spawn-helper). npm and cpSync drop the execute bit, and a checkout with
+// core.filemode=false materializes them 0644, so terminals failed to spawn.
+// The agent tools are not here: Claude Code and Codex are the user's own
+// installations (lib/claude-executable.js, getCodexBin).
 //
 // This sweeps ALL platform directories, not just this host's: a vendored
 // checkout can carry several, and repairing only the current one left e.g.
@@ -317,7 +326,12 @@ try {
 // Load only the canonical data-home environment. Importing `dotenv/config`
 // above would first read PACKAGE_ROOT/.env from the server cwd, allowing a
 // stale checkout-local SQLITE_DB_PATH to override the external data home.
+// SYNABUN_ALLOWED_HOSTS is the one value that is not kept from the file: a name taken out of the file would stay
+// allowed until a restart. What the environment itself gives is noted first and put back after the load; the
+// file's own line is read when a request asks (publicWebOrigins).
+const startedAllowedHosts = startedValueOf(process.env);
 dotenvConfig({ path: resolve(getDataHome(), '.env') });
+startedAllowedHosts.restore();
 
 const app = express();
 const SERVER_BOOT_ID = randomUUID();
@@ -325,9 +339,32 @@ let _nativeLoopRuntime = null;
 // Main assistant (bottom CLI region): brains + orchestration. Wired after the
 // native loop runtime exists; see the "Main assistant" block below.
 let _assistantRuntime = null;
+// The greeting engine (lib/greeting/): one greeting for every agent. null until it is built (or when it did not start).
+let _greeting = null;
+let _greetingRouter = null;
+let _greetingError = null;
 let _assistantDispatcher = null;
 // The Assistant's model catalog (lib/assistant-catalog.js): Settings → WhatsApp checks its brain choice against it.
 let _assistantCatalog = null;
+// Who may ask, in front of every route (lib/request-gate.js). A request for the owner's data must name this
+// server: everything under /api and /mcp, the invite sign-in, the rendered offline page and the uploaded icons
+// answer 403 BAD_HOST to any other Host (a page whose name was re-pointed at this machine sends its own); the
+// app's static files stay open, the images uploaded for categories excepted. A request from outside (Cloudflare's
+// tunnel, or anything that arrives under the tunnel's or the invite proxy's name) needs an invite session, and
+// with one it is a guest: `remote`, below. An invite guest is refused on the admin-only routes and on the
+// features the owner has not opened, however the path is spelled: those two checks are mounted after it.
+// Everything the gates read is read when a request arrives, never while this file is still being evaluated.
+const requestGates = createRequestGates({
+  isGuestRequest,
+  permissions: () => invitePermissions,
+  allowedHosts: publicWebOrigins,
+  publicHosts: remoteWebOrigins,
+  hasInviteSession: isValidInviteSession,
+  uploadedImages: isCategoryUpload,
+  mcpKey: () => activeMcpKey,
+  settingsHint: () => ENV_PATH,
+});
+app.use(requestGates.host);
 app.use(express.json({ limit: '25mb' }));
 
 // Clean body-parser error handler: ui-state / whiteboard persist base64 images and can
@@ -343,20 +380,8 @@ app.use((err, req, res, next) => {
   next(err);
 });
 
-// Block tunnel traffic from accessing anything except /mcp and /invite
-// Cloudflared adds CF-Connecting-IP header on proxied requests
-const TUNNEL_ALLOWED = ['/mcp', '/invite'];
-
-// Simple cookie parser (no dependency)
-function parseCookies(cookieHeader) {
-  const cookies = {};
-  if (!cookieHeader) return cookies;
-  cookieHeader.split(';').forEach(part => {
-    const [k, ...v] = part.trim().split('=');
-    if (k) cookies[k.trim()] = decodeURIComponent(v.join('=').trim());
-  });
-  return cookies;
-}
+// Cookies are read with parseCookies (lib/http-guards.js): one that cannot be decoded is kept as it was written,
+// so a cookie another app left on this host name never fails a request.
 
 // Check if request has a valid invite session cookie
 function isValidInviteSession(req) {
@@ -375,16 +400,11 @@ function isValidInviteSession(req) {
   return true;
 }
 
-app.use((req, res, next) => {
-  if (req.headers['cf-connecting-ip']) {
-    // Allow explicitly permitted paths
-    if (TUNNEL_ALLOWED.some(p => req.path.startsWith(p))) return next();
-    // Allow cookie-authenticated invite sessions (full UI access)
-    if (isValidInviteSession(req)) return next();
-    return res.status(403).json({ error: 'Forbidden' });
-  }
-  next();
-});
+// What comes in from outside reaches /mcp and /invite, and with an invite session whatever a guest may reach:
+// 403 Forbidden for the rest (lib/request-gate.js `remote`). From outside is what cloudflared marks with
+// CF-Connecting-IP, and whatever arrives under the tunnel's or the invite proxy's name, with that header or
+// without it: a proxy that does not set it is no way around the invite.
+app.use(requestGates.remote);
 
 // Guest detection — works for both Cloudflare tunnel and custom proxy
 function isGuestRequest(req) {
@@ -393,67 +413,28 @@ function isGuestRequest(req) {
   return !!token && inviteSessions.has(token);
 }
 
-// Admin-only protection — block guests from sensitive endpoints
-const ADMIN_ONLY_PREFIXES = [
-  '/api/settings', '/api/display-settings',
-  '/api/connections', '/api/setup', '/api/system',
-  '/api/invite/key', '/api/invite/sessions', '/api/invite/proxy', '/api/invite/permissions',
-  '/api/claude-code', '/api/mcp-key', '/api/mcp/runtime-profile',
-  '/api/tunnel/start', '/api/tunnel/stop',
-  '/api/bridges', '/api/keybinds',
-  '/api/cli',
-  '/api/file-content',
-  '/api/codex/plans',
-  '/api/sidepanel',
-  '/api/sidepanel-runs',
-  '/api/loop',
-  '/api/schedules',
-  '/api/schedule-groups',
-  '/api/quick-timer',
-  '/api/diagnostics',
-  '/api/desktop',
-  // WhatsApp Link: linking, the owner and the permission level (its router
-  // refuses guests and remote callers on its own too: lib/http-guards.js).
-  '/api/whatsapp',
-  // TypeSafe key/config/backfill, and the hook routes: /hook-recall returns
-  // memory content and /hook-judge spends the host's judgment budget.
-  '/api/typesafe',
-  '/api/hook-',
-  '/api/map/rebuild',
-];
-
-app.use((req, res, next) => {
-  if (isGuestRequest(req) && ADMIN_ONLY_PREFIXES.some(p => req.path.startsWith(p))) {
-    return res.status(403).json({ error: 'Admin only' });
-  }
-  next();
-});
-
-// Feature permission enforcement — block guest mutations for disabled features
-const FEATURE_PERMISSION_MAP = [
-  { prefix: '/api/terminal',      perm: 'terminal' },
-  { prefix: '/api/whiteboard',    perm: 'whiteboard' },
-  { prefix: '/api/memory',        perm: 'memories' },
-  { prefix: '/api/categories',    perm: 'memories' },
-  { prefix: '/api/trash',         perm: 'memories' },
-  { prefix: '/api/skills-studio', perm: 'skills' },
-  { prefix: '/api/browser',       perm: 'browser' },
-  { prefix: '/api/cards',         perm: 'cards' },
-  { prefix: '/api/style-guide',   perm: 'styleGuide' },
-];
-
-app.use((req, res, next) => {
-  if (req.method !== 'GET' && isGuestRequest(req)) {
-    const match = FEATURE_PERMISSION_MAP.find(m => req.path.startsWith(m.prefix));
-    if (match && !invitePermissions[match.perm]) {
-      return res.status(403).json({ error: 'Feature not enabled' });
-    }
-  }
-  next();
-});
+// Admin-only protection (guests never reach the sensitive endpoints) and feature permissions (a guest changes
+// nothing of a feature that is not opened to guests). The two lists, ADMIN_ONLY_PREFIXES and
+// FEATURE_PERMISSION_MAP, and the checks are lib/request-gate.js: they decide on the path as the router will
+// match it (letter case, percent-escapes, a doubled slash, `;` parameters), not on the path as it was written.
+app.use(requestGates.adminOnly);
+app.use(requestGates.features);
 
 import { registerCodexPlanRoutes } from './lib/codex-plan-store.js';
 import { createOpencodeHiddenModelsRouter, createOpencodeHiddenModelsStore } from './lib/opencode-hidden-models.js';
+import { createEditorFilesRouter, EDITOR_BACKUP_CAPABILITIES, EDITOR_BACKUP_NAMESPACE } from './lib/editor-files-api.js';
+import { createEditorGitRouter, EDITOR_GIT_CAPABILITIES } from './lib/editor-git-api.js';
+import { confinedFolder, createFileExplorerRouter, EXPLORER_CAPABILITIES } from './lib/file-explorer-api.js';
+import { folderPickerCommand } from './lib/file-explorer-system.js';
+import { createEditorConfigRouter, createEditorConfigStore, createEndpointKeyStore, EDITOR_CONFIG_CAPABILITIES } from './lib/editor-config.js';
+import {
+  COMPLETION_SYSTEM, EDITOR_COMPLETION_CAPABILITIES, createEditorCompletionRouter, createEditorCompletionService, createUsageStore,
+} from './lib/editor-completion.js';
+import { createOpencodeCompletionEngine } from './lib/editor-completion-opencode.js';
+import { createEndpointCompletionEngine } from './lib/editor-completion-endpoint.js';
+import { ownerRouteGuard } from './lib/http-guards.js';
+import { createCloudflaredManager } from './lib/cloudflared/manager.js';
+import { createQuickTunnel } from './lib/cloudflared/tunnel.js';
 
 const PORT = process.env.NEURAL_PORT || 3344;
 // SQLite database is used directly via lib/db.js
@@ -603,6 +584,16 @@ function saveCategories(categories) {
   }
 }
 
+// Is this root file ("/logo-<name>.<ext>", lower-case) the image a category recorded as its upload? Uploads are
+// written beside the app's own files (POST /api/categories/:name/logo) and are the owner's: the Host rule
+// (lib/request-gate.js) refuses them to a foreign Host by their name, and asks this for the one name the app
+// ships a file under, which stays open until a category's upload takes it.
+function isCategoryUpload(path) {
+  // (asked for a request under a foreign Host: it reads the store when there is one, and never creates it)
+  if (!existsSync(GLOBAL_CATEGORIES_PATH)) return false;
+  return loadCategories().some((category) => typeof category.logo === 'string' && category.logo.toLowerCase() === path);
+}
+
 // SQLite queries use direct WHERE clauses
 
 // --- .env Helpers ---
@@ -746,13 +737,34 @@ app.get('/', (req, res, next) => {
   res.redirect('/onboarding.html');
 });
 
-// Serve offline.html dynamically with the real project path injected
+// The Start Server button on the offline page hands the OS a synabun:// link.
+// Whether the handler for it is registered is read once (after the boot-time
+// repair below) and told to the pages, which remember it for when we are down.
+let _startLauncherState = null;
+function getStartLauncherState() {
+  if (_startLauncherState === null) {
+    try { _startLauncherState = startLauncherState({ packageRoot: PACKAGE_ROOT }); } catch { _startLauncherState = 'missing'; }
+  }
+  return _startLauncherState;
+}
+// Set when this server runs inside a packaged application (packaging/): the
+// code is then replaced by installing a newer build, never by npm or git.
+const PACKAGED_RUNTIME = packagedRuntime();
+const INSTALL_KIND = PACKAGED_RUNTIME ? 'app' : isGlobalInstall() ? 'npm' : 'git';
+// What a person types to start a packaged application: its entry executable,
+// when that is a path that will still be there once this run is over.
+const START_ENTRY = durableEntry(PACKAGED_RUNTIME) || '';
+
+// Serve offline.html with what it needs once we are down: the install path,
+// how it was installed, the launcher's state and the bridge code itself.
 app.get('/offline.html', (req, res) => {
   const html = readFileSync(join(__dirname, 'public', 'offline.html'), 'utf-8');
-  res.type('html').send(html.replace(
-    `const projectDir = localStorage.getItem('synabun-project-dir');`,
-    `const projectDir = localStorage.getItem('synabun-project-dir') || ${JSON.stringify(PACKAGE_ROOT)};`
-  ));
+  let bridgeSource = '';
+  try { bridgeSource = readFileSync(join(__dirname, 'public', 'shared', 'start-bridge.js'), 'utf-8'); } catch {}
+  res.type('html').send(renderOfflinePage(html, {
+    bridgeSource,
+    facts: { projectDir: PACKAGE_ROOT, install: INSTALL_KIND, launcher: getStartLauncherState(), entry: START_ENTRY },
+  }));
 });
 
 // The standalone Claude chat page was retired (the sidepanel replaced it): its
@@ -2124,6 +2136,12 @@ async function runGracefulShutdown(reason) {
   // not represented by the terminal or agent registries below.
   try { await _nativeLoopRuntime?.shutdown(reason); } catch (err) { console.warn('  native loop stop err:', err?.message); }
   try { stopAllIsolatedServes(); } catch (err) { console.warn('  isolated opencode stop err:', err?.message); }
+  // The code editor's completion serve, and today's autocomplete counters.
+  try { await editorCompletion.stop(); } catch (err) { console.warn('  editor completion stop err:', err?.message); }
+
+  // The public address: its cloudflared is ended with the server that owns the address (killed when it does not
+  // end by itself; never waited for more than a moment).
+  try { await tunnel.shutdown({ timeoutMs: 1500 }); } catch (err) { console.warn('  tunnel stop err:', err?.message); }
 
   // 1. opencode sidecar — has its own teardown that handles managed PID + ollama.
   try { stopOpencodeServer(); } catch (err) { console.warn('  opencode stop err:', err?.message); }
@@ -2209,10 +2227,20 @@ const RESTART_EXIT_CODE = 75;
 // onnxruntime at-exit abort. See the `process.on('exit')` handler below.
 let _preserveExitCode = false;
 const RESTART_MARKER = resolve(DATA_HOME, 'restart-requested');
+// When this server accepted a restart (0: it has not). From then on
+// /api/health says `restarting`, and a second request starts nothing more.
+let _restartRequestedAt = 0;
 app.post('/api/server/restart', async (req, res) => {
-  console.log('[server] Restart requested.');
   const supervised = process.env.SYNABUN_SUPERVISED === '1';
-  res.json({ ok: true, message: 'Server restarting...', supervised });
+  if (_restartRequestedAt) {
+    return res.json({ ok: true, message: 'Server restarting...', supervised, bootId: SERVER_BOOT_ID, at: _restartRequestedAt, already: true });
+  }
+  console.log('[server] Restart requested.');
+  _restartRequestedAt = Date.now();
+  res.json({ ok: true, message: 'Server restarting...', supervised, bootId: SERVER_BOOT_ID, at: _restartRequestedAt });
+  // Every open window is told before anything is torn down, so each one shows
+  // the restart at once instead of finding its sockets closed (ui-loading.js).
+  try { broadcastSync({ type: 'server:restarting', bootId: SERVER_BOOT_ID, supervised, at: _restartRequestedAt }); } catch {}
 
   // Drop a marker so the supervisor respawns even if our exit code is not 75.
   // Native module teardown (sqlite/playwright/node-pty) can crash with
@@ -2229,6 +2257,9 @@ app.post('/api/server/restart', async (req, res) => {
         const setupPath = resolve(PACKAGE_ROOT, 'setup.js');
         const respawnEnv = { ...process.env };
         delete respawnEnv.SYNABUN_SUPERVISED;
+        // That supervisor reports its start on the start beacon, like the one
+        // that respawns a supervised server: the pages are waiting on it.
+        respawnEnv.SYNABUN_RESTART_REPORT = '1';
         const child = spawn(process.execPath, [setupPath], {
           cwd: PACKAGE_ROOT,
           detached: true,
@@ -2428,6 +2459,15 @@ function cancelUpdateHandoff(handoffPath, reason) {
 app.post('/api/system/run-update', async (req, res) => {
   let preparedHandoffPath = null;
   try {
+    // Nothing is ever installed into the resources of a packaged application.
+    if (PACKAGED_RUNTIME) {
+      const openUrl = `${SYNABUN_GITHUB_REPO_URL}/releases`;
+      return res.status(409).json({
+        error: `This copy of SynaBun is a packaged application. It is updated by installing a newer build over it, not from inside the app. Nothing was installed. Releases: ${openUrl}`,
+        packaged: true,
+        openUrl,
+      });
+    }
     // Auto-restart is always on — running the click-to-update flow implies the
     // user wants the new version live without a manual relaunch step.
     const autoRestart = true;
@@ -3207,88 +3247,53 @@ function _heartbeatLock(sessionId, windowId) {
   }
 }
 
-// Cache resolved claude binary path (avoids running `where` every query)
+// Cache resolved claude binary path (avoids a PATH walk on every query)
 let _claudeBinPath = null;
-
+// A tool that was not found is looked for again after a moment: installing it
+// is what a user does next, and that must not take a restart of SynaBun.
+const MISSING_TOOL_RECHECK_MS = 15_000;
+let _claudeBinMissingAt = 0;
+
+// The Claude Code a terminal would start: the command from cli-config.json
+// (Settings > Terminal), else the first `claude` on the augmented PATH. Always
+// the user's own installation: never a file inside SynaBun, never a command
+// from a node_modules/.bin folder (lib/claude-executable.js).
 function getClaudeBin() {
-  if (_claudeBinPath) return _claudeBinPath;
-  // 0. User-configured path from cli-config.json (set via Settings > Terminal)
-  try {
-    const cfg = loadCliConfig();
-    const userCmd = cfg['claude-code']?.command?.trim();
-    if (userCmd && userCmd !== 'claude') {
-      // Absolute or relative path — verify it exists
-      if (existsSync(userCmd)) {
-        _claudeBinPath = userCmd;
-        return _claudeBinPath;
-      }
-      // Might be a bare command in PATH — try which/where
-      try {
-        const envWithPath = { ...process.env, PATH: getAugmentedPath() };
-        let lookup;
-        if (process.platform === 'win32') {
-          const lines = execSync(`where "${userCmd}"`, { encoding: 'utf-8', env: envWithPath })
-            .split(/\r?\n/).map(l => l.trim()).filter(Boolean);
-          lookup = lines.find(l => /\.(cmd|exe|bat|ps1)$/i.test(l)) || lines[0];
-        } else {
-          lookup = execSync(`which "${userCmd}"`, { encoding: 'utf-8', env: envWithPath }).trim();
-        }
-        if (lookup) { _claudeBinPath = lookup; return _claudeBinPath; }
-      } catch {}
-    }
-  } catch {}
-  // 1. Try bundled @anthropic-ai/claude-code in node_modules/.bin
-  const bundledBase = resolve(__dirname, 'node_modules', '.bin', 'claude');
-  // On Windows npm creates .cmd shims — check for those too
-  const bundledCandidates = process.platform === 'win32'
-    ? [bundledBase + '.cmd', bundledBase + '.ps1', bundledBase]
-    : [bundledBase];
-  for (const bundled of bundledCandidates) {
-    if (!existsSync(bundled)) continue;
-    const st = statSync(bundled);
-    // npm sometimes creates a plain text stub instead of a symlink — resolve through to cli.js
-    if (st.isFile() && st.size < 256) {
-      const target = readFileSync(bundled, 'utf-8').trim();
-      if (target && !target.startsWith('#')) {
-        const resolved = resolve(__dirname, 'node_modules', '.bin', target);
-        if (existsSync(resolved)) {
-          if (process.platform !== 'win32') {
-            try { const rs = statSync(resolved); if (!(rs.mode & 0o111)) chmodSync(resolved, rs.mode | 0o755); } catch {}
-          }
-          _claudeBinPath = resolved;
-          return _claudeBinPath;
-        }
-      }
-    }
-    // Normal symlink or executable — ensure +x
-    if (process.platform !== 'win32' && !(st.mode & 0o111)) {
-      try { chmodSync(bundled, st.mode | 0o755); } catch {}
-    }
-    _claudeBinPath = bundled;
-    return _claudeBinPath;
-  }
-  // 2. Fall back to global install via which/where (with augmented PATH)
-  const envWithPath = { ...process.env, PATH: getAugmentedPath() };
-  if (process.platform === 'win32') {
-    try {
-      const lines = execSync('where claude', { encoding: 'utf-8', env: envWithPath })
-        .split(/\r?\n/).map(l => l.trim()).filter(Boolean);
-      // Prefer .cmd/.exe/.bat/.ps1 over the bare extensionless shim (which is a sh script Windows can't spawn)
-      _claudeBinPath = lines.find(l => /\.(cmd|exe|bat|ps1)$/i.test(l)) || lines[0] || null;
-    } catch { _claudeBinPath = null; }
-  } else {
-    try { _claudeBinPath = execSync('which claude', { encoding: 'utf-8', env: envWithPath }).trim(); }
-    catch { _claudeBinPath = null; }
-  }
-  if (!_claudeBinPath) {
-    console.warn('[claude-skin] Claude CLI not found. Install: npm install -g @anthropic-ai/claude-code');
+  if (_claudeBinPath && _claudeBinPath !== 'claude') return _claudeBinPath;
+  if (_claudeBinPath && Date.now() - _claudeBinMissingAt < MISSING_TOOL_RECHECK_MS) return _claudeBinPath;
+  let configured = '';
+  try { configured = loadCliConfig()['claude-code']?.command?.trim() || ''; } catch {}
+  const found = resolveClaudeLauncher({ configured, isInsideSynabun });
+  for (const rejected of found.rejected) {
+    console.warn(`[claude-skin] Ignoring Claude CLI inside the SynaBun install: ${rejected}`);
+  }
+  if (!found.path) {
+    if (!_claudeBinMissingAt) console.warn('[claude-skin] Claude CLI not found. Install: npm install -g @anthropic-ai/claude-code');
+    _claudeBinMissingAt = Date.now();
     _claudeBinPath = 'claude'; // last resort — will fail at spawn time with a clear error
+    return _claudeBinPath;
   }
+  if (_claudeBinMissingAt) console.log(`[claude-skin] Claude CLI found: ${found.path}`);
+  _claudeBinMissingAt = 0;
+  _claudeBinPath = found.path;
   return _claudeBinPath;
 }
 
+// The executable every Agent SDK call is given (pathToClaudeCodeExecutable):
+// the override from cli-config.json ("claude-skin": { "sdkExecutable": "…" }),
+// else the installation above, followed through an npm command file on
+// Windows. `path: null` when no Claude Code is installed; SynaBun carries none.
+function getClaudeSdkExecutable() {
+  return resolveClaudeSdkExecutable({
+    launcher: getClaudeBin(),
+    sdkExecutable: _readClaudeSkinConfig().sdkExecutable || null,
+    isInsideSynabun,
+  });
+}
+
 let _codexBinPath = null;
 let _codexBinSource = 'missing';
+let _codexBinMissingAt = 0;
 let _nativeCodexBinPath = null;
 // The SDK is statically imported at module load; reaching this point is the
 // authoritative capability check. Its package.json is intentionally not an
@@ -3337,10 +3342,11 @@ function resolveWindowsGlobalCodexRuntime() {
 }
 
 function getCodexBin() {
-  if (_codexBinPath) return _codexBinPath;
-  // All Codex surfaces follow the user's trusted global install. Never fall
-  // back to the SDK's bundled platform binary: macOS may quarantine or block
-  // that copied payload, and unattended launches must not try to repair it.
+  // (Not found is looked for again after a moment, like Claude Code above.)
+  if (_codexBinPath && (_codexBinSource !== 'missing' || Date.now() - _codexBinMissingAt < MISSING_TOOL_RECHECK_MS)) return _codexBinPath;
+  // All Codex surfaces follow the user's trusted global install. SynaBun
+  // carries no Codex of its own (lib/external-tools.js): the SDK is always
+  // handed this path, and without one Codex is reported as not installed.
   const globalPath = getAugmentedPath().split(delimiter)
     .filter((entry) => !/[\\/]node_modules[\\/]\.bin[\\/]?$/i.test(entry))
     .join(delimiter);
@@ -3360,14 +3366,17 @@ function getCodexBin() {
     try { _codexBinPath = execSync('which codex', { encoding: 'utf-8', env: envWithPath }).trim(); }
     catch { _codexBinPath = null; }
   }
-  if (_codexBinPath && !isInsideSynabun(_codexBinPath)) {
+  if (_codexBinPath && _codexBinPath !== 'codex' && !isInsideSynabun(_codexBinPath)) {
+    if (_codexBinMissingAt) console.log(`[codex-skin] Codex CLI found: ${_codexBinPath}`);
+    _codexBinMissingAt = 0;
     _codexBinSource = 'global';
     return _codexBinPath;
   }
-  if (_codexBinPath) {
-    console.warn(`[codex-skin] Ignoring Codex CLI inside the SynaBun install: ${_codexBinPath}`);
+  if (!_codexBinMissingAt) {
+    if (_codexBinPath && _codexBinPath !== 'codex') console.warn(`[codex-skin] Ignoring Codex CLI inside the SynaBun install: ${_codexBinPath}`);
+    console.warn('[codex-skin] Codex CLI not found. Install: npm install -g @openai/codex');
   }
-  console.warn('[codex-skin] Codex CLI not found. Install: npm install -g @openai/codex');
+  _codexBinMissingAt = Date.now();
   _codexBinPath = 'codex';
   _codexBinSource = 'missing';
   return _codexBinPath;
@@ -3825,7 +3834,6 @@ CRITICAL — When you need clarification during planning:
   const appBoundary = createCodexAppBoundary();
   let supportsUserVerification = false;
   let codexJournalStorageDegraded = false;
-  const pendingGreetingThreads = new Set();
   const _cachedConfig = {}; // effective config from config/read + config/batchWrite
   let codexCapabilities = new CodexCapabilityRegistry();
   let activeTurnAutoAccept = false;
@@ -4231,7 +4239,6 @@ CRITICAL — When you need clarification during planning:
     for (const threadId of targets) {
       subscribedThreadIds.delete(threadId);
       threadOwnerRoots.delete(threadId);
-      pendingGreetingThreads.delete(threadId);
     }
   }
 
@@ -5044,7 +5051,7 @@ CRITICAL — When you need clarification during planning:
     };
     delete env.FORCE_COLOR;
     delete env.CLICOLOR_FORCE;
-    const proc = spawn(codexBin, args, {
+    const proc = spawn(shellCommand(codexBin, useShell, { isFile: existsSync }), args, {
       cwd: PACKAGE_ROOT,
       env,
       stdio: ['pipe', 'pipe', 'pipe'],
@@ -5207,7 +5214,6 @@ CRITICAL — When you need clarification during planning:
             lastTurnLocalImages = [];
           } else if (method === 'thread/closed' && params.threadId) {
             const closedThreadId = String(params.threadId);
-            pendingGreetingThreads.delete(closedThreadId);
             subscribedThreadIds.delete(closedThreadId);
             threadOwnerRoots.delete(closedThreadId);
             if (closedThreadId === String(activeThreadId || '')) {
@@ -5363,7 +5369,6 @@ CRITICAL — When you need clarification during planning:
     const old = child;
     const codexHome = activeCodexHome;
     const ownedThreadIds = ownedWriterThreadIds();
-    const greetingPending = pendingGreetingThreads.has(targetThreadId);
     initialized = false;
     bootPromise = null;
     activeThreadId = null;
@@ -5374,7 +5379,6 @@ CRITICAL — When you need clarification during planning:
     subscribedThreadIds.clear();
     threadOwnerRoots.clear();
     activeTurnAutoAccept = false;
-    pendingGreetingThreads.clear();
     for (const [, entry] of pending) {
       try { clearTimeout(entry.timer); entry.reject(new Error(reason)); } catch {}
     }
@@ -5397,12 +5401,9 @@ CRITICAL — When you need clarification during planning:
       });
       await activatePrimaryThread(resumed.thread?.id || targetThreadId);
       rememberActiveThreadRuntime(runtime);
-      if (greetingPending) pendingGreetingThreads.add(activeThreadId || targetThreadId);
       return resumed;
     } catch (err) {
       // A first-turn restart can fail after the old process has already exited.
-      // Keep the one-time SynaBun greeting eligible for the next activation.
-      if (greetingPending) pendingGreetingThreads.add(targetThreadId);
       throw err;
     }
   }
@@ -5427,7 +5428,6 @@ CRITICAL — When you need clarification during planning:
     subscribedThreadIds.clear();
     threadOwnerRoots.clear();
     activeTurnAutoAccept = false;
-    pendingGreetingThreads.clear();
     for (const [, entry] of pending) {
       try { clearTimeout(entry.timer); entry.reject(new Error('Codex account switched')); } catch {}
     }
@@ -5476,7 +5476,6 @@ CRITICAL — When you need clarification during planning:
     subscribedThreadIds.clear();
     threadOwnerRoots.clear();
     activeTurnAutoAccept = false;
-    pendingGreetingThreads.clear();
     for (const [, entry] of pending) {
       try { clearTimeout(entry.timer); entry.reject(new Error('Codex MCP profile switched')); } catch {}
     }
@@ -5580,7 +5579,6 @@ CRITICAL — When you need clarification during planning:
     const started = await request('thread/start', getDefaultThreadParams(cwd, runtime));
     await activatePrimaryThread(started.thread?.id || null);
     rememberActiveThreadRuntime(runtime);
-    if (activeThreadId) pendingGreetingThreads.add(activeThreadId);
     activeTurnId = null;
     const thread = sanitizeCodexThreadSummary(started.thread || null);
     if (opts.emitThreadEvent !== false) {
@@ -5852,7 +5850,6 @@ CRITICAL — When you need clarification during planning:
     const runtime = await resolveCodexThreadRuntimeOptions(opts);
     const desiredRuntimeFingerprint = codexThreadRuntimeFingerprint(runtime);
     let threadId = opts.fresh ? null : (opts.threadId || activeThreadId);
-    let startedFreshThread = false;
     if (threadId && threadId !== activeThreadId) {
       const resumed = await requestCodexThreadResume(threadId, cwd, runtime);
       await activatePrimaryThread(resumed.thread?.id || threadId);
@@ -5868,7 +5865,6 @@ CRITICAL — When you need clarification during planning:
         runtimeOptions: runtime,
       });
       threadId = startedThread?.id || null;
-      startedFreshThread = true;
     }
     activeTurnAutoAccept = !!opts.autoAccept;
     const originalPrompt = prompt;
@@ -5878,11 +5874,14 @@ CRITICAL — When you need clarification during planning:
     );
     const isPlanModeTurn = !!opts.planMode || isCodexPlanModePrompt(originalPrompt);
     const isSlashCommand = /^\/\w/.test(String(originalPrompt || '').trim());
-    const shouldInjectGreeting = !!threadId && !isSlashCommand && (startedFreshThread || pendingGreetingThreads.has(threadId));
-    const turnPrompt = shouldInjectGreeting
-      ? buildCodexGreetingUserPrompt({ cwd, userPrompt: prompt }) || prompt
+    // The greeting SynaBun showed when this tab opened (lib/greeting/): the panel echoes its id
+    // with the first prompt and the model is told once what was said, between the markers the
+    // transcript strips. Nothing for a slash command (its own flow comes first), nothing when no
+    // greeting was shown, and the model is never asked to greet.
+    const greetingNote = opts.greetingId && _greeting ? _greeting.consumeNote(String(opts.greetingId), { skip: isSlashCommand }) : '';
+    const turnPrompt = greetingNote
+      ? `${CODEX_GREETING_MARKER_START}\n${greetingNote}\n${CODEX_GREETING_MARKER_END}\n\n${prompt}`
       : prompt;
-    if (threadId) pendingGreetingThreads.delete(threadId);
     const input = buildCodexInputItems(turnPrompt, {
       mentions: Array.isArray(opts.mentions) ? opts.mentions : [],
       localImages: Array.isArray(opts.localImages) ? opts.localImages : [],
@@ -6081,8 +6080,6 @@ CRITICAL — When you need clarification during planning:
         for (const [threadId, ownerRoot] of orphan.threadOwnerRoots || []) threadOwnerRoots.set(threadId, ownerRoot);
         nextRequestId = orphan.nextRequestId;
         Object.assign(_cachedConfig, orphan.cachedConfig || {});
-        pendingGreetingThreads.clear();
-        for (const threadId of orphan.pendingGreetingThreads || []) pendingGreetingThreads.add(threadId);
         writerLifecycleState = orphan.writerLifecycleState || writerLifecycleState;
         writerLifecycleState.releaseRequested = false;
         shuttingDown = false;
@@ -6376,9 +6373,15 @@ CRITICAL — When you need clarification during planning:
             prompt = injected.prompt;
           }
         }
+        // A person typed this in the Codex panel (the Assistant's brain, a loop and a run never
+        // say so): the greeting engine keeps when they were last here.
+        if (msg.human === true && _greeting) {
+          try { _greeting.noteActivity({ cwd: msg.cwd || PACKAGE_ROOT, surface: 'codex-panel', words: sanitizeCodexUserFacingText(typeof msg.prompt === 'string' ? msg.prompt : '') }); } catch {}
+        }
         await withCodexWriterOperation('query', () => startTurn(prompt, {
           fresh: !!msg.fresh,
           threadId: msg.threadId || null,
+          greetingId: typeof msg.greetingId === 'string' ? msg.greetingId : null,
           cwd: msg.cwd || PACKAGE_ROOT,
           model: msg.model || null,
           contextMode: msg.contextMode || 'default',
@@ -7155,7 +7158,6 @@ CRITICAL — When you need clarification during planning:
           get subscribedThreadIds() { return new Set(subscribedThreadIds); },
           get threadOwnerRoots() { return new Map(threadOwnerRoots); },
           get nextRequestId() { return nextRequestId; },
-          get pendingGreetingThreads() { return new Set(pendingGreetingThreads); },
           cachedConfig: { ..._cachedConfig },
           get pending() { return new Map(pending); },
           get pendingServerRequests() { return new Map(pendingServerRequests); },
@@ -7226,7 +7228,8 @@ async function queryCodexAppServerModels(codexHome = CODEX_DEFAULT_HOME) {
   delete env.CLICOLOR_FORCE;
 
   return new Promise((resolve, reject) => {
-    const child = spawn(codexBin, args, {
+    // (A configured command may be a command line; a file with a space in its path is one word.)
+    const child = spawn(shellCommand(codexBin, useShell, { isFile: existsSync }), args, {
       cwd: PACKAGE_ROOT,
       env,
       stdio: ['pipe', 'pipe', 'pipe'],
@@ -7265,6 +7268,10 @@ async function queryCodexAppServerModels(codexHome = CODEX_DEFAULT_HOME) {
     child.stderr.setEncoding('utf-8');
     child.stderr.on('data', chunk => { stderrBuf += chunk; });
     child.on('error', fail);
+    // Codex not installed: the shell asked to run it is gone before the first
+    // request is written, and that write fails on the stream (EPIPE). Unhandled,
+    // it ends the whole server.
+    child.stdin.on('error', fail);
     child.on('exit', (code) => {
       if (pending.size) {
         const err = new Error(`Codex app-server exited while listing models (code ${code ?? 'unknown'})`);
@@ -7330,7 +7337,11 @@ app.get('/api/codex/models', async (req, res) => {
       await queryCodexAppServerModels(codexHome),
       readCodexRuntimeModelCatalog(codexHome),
     );
+    // The Assistant's catalog is built from the default account's list: when that list
+    // changes, its copy is dropped and rebuilt (which tells the open windows).
+    const listChanged = codexHome === CODEX_DEFAULT_HOME && !!cached && JSON.stringify(cached.models) !== JSON.stringify(models);
     _codexModelListCache.set(codexHome, { at: Date.now(), models });
+    if (listChanged) _assistantCatalog?.refresh?.().catch(() => {});
     res.json({ ok: true, source: 'codex-app-server', models });
   } catch (err) {
     res.json({ ok: false, source: 'fallback', error: err.message, models: [] });
@@ -8295,9 +8306,21 @@ function handleOpencodeV2Ws(ws) {
             const promptFn = useAsync
               ? turnClient.session.promptAsync
               : turnClient.session.prompt;
+            // Greeting (lib/greeting/): a prompt the person typed is noted, and the greeting the
+            // panel showed when this session opened is told to the model once, as a part OpenCode
+            // marks synthetic (the transcript does not draw it). Nothing for a slash command.
+            let turnParts = msg.parts;
+            if (_greeting && Array.isArray(msg.parts)) {
+              const typed = msg.parts.find((part) => part?.type === 'text' && typeof part.text === 'string' && !part.synthetic)?.text || '';
+              if (msg.human === true) { try { _greeting.noteActivity({ cwd: msg.cwd || PACKAGE_ROOT, surface: 'opencode-panel', words: typed }); } catch {} }
+              if (typeof msg.greetingId === 'string') {
+                const greetingNote = _greeting.consumeNote(msg.greetingId, { skip: /^\s*\//.test(typed) });
+                if (greetingNote) turnParts = [{ type: 'text', text: greetingNote, synthetic: true }, ...msg.parts];
+              }
+            }
             const r = await promptFn({
               sessionID: sid,
-              parts: msg.parts,
+              parts: turnParts,
               model: msg.model,
               agent,
               variant: msg.variant || undefined,
@@ -8861,6 +8884,7 @@ app.post('/api/sidepanel/session-title', async (req, res) => {
       input.cwd = cwd;
     }
     const result = await generateSessionTitle(input, {
+      claudeExecutable: getClaudeSdkExecutable,
       execFile: execFileAsync,
       getCodexBin,
       getCodexAccountHome,
@@ -9394,10 +9418,10 @@ app.post('/api/opencode/mcp', async (req, res) => {
     let { name, config: mcpConfig } = req.body || {};
     if (!name) {
       name = 'SynaBun';
-      const { mcpIndexPath, envPath } = getMcpPaths();
+      const { envPath, mcpCommand, mcpArgs } = getMcpPaths();
       mcpConfig = {
-        command: 'node',
-        args: [mcpIndexPath],
+        command: mcpCommand,
+        args: mcpArgs,
         env: { DOTENV_PATH: envPath, SYNABUN_DATA_HOME: DATA_HOME, MEMORY_DATA_DIR: resolve(DATA_HOME, 'mcp-data') },
       };
     }
@@ -9492,6 +9516,10 @@ const _claudeBridgeReady = (async () => {
   try {
     _claudeBridge = await import('./lib/claude-agent-bridge.js');
     _claudeBridge.configureClaudeBridge({
+      // The greeting a panel conversation opened with, as the one note its model gets (lib/greeting/).
+      greetingNote: (id, opts) => _greeting?.consumeNote(id, opts) || '',
+      // A prompt typed in the panel: when the person was last here (a temporary chat is named to nobody).
+      greetingActivity: ({ cwd, words, temporary }) => { if (!temporary) _greeting?.noteActivity({ cwd: cwd || PACKAGE_ROOT, surface: 'claude-panel', words }); },
       addCost,
       getSessionCost,
       acquireSessionLock: _acquireSessionLock,
@@ -9522,17 +9550,12 @@ const _claudeBridgeReady = (async () => {
         if (typeof cfg.partials === 'boolean') return cfg.partials;
         return process.platform !== 'win32';
       },
-      // Optional explicit executable override; bundled SDK CLI is the default.
-      // Accepts a .js entrypoint (launched via node) or a native binary path —
-      // see resolveClaudeExecutableOverride() in lib/native-binary-runtime.js.
-      get sdkExecutable() { return _readClaudeSkinConfig().sdkExecutable || null; },
-      // Last-resort runtime for the bridge: if the SDK's bundled native binary
-      // cannot be launched or repaired, fall back to the user's installed CLI.
-      // Lazy so the (memoized) resolution happens on demand, not at boot.
-      getClaudeBin: () => getClaudeBin(),
-      // The installed CLI when it is newer than the bundled one, else null — the
-      // model picker lists the installed CLI's models, so sessions must run it.
-      alignedClaudeBin: () => alignedClaudeExecutable(getClaudeBin()),
+      // The Claude Code every session runs: the user's own installation, or the
+      // explicit override from cli-config.json ("claude-skin": { "sdkExecutable":
+      // "…" }, a .js entrypoint or a native binary path). SynaBun carries none, so
+      // a session without one is refused with the install hint. Lazy, so the
+      // (memoized) resolution happens on demand, not at boot.
+      claudeExecutable: () => getClaudeSdkExecutable(),
       // Sidepanel tabs can run under another Claude account (its own config
       // directory). The default account adds nothing to the environment.
       claudeAccountEnv: (accountId) => _panelClaudeAccounts().envFor(accountId),
@@ -9617,10 +9640,10 @@ function handleClaudeSkinWebSocket(ws) {
 async function getClaudeModelsForClient(force = false) {
   try {
     const bin = getClaudeBin();
-    // Sidepanel sessions and native loops default to the SDK's bundled CLI, not
-    // this one. The comparison is cached per binary (a spawn only when the CLI
-    // changes); it warns about a skew and, when this CLI is the newer one, makes
-    // sessions run it instead — see alignedClaudeExecutable().
+    // Sidepanel sessions and native loops run this same installation. The Agent
+    // SDK that starts it was built against one Claude Code release; an older
+    // installation is worth one line in the log. Cached per binary (a spawn only
+    // when the CLI changes).
     checkClaudeCliSkew(bin).catch(() => {});
     const result = await discoverClaudeModels(bin, { force, cwd: PACKAGE_ROOT });
     if (result?.models?.length) return result;
@@ -10234,7 +10257,7 @@ const FAT_KEY_ROUTES = {
   'synabun-node-positions':                 { ns: 'kv', split: false },
   'synabun-node-positions-2d':              { ns: 'kv', split: false },
 };
-const BLOB_NS_ALLOWLIST = new Set(['claude-snapshots', 'codex-snapshots', 'ocp-snapshots', 'kv']);
+const BLOB_NS_ALLOWLIST = new Set(['claude-snapshots', 'codex-snapshots', 'ocp-snapshots', 'kv', EDITOR_BACKUP_NAMESPACE]);
 
 function routeFatKeyToBlobStore(key, value) {
   const fat = FAT_KEY_ROUTES[key];
@@ -10333,53 +10356,22 @@ app.post('/api/ui-state', (req, res) => {
   }
 });
 
-// ── UI blob store — per-entry storage for fat keys (transcript snapshots,
-// node positions). PUT writes only the changed entry instead of the whole map.
-function _blobNs(req, res) {
-  const ns = req.params.ns;
-  if (!BLOB_NS_ALLOWLIST.has(ns)) { res.status(400).json({ error: `unknown namespace: ${ns}` }); return null; }
-  return ns;
-}
-
-app.get('/api/ui-blobs/:ns', (req, res) => {
-  const ns = _blobNs(req, res);
-  if (!ns) return;
-  try { res.json(blobGetNamespace(ns)); }
-  catch (err) { res.status(500).json({ error: err.message }); }
-});
-
-app.get('/api/ui-blobs/:ns/:id', (req, res) => {
-  const ns = _blobNs(req, res);
-  if (!ns) return;
-  try {
-    const value = blobGet(ns, req.params.id);
-    if (value === null) return res.status(404).json({ error: 'not found' });
-    res.json(value);
-  } catch (err) { res.status(500).json({ error: err.message }); }
-});
+// The code editor's routes (the files, their committed versions, the preferences, AI autocomplete) and the
+// editor's namespace of the blob store below refuse everybody but the owner by themselves: an invite guest, a
+// Host that is not this server's (DNS rebinding), a write from another site's page. See lib/http-guards.js.
+// The checks in front of the routes (lib/request-gate.js) refuse the same callers; these routes do not rely on them.
+const editorOwnerGuard = ownerRouteGuard({ isGuestRequest, port: PORT, allowedOrigins: publicWebOrigins });
 
-function _blobPutHandler(req, res) {
-  const ns = _blobNs(req, res);
-  if (!ns) return;
-  try {
-    blobPut(ns, req.params.id, req.body);
-    const maxEntries = parseInt(req.query.maxEntries, 10) || 0;
-    const maxChars = parseInt(req.query.maxChars, 10) || 0;
-    let evicted = [];
-    if (maxEntries || maxChars) evicted = blobPrune(ns, { maxEntries, maxTotalChars: maxChars });
-    res.json({ ok: true, evicted });
-  } catch (err) { res.status(500).json({ error: err.message }); }
-}
-app.put('/api/ui-blobs/:ns/:id', _blobPutHandler);
-// POST alias — sendBeacon can only POST
-app.post('/api/ui-blobs/:ns/:id', _blobPutHandler);
-
-app.delete('/api/ui-blobs/:ns/:id', (req, res) => {
-  const ns = _blobNs(req, res);
-  if (!ns) return;
-  try { blobDelete(ns, req.params.id); res.json({ ok: true }); }
-  catch (err) { res.status(500).json({ error: err.message }); }
-});
+// ── UI blob store — per-entry storage for fat keys (transcript snapshots, node positions, the editor's copies
+// of unsaved buffers). lib/ui-blob-api.js: GET a namespace or an entry, PUT / POST / DELETE one entry. A write
+// sends only the changed entry; of two requests of one page for an entry, the newer one is what stays, in
+// whatever order they arrive; the editor's namespace asks the owner's guard on every route.
+app.use(createUiBlobRouter({
+  namespaces: BLOB_NS_ALLOWLIST,
+  store: { getNamespace: blobGetNamespace, get: blobGet, put: blobPut, delete: blobDelete, prune: blobPrune },
+  ownerNamespace: EDITOR_BACKUP_NAMESPACE,
+  ownerGuard: editorOwnerGuard,
+}));
 
 
 // ═══════════════════════════════════════════
@@ -15460,7 +15452,7 @@ function spawnAgentProcess(agent, prompt, extraEnv = {}) {
 
     console.log(`[agent] ${agent.id} spawn: ${claudeBin} ${args.map(a => a.length > 80 ? a.slice(0, 80) + '…' : a).join(' ')}`);
 
-    const child = spawn(claudeBin, args, {
+    const child = spawn(shellCommand(claudeBin, AGENT_IS_WIN), args, {
       cwd: agent.cwd,
       env: { ...cleanEnv, FORCE_COLOR: '0', NO_COLOR: '1', TERM: 'dumb', ...extraEnv },
       stdio: ['ignore', 'pipe', 'pipe'],
@@ -16094,37 +16086,22 @@ function isSynabunGitHubRemote(remoteText) {
 }
 
 function detectSynabunInstallSource() {
+  if (PACKAGED_RUNTIME) return { kind: 'packaged-app' };
   const normalizedRoot = PACKAGE_ROOT.replace(/\\/g, '/');
   if (/\/node_modules\/synabun$/i.test(normalizedRoot)) {
     return { kind: 'npm-global' };
   }
 
   try {
-    const inside = execSync('git rev-parse --is-inside-work-tree', {
-      cwd: PACKAGE_ROOT,
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'ignore'],
-      timeout: 2000,
-    }).trim();
-    if (inside === 'true') {
-      let remote = '';
-      let remotes = '';
-      try {
-        remote = execSync('git remote get-url origin', {
-          cwd: PACKAGE_ROOT,
-          encoding: 'utf8',
-          stdio: ['ignore', 'pipe', 'ignore'],
-          timeout: 2000,
-        }).trim();
-      } catch {}
-      try {
-        remotes = execSync('git remote -v', {
-          cwd: PACKAGE_ROOT,
-          encoding: 'utf8',
-          stdio: ['ignore', 'pipe', 'ignore'],
-          timeout: 2000,
-        }).trim();
-      } catch {}
+    // Run as reads (lib/git-read.js): the app's own checkout is a folder like any other, and can be a registered
+    // project. What git could not say is an empty answer.
+    const git = (args) => {
+      const result = spawnGitRead(args, { cwd: PACKAGE_ROOT, timeout: 2000 });
+      return result.status === 0 ? result.stdout.toString().trim() : '';
+    };
+    if (git(['rev-parse', '--is-inside-work-tree']) === 'true') {
+      const remote = git(['remote', 'get-url', 'origin']);
+      const remotes = git(['remote', '-v']);
       if (isSynabunGitHubRemote(`${remote}\n${remotes}`)) {
         const firstRemote = remote || remotes.split(/\s+/).find(part => isSynabunGitHubRemote(part)) || null;
         return { kind: 'github-clone', remote: firstRemote };
@@ -16345,6 +16322,10 @@ const SYNABUN_ROOTS = (() => {
   const roots = new Set();
   try { roots.add(realpathSync(__dirname).replace(/\\/g, '/').toLowerCase()); } catch {}
   try { roots.add(realpathSync(resolve(__dirname, '..')).replace(/\\/g, '/').toLowerCase()); } catch {}
+  // A packaged application: everything it ships, its own Node and npm included.
+  if (PACKAGED_RUNTIME?.resources) {
+    try { roots.add(realpathSync(PACKAGED_RUNTIME.resources).replace(/\\/g, '/').toLowerCase()); } catch {}
+  }
   return [...roots];
 })();
 
@@ -16366,35 +16347,23 @@ function isInsideSynabun(binPath) {
 // to come from. Add new versions here if SynaBun ever ships claude-code again.
 const KNOWN_STALE_CLAUDE_VERSIONS = new Set(['2.1.71', '2.1.89', '2.1.91']);
 
-// Aggressively delete any stale bundled CLI tool packages left over in our
-// own node_modules. Idempotent — runs on every startup. Belt-and-suspenders
-// against `npm install` not auto-pruning packages removed from package.json.
-// Logs every found package (deleted or not) so Windows users can confirm the
-// prune is actually firing on their box.
+// Remove any external tool that ended up in our own node_modules: Claude Code,
+// Codex, OpenCode and Gemini CLI are installed by the user, never by SynaBun,
+// and the agent SDKs are installed without the executables they would carry
+// (the list and the reasons: lib/external-tools.js at the package root).
+// Idempotent, runs on every startup, and touches nothing when there is nothing
+// to remove — a packaged application ships without them and is never written to.
+// Catches what `npm install` leaves behind: packages an older SynaBun depended
+// on, and payloads a regenerated lockfile brought back. Logs each removal so a
+// user can see the prune fire on their machine.
 function pruneBundledCliTools() {
-  // @openai/codex is a live transitive dependency of @openai/codex-sdk, so it
-  // must remain installed even though SynaBun never executes its bundled binary.
-  const stalePkgs = ['@anthropic-ai/claude-code', 'opencode-ai', '@google/gemini-cli'];
   const moduleRoots = [
     join(__dirname, 'node_modules'),
     join(__dirname, '..', 'node_modules'),
   ];
   for (const root of moduleRoots) {
-    for (const pkg of stalePkgs) {
-      const target = join(root, pkg);
-      try {
-        if (existsSync(target)) {
-          rmSync(target, { recursive: true, force: true });
-          console.log(`  Pruned stale bundled CLI: ${target}`);
-        }
-      } catch { /* permission or in-use — ignore */ }
-      // Also remove .bin shims that point at the deleted package
-      const binBase = pkg.split('/').pop().replace(/-cli$|-ai$/, '');
-      for (const ext of ['', '.cmd', '.ps1', '.exe']) {
-        const shim = join(root, '.bin', binBase + ext);
-        try { if (existsSync(shim)) rmSync(shim, { force: true }); } catch {}
-      }
-    }
+    const result = pruneExternalTools(root);
+    for (const item of result.removed) console.log(`  Removed ${item.name} from SynaBun's own node_modules (${item.tool} is installed separately): ${item.path}`);
   }
 }
 
@@ -16972,130 +16941,110 @@ app.get('/api/system/backups', (req, res) => {
 });
 
 // GET /api/projects — List registered projects for file explorer selector
+// `capabilities` tells the File Explorer, in the request it makes anyway, that this server has its routes
+// (/api/explorer, lib/file-explorer-api.js): a page loaded against an older server finds none and asks for none.
 app.get('/api/projects', (req, res) => {
   const projects = loadHookProjects();
-  res.json({ ok: true, projects: projects.map(p => ({ path: p.path, label: p.label || basename(p.path) })) });
+  res.json({ ok: true, projects: projects.map(p => ({ path: p.path, label: p.label || basename(p.path) })), capabilities: [...EXPLORER_CAPABILITIES] });
 });
 
 // ── Path validation helper (reused by project-files, file-content) ──
-function validateProjectPath(filePath) {
-  const normalized = resolve(filePath);
+// The roots a file path may be under: folders, and single files allowed by their exact path.
+function allowedFileRoots() {
   const registeredProjects = loadHookProjects();
   const claudePlansDir = resolve(join(process.env.USERPROFILE || process.env.HOME || '', '.claude', 'plans'));
   const localPlansDir = resolve(join(DATA_HOME, 'data', 'plans'));
   const opencodeConfigPath = resolve(getOpencodeConfigPath());
-  const allowedRoots = [resolve(DATA_HOME), ...registeredProjects.map(p => resolve(p.path)), localPlansDir, claudePlansDir, opencodeConfigPath];
-  const matched = allowedRoots.find(r => normalized === r || normalized.startsWith(r + sep));
-  return matched ? normalized : null;
+  return {
+    dirs: [resolve(DATA_HOME), ...registeredProjects.map(p => resolve(p.path)), localPlansDir, claudePlansDir],
+    files: [opencodeConfigPath],
+  };
 }
 
-// GET /api/file-content — Read a single file for inline editing
-app.get('/api/file-content', (req, res) => {
-  try {
-    const filePath = req.query.path;
-    if (!filePath) return res.status(400).json({ error: 'Missing path parameter' });
-
-    const normalized = validateProjectPath(filePath);
-    if (!normalized) return res.status(403).json({ error: 'Path outside registered project roots' });
-
-    if (!existsSync(normalized) || !statSync(normalized).isFile()) {
-      return res.status(400).json({ error: 'Not a valid file' });
-    }
-
-    const stat = statSync(normalized);
-    if (stat.size > 1024 * 1024) {
-      return res.status(413).json({ error: 'File too large' });
-    }
-
-    // Binary detection: read first 8KB and scan for null bytes
-    const fd = openSync(normalized, 'r');
-    const buf = Buffer.alloc(Math.min(8192, stat.size));
-    const bytesRead = readSync(fd, buf, 0, buf.length, 0);
-    closeSync(fd);
-    for (let i = 0; i < bytesRead; i++) {
-      if (buf[i] === 0x00) {
-        return res.status(415).json({ error: 'Binary file' });
-      }
-    }
-
-    const content = readFileSync(normalized, 'utf-8');
-    const name = basename(normalized);
-    res.json({ ok: true, content, path: normalized.replace(/\\/g, '/'), name, size: stat.size });
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
-
-// POST /api/file-content — Write a file (existing, or create if `create: true`)
-app.post('/api/file-content', (req, res) => {
-  try {
-    const { path: filePath, content, create } = req.body || {};
-    if (!filePath || typeof content !== 'string') {
-      return res.status(400).json({ error: 'Missing path or content' });
-    }
-
-    const normalized = validateProjectPath(filePath);
-    if (!normalized) return res.status(403).json({ error: 'Path outside registered project roots' });
-
-    if (create) {
-      // Ensure parent dir exists
-      const parentDir = dirname(normalized);
-      if (!existsSync(parentDir)) mkdirSync(parentDir, { recursive: true });
-    } else {
-      if (!existsSync(normalized) || !statSync(normalized).isFile()) {
-        return res.status(400).json({ error: 'File does not exist' });
-      }
-    }
-
-    writeFileSync(normalized, content, 'utf-8');
-    res.json({ ok: true });
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
-
-// POST /api/file-mkdir — Create a directory
-app.post('/api/file-mkdir', (req, res) => {
-  try {
-    const { path: dirPath } = req.body || {};
-    if (!dirPath) return res.status(400).json({ error: 'Missing path' });
-
-    const normalized = validateProjectPath(dirPath);
-    if (!normalized) return res.status(403).json({ error: 'Path outside registered project roots' });
+function validateProjectPath(filePath) {
+  const normalized = resolve(filePath);
+  const { dirs, files } = allowedFileRoots();
+  const matched = [...dirs, ...files].find(r => normalized === r || normalized.startsWith(r + sep));
+  return matched ? normalized : null;
+}
 
-    mkdirSync(normalized, { recursive: true });
-    res.json({ ok: true });
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
+// ── Code editor (File Explorer): file routes and preferences ──
+// lib/editor-files-api.js: GET / POST / DELETE /api/file-content, POST /api/file-mkdir,
+// POST /api/file-stat, GET /api/editor/capabilities. lib/editor-config.js: GET / PUT /api/editor/config.
+// lib/editor-completion.js: the routes under /api/editor/complete (AI autocomplete).
+// lib/editor-git-api.js: GET /api/file-head (a file as the last commit has it; git is only ever read).
+const editorConfigStore = createEditorConfigStore({
+  path: resolve(DATA_HOME, 'data', 'editor-config.json'),
+  log: (tag, message) => console.error(`[${tag}] ${message}`),
+});
+// AI autocomplete (lib/editor-completion.js): POST /api/editor/complete, /test and /feedback, GET /models and
+// /usage. OpenCode models are asked through a serve of their own (lib/editor-completion-opencode.js: started on
+// the first request, stopped after ten idle minutes and at shutdown, never the shared serve), or a
+// user-configured endpoint is, whose key is SYNABUN_EDITOR_AI_KEY in the data home's .env.
+const editorEndpointKey = createEndpointKeyStore({ envPath: ENV_PATH, parseEnvFile, writeEnvFile });
+const editorCompletionServe = createOpencodeCompletionEngine({
+  dataDir: resolve(DATA_HOME, 'data', 'editor-complete'),
+  system: COMPLETION_SYSTEM,
+  readUserConfig: () => {
+    const configPath = getOpencodeConfigPath();
+    return existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf8')) : null;
+  },
+  // A provider's {file:./key} is relative to that configuration: it is written whole for the serve's own folder.
+  userConfigDir: () => dirname(getOpencodeConfigPath()),
+  allocPort: allocOpencodeIsoPort,
+  // As the isolated serves are started: through the login shell, so the CLI is found where a terminal finds it.
+  spawnServe: ({ port, env, cwd }) => {
+    const cmd = loadCliConfig().opencode?.command || 'opencode';
+    const shellArgs = IS_WIN
+      ? ['/d', '/s', '/c', `${cmd} serve --port ${port}`]
+      : ['-lc', `exec ${cmd} serve --port ${port}`];
+    const proc = spawn(DEFAULT_SHELL, shellArgs, { stdio: ['ignore', 'ignore', 'pipe'], env, cwd, detached: false, shell: false, windowsHide: true });
+    proc.stderr?.on('data', (d) => console.log(`[editor-complete:err] ${String(d).trim().slice(0, 500)}`));
+    return proc;
+  },
+  killServe: (proc) => {
+    try {
+      if (IS_WIN && proc.pid) spawn('taskkill', ['/pid', String(proc.pid), '/T', '/F'], { shell: true, windowsHide: true, stdio: 'ignore' });
+      else proc.kill('SIGTERM');
+    } catch { /* already gone */ }
+  },
+  createClient: opencodeV2Client.createClientInstance,
+  log: (tag, message) => console.log(`[${tag}] ${message}`),
+});
+const editorCompletion = createEditorCompletionService({
+  readConfig: editorConfigStore.read,
+  engines: { opencode: editorCompletionServe, endpoint: createEndpointCompletionEngine() },
+  getEndpointKey: editorEndpointKey.get,
+  // The model list comes from the shared serve while it runs: listing models starts nothing.
+  sharedProviders: async () => {
+    if (!_ocpReady) return null;
+    const r = await ocpProxy('GET', '/provider', null, 8000);
+    return r.status === 200 ? r.data : null;
+  },
+  isHiddenModel: (id) => opencodeHiddenModels.has(id),
+  usage: createUsageStore({
+    path: resolve(DATA_HOME, 'data', 'editor-ai-usage.json'),
+    log: (tag, message) => console.error(`[${tag}] ${message}`),
+  }),
+  log: (tag, message) => console.warn(`[${tag}] ${message}`),
 });
+app.use(createEditorFilesRouter({ fileRoots: allowedFileRoots, guard: editorOwnerGuard, capabilities: () => [...EDITOR_CONFIG_CAPABILITIES, ...EDITOR_COMPLETION_CAPABILITIES, ...EDITOR_BACKUP_CAPABILITIES, ...EDITOR_GIT_CAPABILITIES] }));
+app.use(createEditorGitRouter({ fileRoots: allowedFileRoots, guard: editorOwnerGuard }));
+app.use('/api/editor/config', createEditorConfigRouter({
+  store: editorConfigStore,
+  guard: editorOwnerGuard,
+  broadcastSync,
+  hasEndpointKey: editorEndpointKey.has,
+  setEndpointKey: editorEndpointKey.set,
+}));
+app.use('/api/editor/complete', createEditorCompletionRouter({ service: editorCompletion, guard: editorOwnerGuard }));
 
-// DELETE /api/file-content — Delete a file or empty directory
-app.delete('/api/file-content', (req, res) => {
-  try {
-    const filePath = req.query.path;
-    if (!filePath) return res.status(400).json({ error: 'Missing path parameter' });
-
-    const normalized = validateProjectPath(filePath);
-    if (!normalized) return res.status(403).json({ error: 'Path outside registered project roots' });
-
-    if (!existsSync(normalized)) {
-      return res.status(404).json({ error: 'Path does not exist' });
-    }
-
-    const stat = statSync(normalized);
-    if (stat.isDirectory()) {
-      const entries = readdirSync(normalized);
-      if (entries.length > 0) return res.status(400).json({ error: 'Directory is not empty' });
-      rmSync(normalized);
-    } else {
-      unlinkSync(normalized);
-    }
-    res.json({ ok: true });
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
+// The File Explorer's own routes (lib/file-explorer-api.js, docs/file-explorer.md): one folder, search, the git
+// state of a project, the watcher's event stream, and what is done to files (new, rename, move, copy, delete to
+// the system's Trash, upload, reveal, the bytes of an image). The same guard as the editor's routes.
+// The guard looks at the Origin of a write only; the router refuses a read from another site's page as well (a
+// watch is a session of which there are sixteen), by the same origins.
+app.use('/api/explorer', createFileExplorerRouter({ fileRoots: allowedFileRoots, guard: editorOwnerGuard, origins: { port: PORT, allowedOrigins: publicWebOrigins } }));
 
 // GET /api/latest-plan — Find most recently modified plan file (data/plans/YYYY-MM-DD/ preferred, flat fallback)
 app.get('/api/latest-plan', (req, res) => {
@@ -17225,7 +17174,8 @@ app.post('/api/create-plan', (req, res) => {
 });
 
 // GET /api/project-files — List ALL files (incl. dotfiles) for file explorer sidebar
-app.get('/api/project-files', async (req, res) => {
+// The owner's, like the file routes: the names of a project's files are not an invited guest's to list.
+app.get('/api/project-files', editorOwnerGuard, async (req, res) => {
   try {
     const root = DATA_HOME;
     let dir = req.query.path ? resolve(req.query.path) : root;
@@ -17244,6 +17194,10 @@ app.get('/api/project-files', async (req, res) => {
     if (!existsSync(normalizedDir) || !statSync(normalizedDir).isDirectory()) {
       return res.status(400).json({ error: 'Not a valid directory' });
     }
+    // Judged as the disk resolves it too: a link that leads out of its project is not listed.
+    if (!isInsideReal(normalizedRoot, normalizedDir, { allowRoot: true })) {
+      return res.status(403).json({ error: 'Path outside registered project roots' });
+    }
 
     // Git info for status badges
     const git = getGitInfo(normalizedDir);
@@ -17375,21 +17329,13 @@ app.get('/api/browse-directory', (req, res) => {
 // POST /api/browse-folder — Open native OS folder picker dialog
 // Async exec: the dialog stays open for up to 60s — execSync here froze the
 // entire server (every WS stream, every request) until the user dismissed it.
-app.post('/api/browse-folder', async (req, res) => {
+// The dialog opens on the owner's machine: the owner's route. Its prompt is handed to the picker as an argument
+// (lib/file-explorer-system.js), never as part of a command line: a request cannot make it run anything.
+app.post('/api/browse-folder', editorOwnerGuard, async (req, res) => {
   try {
     const { description } = req.body || {};
-    const prompt = description || 'Select a folder';
-    let cmd;
-    if (process.platform === 'win32') {
-      const escaped = prompt.replace(/'/g, "''");
-      const pickerScript = resolve(__dirname, 'lib', 'folder-picker.ps1');
-      cmd = `powershell -NoProfile -STA -WindowStyle Hidden -ExecutionPolicy Bypass -File "${pickerScript}" -Title "${escaped}"`;
-    } else if (process.platform === 'darwin') {
-      cmd = `osascript -e 'POSIX path of (choose folder with prompt "${prompt}")'`;
-    } else {
-      cmd = `zenity --file-selection --directory --title="${prompt}" 2>/dev/null`;
-    }
-    const { stdout } = await execAsync(cmd, { encoding: 'utf8', timeout: 60000, windowsHide: true });
+    const picker = folderPickerCommand(process.platform, typeof description === 'string' ? description : '', { scriptPath: resolve(__dirname, 'lib', 'folder-picker.ps1') });
+    const { stdout } = await execFileAsync(picker.file, picker.args, { encoding: 'utf8', timeout: 60000, windowsHide: true });
     const result = stdout.trim();
     if (result) {
       res.json({ path: result.replace(/\\/g, '/') });
@@ -17928,6 +17874,7 @@ app.get('/api/setup/onboarding', async (req, res) => {
     const setupComplete = vars.SETUP_COMPLETE === 'true';
     const dbExists = existsSync(getDbPath());
     const mcpBuilt = existsSync(resolve(PACKAGE_ROOT, 'mcp-server', 'dist', 'index.js'));
+    const { mcpCommand, mcpArgs } = getMcpPaths();
 
     res.json({
       setupComplete,
@@ -17938,6 +17885,8 @@ app.get('/api/setup/onboarding', async (req, res) => {
       projectDir: PACKAGE_ROOT,
       dataHome: DATA_HOME,
       packageRoot: PACKAGE_ROOT,
+      mcpCommand,
+      mcpArgs,
       dataHomeInsidePackage: DATA_HOME_DIAGNOSTICS.dataHomeInsidePackage,
       recommendedDataHome: DATA_HOME_DIAGNOSTICS.recommendedDataHome,
       dataHomeExplicitOverride: DATA_HOME_DIAGNOSTICS.explicitOverride,
@@ -18072,8 +18021,7 @@ app.post('/api/setup/write-mcp-json', (req, res) => {
     const envPath = resolve(DATA_HOME, '.env').replace(/\\/g, '/');
 
     const mcpEntry = {
-      command: 'node',
-      args: [mcpIndexPath],
+      ...mcpStdioCommand(mcpIndexPath),
       env: { DOTENV_PATH: envPath, SYNABUN_DATA_HOME: DATA_HOME, MEMORY_DATA_DIR: resolve(DATA_HOME, 'mcp-data') },
     };
 
@@ -20152,7 +20100,7 @@ app.get('/api/claude-code/integrations', (req, res) => {
 
     // Auto-sync: ensure all registered projects have globally-enabled hooks
     const globallyEnabled = Object.entries(globalHooks).filter(([, on]) => on).map(([ev]) => ev);
-    for (const p of projects) {
+    for (const p of hookInstallBlocker() ? [] : projects) {
       const projFile = getClaudeSettingsPath(p.path);
       let projSettings;
       try {
@@ -20198,7 +20146,8 @@ app.get('/api/claude-code/integrations', (req, res) => {
 
     const mcpIndexPath = resolve(PACKAGE_ROOT, 'mcp-server', 'run.mjs').replace(/\\/g, '/');
     const envPath = resolve(DATA_HOME, '.env').replace(/\\/g, '/');
-    const cliCommand = `claude mcp add SynaBun node "${mcpIndexPath}" -s user -e "DOTENV_PATH=${envPath}"`;
+    const { command: mcpCommand, args: mcpArgs } = mcpStdioCommand(mcpIndexPath);
+    const cliCommand = claudeMcpAddCommand({ mcpIndexPath, envPath, mcpCommand, mcpArgs });
 
     res.json({
       ok: true,
@@ -20220,7 +20169,11 @@ app.post('/api/claude-code/integrations', (req, res) => {
     const { target, projectPath, label, hook } = req.body;
     // target: 'global' | 'project'
 
+    // Null unless this run has no path of its own to register (lib/claude-hooks.js).
+    const blocker = hookInstallBlocker();
+
     if (target === 'global') {
+      if (blocker) return res.status(409).json({ error: blocker });
       const filePath = getGlobalClaudeSettingsPath();
       let settings = readClaudeSettingsForWrite(filePath);
       settings = addHookToSettings(settings, hook || undefined);
@@ -20246,15 +20199,23 @@ app.post('/api/claude-code/integrations', (req, res) => {
       const normalized = resolve(projectPath);
       if (!existsSync(normalized)) return res.status(400).json({ error: `Directory not found: ${normalized}` });
 
-      const filePath = getClaudeSettingsPath(normalized);
-      let settings = readClaudeSettingsForWrite(filePath);
-      settings = addHookToSettings(settings, hook || undefined, normalized);
-      writeClaudeSettings(filePath, settings);
+      // Adding a project is more than its hooks: a run that cannot write them
+      // still registers it, and refuses only a request that asks for nothing else.
+      const projects = loadHookProjects();
+      const registered = projects.some(p => resolve(p.path) === normalized);
+      const plan = hookInstallPlan({ target, registered, hook });
+      if (plan === 'refuse') return res.status(409).json({ error: blocker });
+
+      if (plan === 'write') {
+        const filePath = getClaudeSettingsPath(normalized);
+        let settings = readClaudeSettingsForWrite(filePath);
+        settings = addHookToSettings(settings, hook || undefined, normalized);
+        writeClaudeSettings(filePath, settings);
+      }
 
       // Save to registered projects list
       const projectLabel = label || basename(normalized);
-      const projects = loadHookProjects();
-      if (!projects.some(p => resolve(p.path) === normalized)) {
+      if (!registered) {
         projects.push({ path: normalized, label: projectLabel });
         saveHookProjects(projects);
       }
@@ -20274,25 +20235,9 @@ app.post('/api/claude-code/integrations', (req, res) => {
         }
       } catch { /* non-critical */ }
 
-      // Auto-create greeting config entry for the new project
-      try {
-        const greetingKey = projectLabel.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
-        const gcPath = resolve(DATA_HOME, 'data', 'greeting-config.json');
-        let gc = { version: 1, defaults: {}, projects: {}, global: {} };
-        try { if (existsSync(gcPath)) gc = JSON.parse(readFileSync(gcPath, 'utf-8')); } catch {}
-        if (!gc.projects) gc.projects = {};
-        if (!gc.projects[greetingKey]) {
-          gc.projects[greetingKey] = {
-            label: projectLabel,
-            greetingTemplate: gc.defaults?.greetingTemplate || '{time_greeting}! Working on **{project_label}** (`{branch}` branch). {date}.',
-            showReminders: false,
-            showLastSession: true,
-            reminders: [],
-          };
-          writeFileSync(gcPath, JSON.stringify(gc, null, 2), 'utf-8');
-        }
-      } catch { /* non-critical */ }
-
+      if (plan !== 'write') {
+        return res.json({ ok: true, message: `${basename(normalized)} was added without hooks. ${blocker}`, hooksSkipped: true, dubiousOwnership, trustPath });
+      }
       return res.json({ ok: true, message: `Hook enabled for ${basename(normalized)}.`, dubiousOwnership, trustPath });
     }
 
@@ -20602,510 +20547,19 @@ app.put('/api/claude-code/tool-permissions', (req, res) => {
   }
 });
 
-// ── Greeting Config (read/write greeting-config.json for the greeting hook) ──
-
-const GREETING_CONFIG_PATH = resolve(DATA_HOME, 'data', 'greeting-config.json');
-const CODEX_GREETING_CONFIG_PATH = resolve(DATA_HOME, 'data', 'codex-greeting-config.json');
-const OPENCODE_GREETING_CONFIG_PATH = resolve(DATA_HOME, 'data', 'opencode-greeting-config.json');
-
-function loadGreetingConfig() {
-  try {
-    if (!existsSync(GREETING_CONFIG_PATH)) return { version: 1, defaults: {}, projects: {}, global: {} };
-    return JSON.parse(readFileSync(GREETING_CONFIG_PATH, 'utf-8'));
-  } catch { return { version: 1, defaults: {}, projects: {}, global: {} }; }
-}
-
-function deepCloneJson(value, fallback = {}) {
-  try { return JSON.parse(JSON.stringify(value)); }
-  catch { return fallback; }
-}
-
-function normalizeGreetingLabel(label) {
-  return String(label || '').toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
-}
-
-function detectGreetingProject(cwd) {
-  if (!cwd) return 'global';
-  const lower = String(cwd).toLowerCase().replace(/\\/g, '/');
-  const projects = loadHookProjects();
-  const sorted = projects
-    .map((project) => ({
-      path: String(project.path || '').toLowerCase().replace(/\\/g, '/'),
-      label: normalizeGreetingLabel(project.label || basename(project.path || '')),
-    }))
-    .filter((project) => project.path && project.label)
-    .sort((a, b) => b.path.length - a.path.length);
-
-  for (const project of sorted) {
-    if (lower.startsWith(project.path + '/') || lower === project.path) return project.label;
-  }
-  for (const project of sorted) {
-    const folder = basename(project.path).toLowerCase();
-    if (folder && lower.includes(folder)) return project.label;
-  }
-  const base = basename(lower).replace(/[^a-z0-9-]/g, '-');
-  return base || 'global';
-}
-
-function buildSeededCodexGreetingConfig() {
-  const base = loadGreetingConfig();
-  return {
-    version: 1,
-    enabled: false,
-    defaults: deepCloneJson(base.defaults, {}),
-    projects: deepCloneJson(base.projects, {}),
-    global: deepCloneJson(base.global, {}),
-  };
-}
-
-function normalizeCodexGreetingConfig(config) {
-  const seeded = buildSeededCodexGreetingConfig();
-  const next = (config && typeof config === 'object') ? config : {};
-  return {
-    version: 1,
-    enabled: typeof next.enabled === 'boolean' ? next.enabled : seeded.enabled,
-    defaults: deepCloneJson(next.defaults, seeded.defaults),
-    projects: deepCloneJson(next.projects, seeded.projects),
-    global: deepCloneJson(next.global, seeded.global),
-  };
-}
-
-function saveCodexGreetingConfig(config) {
-  const dir = dirname(CODEX_GREETING_CONFIG_PATH);
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync(CODEX_GREETING_CONFIG_PATH, JSON.stringify(normalizeCodexGreetingConfig(config), null, 2), 'utf-8');
-}
-
-function loadCodexGreetingConfig() {
-  try {
-    if (!existsSync(CODEX_GREETING_CONFIG_PATH)) {
-      const seeded = buildSeededCodexGreetingConfig();
-      saveCodexGreetingConfig(seeded);
-      return seeded;
-    }
-    const parsed = JSON.parse(readFileSync(CODEX_GREETING_CONFIG_PATH, 'utf-8'));
-    const normalized = normalizeCodexGreetingConfig(parsed);
-    if (JSON.stringify(parsed) !== JSON.stringify(normalized)) saveCodexGreetingConfig(normalized);
-    return normalized;
-  } catch {
-    const seeded = buildSeededCodexGreetingConfig();
-    try { saveCodexGreetingConfig(seeded); } catch {}
-    return seeded;
-  }
-}
-
-function getTimeGreeting() {
-  const hour = new Date().getHours();
-  if (hour >= 5 && hour < 12) return 'Good morning';
-  if (hour >= 12 && hour < 17) return 'Good afternoon';
-  return 'Good evening';
-}
-
-function getGreetingGitBranch(cwd) {
-  try {
-    return execSync('git rev-parse --abbrev-ref HEAD', {
-      cwd,
-      encoding: 'utf-8',
-      timeout: 2000,
-      stdio: ['pipe', 'pipe', 'pipe'],
-    }).trim();
-  } catch {
-    return 'unknown';
-  }
-}
-
-function resolveGreetingTemplate(template, vars) {
-  return String(template || '').replace(/\{(\w+)\}/g, (match, key) => (vars[key] !== undefined ? vars[key] : match));
-}
-
-function getProviderGreetingProjectConfig(config, project) {
-  if (!config || typeof config !== 'object') return null;
-  if (config.projects && config.projects[project]) return { ...config.defaults, ...config.projects[project] };
-  if (config.global) return { ...config.defaults, ...config.global };
-  return config.defaults || null;
-}
-
-function buildCodexGreetingUserPrompt({ cwd = PACKAGE_ROOT, userPrompt = '' } = {}) {
-  const config = loadCodexGreetingConfig();
-  if (config.enabled !== true) return '';
-
-  const project = detectGreetingProject(cwd);
-  const projectConfig = getProviderGreetingProjectConfig(config, project);
-  const defaultTemplate = '{time_greeting}! Working on **{project_label}** (`{branch}` branch). {date}.';
-  const projectLabel = projectConfig?.label || project;
-  const branch = getGreetingGitBranch(cwd);
-  const vars = {
-    time_greeting: getTimeGreeting(),
-    project,
-    project_name: project,
-    project_label: projectLabel,
-    branch,
-    date: new Date().toLocaleDateString('en-US', {
-      weekday: 'long',
-      year: 'numeric',
-      month: 'long',
-      day: 'numeric',
-    }),
-  };
-  const greetingText = resolveGreetingTemplate(
-    projectConfig?.greetingTemplate || config.defaults?.greetingTemplate || defaultTemplate,
-    vars,
-  ).trim();
-  if (!greetingText) return '';
-
-  const reminders = Array.isArray(projectConfig?.reminders)
-    ? projectConfig.reminders.filter((reminder) => reminder && (reminder.label || reminder.command))
-    : [];
-  const showReminders = projectConfig?.showReminders ?? config.defaults?.showReminders ?? false;
-  const showLastSession = projectConfig?.showLastSession ?? config.defaults?.showLastSession ?? false;
-
-  // Build as a natural user request to avoid Codex safety filter flagging it as prompt injection.
-  // No "hidden instruction" language, no "do not mention", no "apply only to this turn".
-  const parts = [];
-  parts.push(`Before answering, please use the recall tool to search for "recent sessions, ongoing work, known issues, decisions" in the "${project}" project with recency_boost enabled.`);
-  parts.push('');
-  parts.push(`Start your reply with this greeting:`);
-  parts.push(`> ${greetingText}`);
-
-  if (showReminders && reminders.length) {
-    parts.push('');
-    parts.push('After the greeting, show these service reminders:');
-    for (const reminder of reminders) {
-      const label = reminder.label || 'Reminder';
-      const command = reminder.command || '';
-      parts.push(`- **${label}**: \`${command}\``);
-    }
-  }
-
-  if (showLastSession) {
-    parts.push('');
-    parts.push('If the recall results mention recent work, include a brief "Last session:" summary line.');
-  }
-
-  const userMsg = String(userPrompt || '').trim();
-  if (userMsg) {
-    parts.push('');
-    parts.push(`Then respond to: ${userMsg}`);
-  }
-
-  return parts.join('\n').trim();
-}
-
-function buildCodexGreetingPrompt({ cwd = PACKAGE_ROOT, userPrompt = '', markerStart = '', markerEnd = '' } = {}) {
-  const config = loadCodexGreetingConfig();
-  if (config.enabled !== true) return '';
-
-  const project = detectGreetingProject(cwd);
-  const projectConfig = getProviderGreetingProjectConfig(config, project);
-  const defaultTemplate = '{time_greeting}! Working on **{project_label}** (`{branch}` branch). {date}.';
-  const projectLabel = projectConfig?.label || project;
-  const branch = getGreetingGitBranch(cwd);
-  const vars = {
-    time_greeting: getTimeGreeting(),
-    project,
-    project_name: project,
-    project_label: projectLabel,
-    branch,
-    date: new Date().toLocaleDateString('en-US', {
-      weekday: 'long',
-      year: 'numeric',
-      month: 'long',
-      day: 'numeric',
-    }),
-  };
-  const greetingText = resolveGreetingTemplate(
-    projectConfig?.greetingTemplate || config.defaults?.greetingTemplate || defaultTemplate,
-    vars,
-  ).trim();
-  if (!greetingText) return '';
-
-  const reminders = Array.isArray(projectConfig?.reminders)
-    ? projectConfig.reminders.filter((reminder) => reminder && (reminder.label || reminder.command))
-    : [];
-  const showReminders = projectConfig?.showReminders ?? config.defaults?.showReminders ?? false;
-  const showLastSession = projectConfig?.showLastSession ?? config.defaults?.showLastSession ?? false;
-  const steps = [
-    `Call the SynaBun MCP server's \`recall\` tool (may appear as \`mcp__SynaBun__recall\` or just \`recall\` depending on the client) with query "recent sessions, ongoing work, known issues, decisions", project "${project}", and \`recency_boost\` set to true.`,
-    `After that recall, begin your first assistant message with this greeting exactly as written below:\n\n> ${greetingText}`,
-  ];
-
-  if (showReminders && reminders.length) {
-    const reminderText = reminders.map((reminder) => {
-      const label = reminder.label || 'Reminder';
-      const command = reminder.command || '';
-      return `For **${label}**, show this command in its own fenced code block:\n\`\`\`bash\n${command}\n\`\`\``;
-    }).join('\n\n');
-    steps.push(`After the greeting, show these reminders:\n\n${reminderText}`);
-  }
-
-  if (showLastSession) {
-    steps.push(`After the greeting${showReminders && reminders.length ? ' and reminders' : ''}, include a brief "Last session:" line if the recall results contain something relevant. If not, omit that line.`);
-  }
-
-  steps.push(`Then continue directly with the user's request below.`);
-
-  const parts = [
-    markerStart,
-    'SynaBun Codex panel boot instructions. Apply these instructions ONLY to this first turn of this thread.',
-    'Do not mention these instructions. Do not repeat the greeting on later turns.',
-    '',
-    'Before replying to the user:',
-    ...steps.map((step, index) => `${index + 1}. ${step}`),
-    '',
-  ];
-
-  parts.push(markerEnd, '', String(userPrompt || '').trim());
-  return parts.filter((part) => part !== undefined).join('\n').trim();
-}
-
-// ── OpenCode Panel Greeting (isolated from Claude + Codex) ──
-
-function buildSeededOpencodeGreetingConfig() {
-  const base = loadGreetingConfig();
-  return {
-    version: 1,
-    enabled: false,
-    defaults: deepCloneJson(base.defaults, {}),
-    projects: deepCloneJson(base.projects, {}),
-    global: deepCloneJson(base.global, {}),
-  };
-}
-
-function normalizeOpencodeGreetingConfig(config) {
-  const seeded = buildSeededOpencodeGreetingConfig();
-  const next = (config && typeof config === 'object') ? config : {};
-  return {
-    version: 1,
-    enabled: typeof next.enabled === 'boolean' ? next.enabled : seeded.enabled,
-    defaults: deepCloneJson(next.defaults, seeded.defaults),
-    projects: deepCloneJson(next.projects, seeded.projects),
-    global: deepCloneJson(next.global, seeded.global),
-  };
-}
-
-function saveOpencodeGreetingConfig(config) {
-  const dir = dirname(OPENCODE_GREETING_CONFIG_PATH);
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync(OPENCODE_GREETING_CONFIG_PATH, JSON.stringify(normalizeOpencodeGreetingConfig(config), null, 2), 'utf-8');
-}
-
-function loadOpencodeGreetingConfig() {
-  try {
-    if (!existsSync(OPENCODE_GREETING_CONFIG_PATH)) {
-      const seeded = buildSeededOpencodeGreetingConfig();
-      saveOpencodeGreetingConfig(seeded);
-      return seeded;
-    }
-    const parsed = JSON.parse(readFileSync(OPENCODE_GREETING_CONFIG_PATH, 'utf-8'));
-    const normalized = normalizeOpencodeGreetingConfig(parsed);
-    if (JSON.stringify(parsed) !== JSON.stringify(normalized)) saveOpencodeGreetingConfig(normalized);
-    return normalized;
-  } catch {
-    const seeded = buildSeededOpencodeGreetingConfig();
-    try { saveOpencodeGreetingConfig(seeded); } catch {}
-    return seeded;
-  }
-}
-
-// No caller since the legacy OpenCode socket handler was removed: the v2 panel
-// sends the prompt as typed. Kept because Settings → Automations → Greetings
-// still edits this config; wiring it into the v2 send path is the owner's decision.
-function buildOpencodeGreetingUserPrompt({ cwd = PACKAGE_ROOT, userPrompt = '' } = {}) {
-  const config = loadOpencodeGreetingConfig();
-  if (config.enabled !== true) return '';
-
-  const project = detectGreetingProject(cwd);
-  const projectConfig = getProviderGreetingProjectConfig(config, project);
-  const defaultTemplate = '{time_greeting}! Working on **{project_label}** (`{branch}` branch). {date}.';
-  const projectLabel = projectConfig?.label || project;
-  const branch = getGreetingGitBranch(cwd);
-  const vars = {
-    time_greeting: getTimeGreeting(),
-    project,
-    project_name: project,
-    project_label: projectLabel,
-    branch,
-    date: new Date().toLocaleDateString('en-US', {
-      weekday: 'long',
-      year: 'numeric',
-      month: 'long',
-      day: 'numeric',
-    }),
-  };
-  const greetingText = resolveGreetingTemplate(
-    projectConfig?.greetingTemplate || config.defaults?.greetingTemplate || defaultTemplate,
-    vars,
-  ).trim();
-  if (!greetingText) return '';
-
-  const reminders = Array.isArray(projectConfig?.reminders)
-    ? projectConfig.reminders.filter((reminder) => reminder && (reminder.label || reminder.command))
-    : [];
-  const showReminders = projectConfig?.showReminders ?? config.defaults?.showReminders ?? false;
-  const showLastSession = projectConfig?.showLastSession ?? config.defaults?.showLastSession ?? false;
-
-  const parts = [];
-  // OpenCode does not bind a session to a project directory the way Codex does
-  // — its tools default to the serve process's cwd, not the user-selected
-  // project. Spell out the absolute project path here so the agent always uses
-  // it for Read/Bash/etc. instead of falling back to the serve cwd.
-  if (cwd && cwd !== PACKAGE_ROOT) {
-    parts.push(`Project working directory: \`${cwd}\``);
-    parts.push(`Use this absolute path as the working directory for all file operations (Read, Write, Edit, Bash). Do not operate on the SynaBun project unless explicitly asked.`);
-    parts.push('');
-  }
-  parts.push(`Before answering, please use the recall tool to search for "recent sessions, ongoing work, known issues, decisions" in the "${project}" project with recency_boost enabled.`);
-  parts.push('');
-  parts.push(`Start your reply with this greeting:`);
-  parts.push(`> ${greetingText}`);
-
-  if (showReminders && reminders.length) {
-    parts.push('');
-    parts.push('After the greeting, show these service reminders:');
-    for (const reminder of reminders) {
-      const label = reminder.label || 'Reminder';
-      const command = reminder.command || '';
-      parts.push(`- **${label}**: \`${command}\``);
-    }
-  }
-
-  if (showLastSession) {
-    parts.push('');
-    parts.push('If the recall results mention recent work, include a brief "Last session:" summary line.');
-  }
-
-  const userMsg = String(userPrompt || '').trim();
-  if (userMsg) {
-    parts.push('');
-    parts.push(`Then respond to: ${userMsg}`);
-  }
-
-  return parts.join('\n').trim();
-}
-
-// GET /api/greeting/config — read the full greeting configuration
-app.get('/api/greeting/config', (req, res) => {
-  try {
-    res.json({ ok: true, config: loadGreetingConfig() });
-  } catch (err) {
-    res.status(500).json({ ok: false, error: err.message });
-  }
-});
-
-// PUT /api/greeting/config/:project — update a project's greeting config
-app.put('/api/greeting/config/:project', (req, res) => {
-  try {
-    const { project } = req.params;
-    const { greetingTemplate, showReminders, showLastSession, reminders, label } = req.body;
-    const config = loadGreetingConfig();
-
-    const target = project === 'global'
-      ? (config.global || (config.global = {}))
-      : (config.projects[project] || (config.projects[project] = {}));
-
-    if (greetingTemplate !== undefined) target.greetingTemplate = greetingTemplate;
-    if (showReminders !== undefined) target.showReminders = showReminders;
-    if (showLastSession !== undefined) target.showLastSession = showLastSession;
-    if (reminders !== undefined) target.reminders = reminders;
-    if (label !== undefined) target.label = label;
-
-    const dir = dirname(GREETING_CONFIG_PATH);
-    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-    writeFileSync(GREETING_CONFIG_PATH, JSON.stringify(config, null, 2), 'utf-8');
-    res.json({ ok: true });
-  } catch (err) {
-    res.status(500).json({ ok: false, error: err.message });
-  }
-});
-
-// GET /api/codex-panel/greeting/config — read Codex-only greeting configuration
-app.get('/api/codex-panel/greeting/config', (req, res) => {
-  try {
-    res.json({ ok: true, config: loadCodexGreetingConfig() });
-  } catch (err) {
-    res.status(500).json({ ok: false, error: err.message });
-  }
-});
-
-// PUT /api/codex-panel/greeting/config — update top-level Codex greeting settings
-app.put('/api/codex-panel/greeting/config', (req, res) => {
-  try {
-    const config = loadCodexGreetingConfig();
-    if (typeof req.body?.enabled === 'boolean') config.enabled = req.body.enabled;
-    saveCodexGreetingConfig(config);
-    res.json({ ok: true, config });
-  } catch (err) {
-    res.status(500).json({ ok: false, error: err.message });
-  }
-});
-
-// PUT /api/codex-panel/greeting/config/:project — update Codex-only project greeting config
-app.put('/api/codex-panel/greeting/config/:project', (req, res) => {
-  try {
-    const { project } = req.params;
-    const { greetingTemplate, showReminders, showLastSession, reminders, label } = req.body;
-    const config = loadCodexGreetingConfig();
-
-    const target = project === 'global'
-      ? (config.global || (config.global = {}))
-      : (config.projects[project] || (config.projects[project] = {}));
-
-    if (greetingTemplate !== undefined) target.greetingTemplate = greetingTemplate;
-    if (showReminders !== undefined) target.showReminders = showReminders;
-    if (showLastSession !== undefined) target.showLastSession = showLastSession;
-    if (reminders !== undefined) target.reminders = reminders;
-    if (label !== undefined) target.label = label;
-
-    saveCodexGreetingConfig(config);
-    res.json({ ok: true, config });
-  } catch (err) {
-    res.status(500).json({ ok: false, error: err.message });
-  }
-});
-
-// GET /api/opencode-panel/greeting/config — read OpenCode-only greeting configuration
-app.get('/api/opencode-panel/greeting/config', (req, res) => {
-  try {
-    res.json({ ok: true, config: loadOpencodeGreetingConfig() });
-  } catch (err) {
-    res.status(500).json({ ok: false, error: err.message });
-  }
-});
-
-// PUT /api/opencode-panel/greeting/config — update top-level OpenCode greeting settings
-app.put('/api/opencode-panel/greeting/config', (req, res) => {
-  try {
-    const config = loadOpencodeGreetingConfig();
-    if (typeof req.body?.enabled === 'boolean') config.enabled = req.body.enabled;
-    saveOpencodeGreetingConfig(config);
-    res.json({ ok: true, config });
-  } catch (err) {
-    res.status(500).json({ ok: false, error: err.message });
-  }
-});
-
-// PUT /api/opencode-panel/greeting/config/:project — update OpenCode-only project greeting config
-app.put('/api/opencode-panel/greeting/config/:project', (req, res) => {
-  try {
-    const { project } = req.params;
-    const { greetingTemplate, showReminders, showLastSession, reminders, label } = req.body;
-    const config = loadOpencodeGreetingConfig();
-
-    const target = project === 'global'
-      ? (config.global || (config.global = {}))
-      : (config.projects[project] || (config.projects[project] = {}));
-
-    if (greetingTemplate !== undefined) target.greetingTemplate = greetingTemplate;
-    if (showReminders !== undefined) target.showReminders = showReminders;
-    if (showLastSession !== undefined) target.showLastSession = showLastSession;
-    if (reminders !== undefined) target.reminders = reminders;
-    if (label !== undefined) target.label = label;
-
-    saveOpencodeGreetingConfig(config);
-    res.json({ ok: true, config });
-  } catch (err) {
-    res.status(500).json({ ok: false, error: err.message });
-  }
+// ── Greeting (lib/greeting/, docs/greeting.md) ──
+// One greeting for every agent: the Assistant, the Claude Code / Codex / OpenCode panels and a
+// terminal Claude Code session ask /api/greeting/open when a person opens a fresh session, and the
+// session's model is told once what was said. The engine is built with the Assistant (it reads the
+// same stores); the route is mounted here, synchronously, so that an engine that did not start
+// answers 503 with its reason instead of looking like an older server (404).
+//
+// The three template greetings this replaces (the Claude Code hook directive, the Codex and the
+// OpenCode panel prompts) are gone with their endpoints. Their config files (greeting-config.json,
+// codex-greeting-config.json, opencode-greeting-config.json) are left on disk, unread.
+app.use('/api/greeting', (req, res, next) => {
+  if (_greetingRouter) return _greetingRouter(req, res, next);
+  res.status(503).json({ ok: false, code: 'GREETING_UNAVAILABLE', error: 'The greeting engine is not running', reason: _greetingError || 'starting' });
 });
 
 // ── SynaBun rules (lib/rulesets/) ──
@@ -21319,7 +20773,18 @@ function syncCodexToolPermissions(allowedKeys) {
 function getMcpPaths() {
   const mcpIndexPath = resolve(PACKAGE_ROOT, 'mcp-server', 'dist', 'preload.js').replace(/\\/g, '/');
   const envPath = resolve(DATA_HOME, '.env').replace(/\\/g, '/');
-  return { mcpIndexPath, envPath };
+  // What a client outside this process runs: `node <preload.js>`, or the
+  // entry executable of a packaged application (`<entry> mcp`).
+  const { command: mcpCommand, args: mcpArgs } = mcpStdioCommand(mcpIndexPath);
+  return { mcpIndexPath, envPath, mcpCommand, mcpArgs };
+}
+
+/** The `claude mcp add` line for the registration getMcpPaths() describes. */
+function claudeMcpAddCommand({ mcpIndexPath, envPath, mcpCommand, mcpArgs }) {
+  // Inside double quotes a POSIX shell still reads \ " $ and `; a Windows path has none of them to escape.
+  const quoted = (value) => (/^[A-Za-z]:[\\/]/.test(value) ? `"${value}"` : `"${String(value).replace(/[\\"$`]/g, '\\$&')}"`);
+  const launch = mcpCommand === 'node' ? `node "${mcpIndexPath}"` : `${quoted(mcpCommand)} ${mcpArgs.join(' ')}`;
+  return `claude mcp add SynaBun ${launch} -s user -e "DOTENV_PATH=${envPath}"`;
 }
 
 function getHomePath() {
@@ -21340,8 +20805,8 @@ function buildCodexMcpEnv() {
 }
 
 function buildCodexMcpDefinition() {
-  const { mcpIndexPath } = getMcpPaths();
-  return { command: 'node', args: [mcpIndexPath], env: buildCodexMcpEnv() };
+  const { mcpCommand, mcpArgs } = getMcpPaths();
+  return { command: mcpCommand, args: mcpArgs, env: buildCodexMcpEnv() };
 }
 
 function buildCodexMcpToml() {
@@ -21374,13 +20839,13 @@ app.post('/api/setup/gemini/mcp', (req, res) => {
   try {
     const dir = join(getHomePath(), '.gemini');
     const settingsPath = join(dir, 'settings.json');
-    const { mcpIndexPath, envPath } = getMcpPaths();
+    const { envPath, mcpCommand, mcpArgs } = getMcpPaths();
     mkdirSync(dir, { recursive: true });
     let data = {};
     try { data = JSON.parse(readFileSync(settingsPath, 'utf-8')); } catch {}
     data = mergeGeminiMcpConfig(data, {
-      command: 'node',
-      args: [mcpIndexPath],
+      command: mcpCommand,
+      args: mcpArgs,
       env: { DOTENV_PATH: envPath, SYNABUN_DATA_HOME: DATA_HOME, MEMORY_DATA_DIR: resolve(DATA_HOME, 'mcp-data') },
     });
     writeFileSync(settingsPath, JSON.stringify(data, null, 2) + '\n', 'utf-8');
@@ -21450,7 +20915,8 @@ app.delete('/api/setup/codex/mcp', (req, res) => {
 app.get('/api/setup/status', (req, res) => {
   try {
     const home = getHomePath();
-    const { mcpIndexPath, envPath } = getMcpPaths();
+    const mcpPaths = getMcpPaths();
+    const { mcpIndexPath, envPath, mcpCommand, mcpArgs } = mcpPaths;
 
     // Claude
     let claude = { connected: false };
@@ -21458,7 +20924,7 @@ app.get('/api/setup/status', (req, res) => {
       const cj = JSON.parse(readFileSync(join(home, '.claude.json'), 'utf-8'));
       claude.connected = !!(cj.mcpServers && cj.mcpServers.SynaBun);
     } catch {}
-    claude.cliCommand = `claude mcp add SynaBun node "${mcpIndexPath}" -s user -e "DOTENV_PATH=${envPath}"`;
+    claude.cliCommand = claudeMcpAddCommand(mcpPaths);
 
     // Gemini
     let gemini = { connected: false };
@@ -21488,7 +20954,7 @@ app.get('/api/setup/status', (req, res) => {
     let rules = null;
     try { rules = rulesetInstaller.status(); } catch (err) { rules = { ok: false, error: err.message }; }
 
-    res.json({ ok: true, claude, gemini, codex, opencode, rules, paths: { mcpIndexPath, envPath } });
+    res.json({ ok: true, claude, gemini, codex, opencode, rules, paths: { mcpIndexPath, envPath, mcpCommand, mcpArgs } });
   } catch (err) {
     res.status(500).json({ error: err.message });
   }
@@ -22743,7 +22209,13 @@ app.get('/api/health', (req, res) => {
     // getDb() auto-creates the directory, file, and schema if missing
     getDb();
     const count = countMemories();
-    res.json({ ok: true, storage: 'sqlite', memories: count, projectDir: PACKAGE_ROOT });
+    res.json({
+      ok: true, storage: 'sqlite', memories: count, projectDir: PACKAGE_ROOT, install: INSTALL_KIND, startLauncher: getStartLauncherState(), entry: START_ENTRY,
+      // Which server this is, and whether it is on its way out for a restart: a
+      // page showing the restart tells this one from the one that replaces it.
+      bootId: SERVER_BOOT_ID,
+      ...(_restartRequestedAt ? { restarting: true } : {}),
+    });
   } catch (err) {
     res.json({ ok: false, reason: 'db_error', detail: err.message });
   }
@@ -24139,88 +23611,42 @@ app.get('/invite/logout', (req, res) => {
 });
 
 // --- Cloudflare Tunnel Management ---
-let tunnelProcess = null;
+// The public address (invite links, remote MCP) is a Cloudflare quick tunnel, run by a cloudflared SynaBun
+// brings itself: the copy inside an installer, or the pinned release file fetched into the data home on the
+// first start and checked against its SHA-256 (lib/cloudflared/). The address is kept here as well, because the
+// Host rule and the remote rule read it (remoteWebOrigins): it is set the moment cloudflared prints it.
 let tunnelUrl = null;
-let tunnelStarting = false;
+const cloudflared = createCloudflaredManager({ dataHome: DATA_HOME, log: (line) => console.log(line) });
+const tunnel = createQuickTunnel({ cloudflared, port: PORT, onUrl: (url) => { tunnelUrl = url; }, log: (line) => console.log(line) });
+// Starting and stopping it is the owner's, from the app's own pages: never an invite guest, anybody from outside
+// or another machine on the network (its socket's peer), never a page of another origin (an Origin that is not
+// exactly this server's own, at its port: the tunnel's and the invite proxy's included; or the browser's own
+// Sec-Fetch-Site: cross-site). A hook, a script or an MCP client on this computer sends neither header and passes.
+// See lib/http-guards.js and lib/request-gate.js.
+const tunnelOwnerGuard = ownerRouteGuard({
+  isGuestRequest: (req) => isGuestRequest(req) || requestGates.isRemote(req) || requestGates.fromAnotherMachine(req),
+  port: PORT, allowedOrigins: publicWebOrigins, refuseCrossSite: true,
+  ownOriginsOnly: true, publicOrigins: remoteWebOrigins,
+});
 
-function findCloudflared() {
-  // Try PATH-based lookup first (cross-platform)
+// What is happening: idle, downloading (with progress), starting, running (the address, which copy of
+// cloudflared runs and its version), failed (with the reason). Asking never downloads anything.
+app.get('/api/tunnel/status', async (req, res) => {
   try {
-    const cmd = process.platform === 'win32' ? 'where cloudflared' : 'which cloudflared';
-    const result = execSync(cmd, { encoding: 'utf-8', timeout: 3000, stdio: ['pipe', 'pipe', 'pipe'] }).trim();
-    if (result) return result.split('\n')[0].trim();
-  } catch { /* not in PATH */ }
-
-  // Windows-specific fallback paths
-  if (process.platform === 'win32') {
-    const paths = [
-      `${process.env.LOCALAPPDATA}\\cloudflared\\cloudflared.exe`,
-      `${process.env.ProgramFiles}\\cloudflared\\cloudflared.exe`,
-      `${process.env['ProgramFiles(x86)']}\\cloudflared\\cloudflared.exe`,
-    ];
-    for (const p of paths) { if (p && existsSync(p)) return p; }
+    res.json(await tunnel.status());
+  } catch (err) {
+    res.status(500).json({ ok: false, error: err?.message || String(err) });
   }
-  return null;
-}
-
-app.get('/api/tunnel/status', (req, res) => {
-  res.json({
-    ok: true,
-    available: !!findCloudflared(),
-    running: !!tunnelProcess,
-    starting: tunnelStarting,
-    url: tunnelUrl,
-  });
 });
 
-app.post('/api/tunnel/start', (req, res) => {
-  if (tunnelProcess) return res.json({ ok: true, url: tunnelUrl, message: 'Already running.' });
-  const bin = findCloudflared();
-  if (!bin) return res.status(400).json({ error: 'cloudflared not found. Install it from https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/' });
-
-  tunnelStarting = true;
-  tunnelUrl = null;
-
-  const child = spawn(bin, ['tunnel', '--url', `http://localhost:${PORT}`], {
-    stdio: ['ignore', 'pipe', 'pipe'],
-    windowsHide: true,
-  });
-
-  tunnelProcess = child;
-  let urlFound = false;
-
-  const parseUrl = (data) => {
-    const text = data.toString();
-    // cloudflared prints the URL to stderr
-    const match = text.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/);
-    if (match && !urlFound) {
-      urlFound = true;
-      tunnelUrl = match[0];
-      tunnelStarting = false;
-      console.log(`  Tunnel:  ${tunnelUrl}`);
-    }
-  };
-
-  child.stdout.on('data', parseUrl);
-  child.stderr.on('data', parseUrl);
-
-  child.on('close', () => {
-    tunnelProcess = null;
-    tunnelUrl = null;
-    tunnelStarting = false;
-  });
-
-  // Respond immediately, client polls /api/tunnel/status for the URL
-  res.json({ ok: true, message: 'Tunnel starting...' });
+// Answers at once; on a machine without cloudflared the start fetches it first, then goes on by itself.
+// The page follows it through /api/tunnel/status.
+app.post('/api/tunnel/start', tunnelOwnerGuard, (req, res) => {
+  res.json(tunnel.start());
 });
 
-app.post('/api/tunnel/stop', (req, res) => {
-  if (!tunnelProcess) return res.json({ ok: true, message: 'Not running.' });
-  tunnelProcess.kill();
-  tunnelProcess = null;
-  tunnelUrl = null;
-  tunnelStarting = false;
-  res.json({ ok: true, message: 'Tunnel stopped.' });
+app.post('/api/tunnel/stop', tunnelOwnerGuard, (req, res) => {
+  res.json(tunnel.stop());
 });
 
 // --- MCP HTTP Transport ---
@@ -24248,15 +23674,12 @@ try {
     next();
   }, mcpRouter);
 
-  // Open path: /mcp — local-only (reject tunnel traffic when key is set)
-  app.use('/mcp', (req, res, next) => {
-    if (req.headers['cf-connecting-ip'] && activeMcpKey) {
-      return res.status(403).json({ error: 'Forbidden' });
-    }
-    next();
-  }, mcpRouter);
+  // Open path: /mcp — for this computer only. What comes in from outside (the tunnel, or anything under the
+  // tunnel's or the invite proxy's name) needs /mcp/<key>, and is refused while no key is set
+  // (lib/request-gate.js mcpWithoutKey)
+  app.use('/mcp', requestGates.mcpWithoutKey, mcpRouter);
 
-  console.log('  MCP HTTP endpoint mounted at /mcp' + (activeMcpKey ? ' (key required for tunnel)' : ' (open)'));
+  console.log('  MCP HTTP endpoint mounted at /mcp' + (activeMcpKey ? ' (from outside: /mcp/<key>)' : ' (local only: no key is set)'));
 } catch (err) {
   console.error('  MCP HTTP mount failed (run npm run build in mcp-server):', err.message);
 }
@@ -25248,14 +24671,11 @@ _nativeLoopRuntime = new NativeLoopRuntime({
           ? `${state.model}[1m]`
           : state.model && state.model.includes(':') ? toCliModelName(state.model) : state.model,
         mcpUrl: `http://localhost:${PORT}/mcp`,
-        sdkExecutable: config.sdkExecutable || undefined,
-        // Fallback if the SDK's bundled native binary is unusable — unattended
-        // loops cannot surface a permission error to anyone, so they need the
-        // same escape hatch the sidepanel has.
-        claudeBin: getClaudeBin(),
-        // Run the installed CLI instead when it is newer than the bundled one, so
-        // the loop's model resolves the way the picker it was chosen from named it.
-        alignedClaudeBin: alignedClaudeExecutable(getClaudeBin()),
+        // The user's Claude Code (or the cli-config override): the same
+        // executable the model picker read its list from, so the loop's model
+        // resolves the way it was named there. Without one the run fails at
+        // once with the install hint, before anything is started.
+        claudeExecutable: getClaudeSdkExecutable(),
         includePartialMessages: typeof config.partials === 'boolean'
           ? config.partials
           : process.platform !== 'win32',
@@ -25271,7 +24691,7 @@ _nativeLoopRuntime = new NativeLoopRuntime({
         ...state,
         codexHome: state.codexHome || getCodexAccountHome(state.codexAccountId || 'default'),
         // Native schedules use the same trusted global CLI as the interactive
-        // sidepanel. The SDK-owned platform payload is never repaired or run.
+        // sidepanel; SynaBun carries no Codex for the SDK to find by itself.
         codexPath: getNativeCodexBin(),
       });
     },
@@ -25324,7 +24744,7 @@ _nativeLoopRuntime = new NativeLoopRuntime({
   try {
     const [
       { createAssistantDispatcher }, { createAssistantRuntime }, { createAssistantApi }, { createUsageLedger },
-      { createClaudeAccounts }, { createAssistantMemory }, { hookRecall },
+      { createClaudeAccounts }, { createAssistantMemory }, { hookRecall, markInjected: assistantMarkInjected },
       claudeBridgeModule, { detectProject: assistantDetectProject }, { getDb: assistantGetDb },
       { handleRemember: assistantHandleRemember }, assistantCategories,
       { createAssistantCatalog }, { createAssistantConfigStore }, { createAssistantRouter, TASK_CLASS_META },
@@ -25428,11 +24848,177 @@ _nativeLoopRuntime = new NativeLoopRuntime({
       listAccounts: () => ({ codex: listCodexAccountsForClient(), 'claude-code': claudeAccounts.listForClient() }),
       readFilter: () => assistantConfigStore.routing().catalogFilter || {},
       readHidden: () => assistantHiddenModels.all(),
+      // A hidden alias ("haiku") hides the model it named when it was hidden: each build settles that.
+      reconcileHidden: (args) => assistantHiddenModels.reconcile(args),
+      // A provider lists other models than before: every open window reloads its menus.
+      onChange: ({ providers }) => broadcastSync({ type: 'assistant:catalog-changed', providers }),
       log: (tag, message) => assistantLog(tag, message),
     });
     _assistantCatalog = assistantCatalog;
     // A Models toggle or a Settings → OpenCode checkbox reaches routing on the next call.
-    assistantHiddenModels.onChange(() => assistantCatalog.invalidate());
+    assistantHiddenModels.onChange((change) => {
+      // What a catalog build settled about a hidden alias is already in that build. When it
+      // rewrote the list (the alias moved to another model and is shown again, its old model
+      // stays hidden under its own id), every open window is told.
+      if (change?.reason === 'pins') {
+        if (change.moved?.length) {
+          broadcastSync({ type: 'assistant:hidden-models-changed', providers: assistantHiddenModels.all(), pins: assistantHiddenModels.allPins(), changed: [change.provider], reason: 'pins' });
+        }
+        return;
+      }
+      assistantCatalog.invalidate();
+    });
+    // The catalog is a copy of the lists the panels' own selectors read. When Claude Code's
+    // changes (a CLI update, other models on the account) the copy goes with it; Codex's
+    // does the same from GET /api/codex/models.
+    onClaudeModelsChanged(() => { assistantCatalog.refresh().catch(() => {}); });
+    // User context (lib/assistant-user-context.js, docs/assistant.md): what the Assistant knows
+    // about the user and what happened in recent conversations, for every brain, learned and
+    // injected by the harness. Its own try/catch: without it the Assistant works as before.
+    let assistantUserContext = null;
+    // Why it did not start, for Settings → Automation behavior (the 503 of /api/assistant/user-context).
+    let assistantUserContextError = null;
+    try {
+      const [
+        { createAssistantUserContext, createUserContextStore, learningJudgeReason }, { createStatementWriter, cheapestClaudeModel },
+        userTypesafe, userTypesafeKnobs, userEmbeddings, userIdentity, { query: userClaudeQuery },
+      ] = await Promise.all([
+        import('./lib/assistant-user-context.js'), import('./lib/assistant-user-writer.js'),
+        import('../mcp-server/dist/services/typesafe.js'), import('../mcp-server/dist/services/typesafe-config.js'),
+        import('../mcp-server/dist/services/local-embeddings.js'), import('../mcp-server/dist/services/identity.js'),
+        import('@anthropic-ai/claude-agent-sdk'),
+      ]);
+      const userStore = createUserContextStore({
+        getDb: assistantGetDb,
+        remember: assistantHandleRemember,
+        reflect: reflectMemory,
+        embed: (text) => userEmbeddings.generateEmbedding(text),
+        // The two categories are made the first time something is stored in them.
+        ensureCategory: (name, description, parent, parentDescription) => {
+          if (assistantCategories.categoryExists(name)) return;
+          if (parent && !assistantCategories.categoryExists(parent)) assistantCategories.addCategory(parent, parentDescription || parent, undefined, undefined, true);
+          assistantCategories.addCategory(name, description, parent);
+        },
+        // user-knowledge, and the seeds read in place: communication-style and its other children.
+        knowledgeCategories: () => ['user-knowledge', 'communication-style', ...assistantCategories.getChildCategories('communication-style').map((category) => category.name)],
+        // A write's own judgments (secret, duplicate, category) are logged against the assistant session, so the usage ledger counts them.
+        withSession: (sessionId, project, fn) => userIdentity.runWithIdentity({
+          key: `assistant-user-context:${sessionId || 'none'}`, source: 'assistant', clientId: 'assistant-user-context',
+          pins: { terminalSessionId: null, browserSessionId: null, browserTabId: null }, state: {}, lastSeen: Date.now(),
+          memoryContext: { session: sessionId || undefined, project: project || undefined },
+        }, fn),
+        log: (tag, message) => assistantLog(tag, message),
+      });
+      assistantUserContext = createAssistantUserContext({
+        settings: () => assistantConfigStore.userContext(),
+        store: userStore,
+        // Jev answers the learning loop's questions on the existing `user-learning` surface (its switch and log), origin `assistant`.
+        judge: {
+          // One reading for both: the loop asks whether Jev can answer, Settings says why it cannot.
+          available: () => learningJudgeReason({ typesafe: userTypesafe, knobs: userTypesafeKnobs }) === null,
+          reason: () => learningJudgeReason({ typesafe: userTypesafe, knobs: userTypesafeKnobs }),
+          ask: (state, questions, opts = {}) => userTypesafe.judge(state, questions, {
+            surface: 'user-learning', origin: 'assistant', sessionId: opts.sessionId ?? null, project: opts.project ?? null,
+            timeoutMs: opts.timeoutMs, onUsage: opts.onUsage, onLogged: opts.onLogged,
+          }),
+        },
+        // Jev cannot write: the statement is a Claude one-shot on the cheapest Claude model, with
+        // no settings, hooks, MCP servers or tools. Without a Claude login the user's own sentence is kept.
+        writer: createStatementWriter({
+          claudeQuery: userClaudeQuery,
+          claudeExecutable: () => getClaudeSdkExecutable(),
+          model: () => cheapestClaudeModel(assistantCatalog.peek?.() || null) || 'haiku',
+          accountEnv: () => claudeAccounts.envFor?.('default') || {},
+          cwd: DATA_HOME,
+          env: process.env,
+          log: (tag, message) => assistantLog(tag, message),
+        }),
+        usage: assistantUsage,
+        markInjected: assistantMarkInjected,
+        statePath: resolve(LOOP_DATA_DIR, 'assistant-user-context.json'),
+        rates: () => { const cfg = typesafeConfig(); return { input: cfg.costPerMillionInput, output: cfg.costPerMillionOutput }; },
+        log: (tag, message) => assistantLog(tag, message),
+      });
+    } catch (err) {
+      // Nothing in this handler may throw (a rejection can carry null, or a value that has no string form):
+      // it is what keeps an engine that did not start from taking the Assistant down with it.
+      let reason = 'unknown error';
+      try { reason = String(err?.message || err || reason).slice(0, 300); } catch { /* an error that cannot be read */ }
+      assistantUserContext = null;
+      assistantUserContextError = reason;
+      console.warn('[assistant] user context unavailable:', reason);
+    }
+    // Greeting (lib/greeting/, docs/greeting.md): one greeting for every agent, written by the
+    // harness ahead of time and shown when a person comes back and opens a fresh session. It reads
+    // what SynaBun already records (thread records, session summaries, dispatched runs, schedules,
+    // what is known about the person) and writes with the same isolated one-shot the statement
+    // writer uses. Its own try/catch: without it every session opens quietly.
+    try {
+      const [
+        { createGreetingEngine }, { createGreetingSources }, { createGreetingWriter }, { createGreetingApi },
+        { createOneShot: createGreetingOneShot, cheapestClaudeModel: greetingCheapestModel }, greetingKnobs, { query: greetingClaudeQuery },
+      ] = await Promise.all([
+        import('./lib/greeting/engine.js'), import('./lib/greeting/sources.js'), import('./lib/greeting/writer.js'), import('./lib/greeting/api.js'),
+        import('./lib/assistant-user-writer.js'), import('../mcp-server/dist/services/typesafe-config.js'), import('@anthropic-ai/claude-agent-sdk'),
+      ]);
+      const greetingLog = (tag, message) => assistantLog(tag, message);
+      // Credentials out of anything read into a greeting (the same pattern list the memory writer redacts with).
+      const greetingRedact = typeof greetingKnobs.redactCredentials === 'function'
+        ? (text) => greetingKnobs.redactCredentials(String(text ?? ''))
+        : (text) => String(text ?? '');
+      _greeting = createGreetingEngine({
+        settingsPath: resolve(LOOP_DATA_DIR, 'greeting.json'),
+        statePath: resolve(LOOP_DATA_DIR, 'greeting-state.json'),
+        sources: createGreetingSources({
+          getDb: assistantGetDb,
+          listRuns: () => _assistantDispatcher?.list?.({ status: 'all', limit: 500 }) || [],
+          listSchedules: () => loadSchedules(),
+          projects: () => loadHookProjects(),
+          detectProject: assistantDetectProject,
+          sessionCategories: () => ['conversations', ...assistantCategories.getChildCategories('conversations').map((category) => category.name)],
+          // What is known about the person (the digest's ranking), while that layer is on.
+          knowledge: (project) => (assistantUserContext && assistantUserContext.layers().knowledge ? assistantUserContext.preview({ project }).rows : []),
+          // A conversation's working thread is newer than its memory (written 45 s after a turn).
+          workingThreads: () => Object.values(assistantUserContext?._internals?.state?.().threads || {}),
+          log: greetingLog,
+        }),
+        writer: createGreetingWriter({
+          oneShot: createGreetingOneShot({
+            claudeQuery: greetingClaudeQuery,
+            claudeExecutable: () => getClaudeSdkExecutable(),
+            model: () => greetingCheapestModel(assistantCatalog.peek?.() || null) || 'haiku',
+            accountEnv: () => claudeAccounts.envFor?.('default') || {},
+            cwd: DATA_HOME,
+            env: process.env,
+            label: 'greeting writer',
+            logTag: 'greeting:writer-error',
+            log: greetingLog,
+            // Two sentences from a short list of facts need no thinking: it only costs output tokens and seconds.
+            queryOptions: { effort: 'low', maxThinkingTokens: 0, thinking: { type: 'disabled' } },
+          }),
+          redact: greetingRedact,
+        }),
+        redact: greetingRedact,
+        broadcast: (event) => broadcastSync(event),
+        log: greetingLog,
+      });
+      _greetingRouter = createGreetingApi({
+        getEngine: () => _greeting,
+        getError: () => _greetingError,
+        isGuestRequest,
+        defaultProject: () => assistantDetectProject(assistantConfigStore.read().defaultBrain?.cwd || PACKAGE_ROOT) || 'global',
+        log: greetingLog,
+      });
+      _greetingError = null;
+      _greeting.start();
+    } catch (err) {
+      let reason = 'unknown error';
+      try { reason = String(err?.message || err || reason).slice(0, 300); } catch { /* an error that cannot be read */ }
+      _greeting = null;
+      _greetingRouter = null;
+      _greetingError = reason;
+      console.warn('[greeting] unavailable:', reason);
+    }
     app.use('/api/assistant/hidden-models', createAssistantHiddenModelsRouter({
       hiddenModels: assistantHiddenModels, catalog: assistantCatalog, opencodeStore: opencodeHiddenModels, isGuestRequest, broadcastSync,
     }));
@@ -25558,6 +25144,8 @@ _nativeLoopRuntime = new NativeLoopRuntime({
       router: assistantRouter, catalog: assistantCatalog, desktop: assistantDesktop,
       judge: assistantJev,
       clarifier: assistantClarifier,
+      // The session's Test density, read when a worker's prompt is composed (assistant-test-density.js).
+      testDensity: (sessionId) => _assistantRuntime?.testDensityFor?.(sessionId) ?? null,
     });
     _assistantRuntime = createAssistantRuntime({
       dispatcher: _assistantDispatcher,
@@ -25581,6 +25169,9 @@ _nativeLoopRuntime = new NativeLoopRuntime({
       pricing: assistantPricing,
       usage: assistantUsage,
       clarifier: assistantClarifier,
+      userContext: assistantUserContext,
+      // The greeting a conversation opened with (told to the brain once) and when the person was last here.
+      greeting: _greeting,
     });
     assistantDesktop?.attach?.({ runtime: _assistantRuntime, dispatcher: _assistantDispatcher });
     // Warm the catalog so brain capabilities (vision, tier) are known on first attach,
@@ -25638,6 +25229,10 @@ _nativeLoopRuntime = new NativeLoopRuntime({
       clarifier: assistantClarifier,
       // Composer uploads (the paperclip's non-inline files), next to data/images.
       attachments: createAttachmentStore({ root: resolve(DATA_HOME, 'data', 'attachments') }),
+      // Settings → Automation behavior: the layers and the digest a new conversation would get.
+      userContext: assistantUserContext,
+      userContextError: () => assistantUserContextError,
+      defaultProject: () => assistantDetectProject(assistantConfigStore.read().defaultBrain?.cwd || PACKAGE_ROOT) || 'global',
     }));
     const shutdownAssistant = () => {
       try { assistantRouter.shutdown(); } catch {}
@@ -25645,6 +25240,7 @@ _nativeLoopRuntime = new NativeLoopRuntime({
       try { assistantDesktop?.shutdown?.(); } catch {}
       try { _assistantRuntime?.shutdown?.(); } catch {}
       try { _assistantDispatcher?.shutdown?.(); } catch {}
+      try { _greeting?.shutdown?.(); } catch {}
       // Usage rows whose append failed get their last try (synchronous: an 'exit' handler runs it too).
       try { assistantUsage.flush(); } catch {}
     };
@@ -25654,6 +25250,8 @@ _nativeLoopRuntime = new NativeLoopRuntime({
     console.log('[assistant] runtime ready');
   } catch (err) {
     console.warn('[assistant] unavailable:', err.message);
+    // The greeting engine is built with the Assistant: Settings says why it is not there.
+    if (!_greeting && !_greetingError) { try { _greetingError = `The Assistant did not start: ${String(err?.message || err).slice(0, 240)}`; } catch { _greetingError = 'The Assistant did not start'; } }
   }
   // WhatsApp Link: after the runtime and dispatcher exist (its own guard; see startWhatsAppLink).
   await startWhatsAppLink();
@@ -26482,6 +26080,18 @@ app.post('/api/sessions/heartbeat', express.json(), (req, res) => {
   const { claudeSessionId } = req.body || {};
   if (!claudeSessionId) return res.status(400).json({ error: 'claudeSessionId required' });
   const entry = sessionRegistry.get(claudeSessionId);
+  // A person's own prompt (prompt-submit.mjs says so; a loop, a dispatched run, a subagent and the
+  // Assistant's brain never do): the greeting engine keeps when they were last here, and their
+  // last words as one short quote.
+  if (req.body?.human === true && _greeting && !isGuestRequest(req)) {
+    try {
+      _greeting.noteActivity({
+        cwd: (typeof req.body.cwd === 'string' && req.body.cwd) || entry?.cwd || null,
+        surface: req.body.surface === 'claude-panel' ? 'claude-panel' : 'claude-cli',
+        words: typeof req.body.words === 'string' ? req.body.words.slice(0, 400) : '',
+      });
+    } catch { /* the heartbeat itself never fails on it */ }
+  }
   if (entry) { entry.lastActivity = Date.now(); res.json({ ok: true }); }
   else res.status(404).json({ error: 'Session not registered' });
 });
@@ -26774,6 +26384,13 @@ function spawnGit(args, opts = {}) {
   return spawnSync('git', args, baseOpts);
 }
 
+// spawnGit for a command that only reads, in a folder a request named: nothing the repository's own configuration
+// names is started for it (lib/git-read.js: no file system monitor program, no hook, no external diff, no fetch).
+function spawnGitRead(args, opts = {}) {
+  const read = gitReadSync(opts.cwd, args, { env: opts.env });
+  return spawnGit(read.args, { ...opts, env: read.env });
+}
+
 function logGitFailure(where, err) {
   const msg = err?.stderr?.toString?.() || err?.message || String(err);
   if (!msg || /not a git repository/i.test(msg)) return;
@@ -26801,7 +26418,7 @@ setImmediate(() => {
 // repos owned by a different OS user/SID. Common on Windows external drives or repos
 // copied from another machine. Returns true only when git emits the specific error.
 function detectDubiousOwnership(dir) {
-  const r = spawnGit(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+  const r = spawnGitRead(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
   if (r.status === 0) return false;
   const stderr = r.stderr?.toString?.() || '';
   return /dubious ownership|safe\.directory/i.test(stderr);
@@ -26816,7 +26433,7 @@ function normalizeGitPath(dir) {
 /** Try to get git status for a directory. Returns { branch, statuses } or null. */
 function getGitInfo(dir) {
   // Check if inside a git work tree (spawnGit for consistent path resolution)
-  const inside = spawnGit(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+  const inside = spawnGitRead(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
   if (inside.status !== 0) {
     logGitFailure('rev-parse --is-inside-work-tree', inside.error || { stderr: inside.stderr });
     return null;
@@ -26827,27 +26444,27 @@ function getGitInfo(dir) {
   // then short SHA for detached HEAD. The chained fallback is essential for Windows users
   // with older Git for Windows installs where --show-current exits non-zero.
   let branch = '';
-  const showCurrent = spawnGit(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
+  const showCurrent = spawnGitRead(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
   if (showCurrent.status === 0) {
     branch = showCurrent.stdout.toString().trim();
   } else {
     logGitFailure('branch --show-current', showCurrent.error || { stderr: showCurrent.stderr });
   }
   if (!branch) {
-    const abbrev = spawnGit(['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir, timeout: 3000 });
+    const abbrev = spawnGitRead(['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir, timeout: 3000 });
     if (abbrev.status === 0) {
       const b = abbrev.stdout.toString().trim();
       if (b && b !== 'HEAD') branch = b;
     }
   }
   if (!branch) {
-    const shortSha = spawnGit(['rev-parse', '--short', 'HEAD'], { cwd: dir, timeout: 3000 });
+    const shortSha = spawnGitRead(['rev-parse', '--short', 'HEAD'], { cwd: dir, timeout: 3000 });
     if (shortSha.status === 0) branch = shortSha.stdout.toString().trim();
   }
 
   try {
     // Get status for this directory (porcelain v1: XY <path>)
-    const statusResult = spawnGit(['status', '--porcelain', '-u', '.'], { cwd: dir, maxBuffer: 256 * 1024 * 1024 });
+    const statusResult = spawnGitRead(['status', '--porcelain', '-u', '.'], { cwd: dir, maxBuffer: 256 * 1024 * 1024 });
     if (statusResult.status !== 0) {
       logGitFailure('status --porcelain', statusResult.error || { stderr: statusResult.stderr });
       return { branch, statuses: new Map() };
@@ -26973,7 +26590,7 @@ app.get('/api/terminal/branches', (req, res) => {
   const dir = req.query.path;
   if (!dir || typeof dir !== 'string') return res.status(400).json({ error: 'path required' });
 
-  const inside = spawnGit(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+  const inside = spawnGitRead(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
   if (inside.status !== 0) {
     logGitFailure('branches: rev-parse', inside.error || { stderr: inside.stderr });
     return res.json({ branches: [], current: null });
@@ -26982,11 +26599,11 @@ app.get('/api/terminal/branches', (req, res) => {
   try {
     // Current branch — chained fallback (older git may not support --show-current)
     let current = '';
-    const showCurrent = spawnGit(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
+    const showCurrent = spawnGitRead(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
     if (showCurrent.status === 0) current = showCurrent.stdout.toString().trim();
     else logGitFailure('branches: show-current', showCurrent.error || { stderr: showCurrent.stderr });
     if (!current) {
-      const abbrev = spawnGit(['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir, timeout: 3000 });
+      const abbrev = spawnGitRead(['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir, timeout: 3000 });
       if (abbrev.status === 0) {
         const b = abbrev.stdout.toString().trim();
         if (b && b !== 'HEAD') current = b;
@@ -26995,7 +26612,7 @@ app.get('/api/terminal/branches', (req, res) => {
 
     // All local branches — plain `git branch` parsed manually; avoids --format=%(refname:short)
     // which can get mangled by cmd.exe variable expansion on Windows even with proper quoting.
-    const branchResult = spawnGit(['branch'], { cwd: dir });
+    const branchResult = spawnGitRead(['branch'], { cwd: dir });
     if (branchResult.status !== 0) logGitFailure('branch list', branchResult.error || { stderr: branchResult.stderr });
     const raw = branchResult.status === 0 ? branchResult.stdout.toString() : '';
     // Plain `git branch` output: each line is "  branch" or "* branch" (current). Strip
@@ -27051,7 +26668,7 @@ app.post('/api/terminal/checkout', (req, res) => {
     return res.status(400).json({ error: 'Invalid branch name' });
   }
 
-  const inside = spawnGit(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+  const inside = spawnGitRead(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
   if (inside.status !== 0) {
     logGitFailure('checkout: rev-parse', inside.error || { stderr: inside.stderr });
     return res.status(400).json({ error: 'Not a git repository' });
@@ -27059,6 +26676,8 @@ app.post('/api/terminal/checkout', (req, res) => {
 
   // Branch is validated against /^[\w.\-/]+$/ above, so no shell metacharacters are possible.
   // No '--' separator — that would make git treat the branch name as a file pathspec.
+  // (The switch itself is a write and runs plainly, with the repository's post-checkout hook; the two questions
+  // around it are reads.)
   const result = spawnGit(['checkout', branch], { cwd: dir, timeout: 10000 });
   if (result.status !== 0) {
     const stderr = result.stderr?.toString?.()?.trim() || result.error?.message || 'Checkout failed';
@@ -27067,7 +26686,7 @@ app.post('/api/terminal/checkout', (req, res) => {
 
   // Return confirmed branch name + git's own output
   let current = '';
-  const showCurrent = spawnGit(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
+  const showCurrent = spawnGitRead(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
   if (showCurrent.status === 0) current = showCurrent.stdout.toString().trim();
   else logGitFailure('checkout: show-current', showCurrent.error || { stderr: showCurrent.stderr });
   const output = result.stderr?.toString?.()?.trim() || `Switched to branch '${current}'`;
@@ -27080,18 +26699,24 @@ const _gitStatusCache = new Map(); // dir -> { at, promise }
 const GIT_STATUS_TTL_MS = 1500;
 
 async function computeGitStatus(dir) {
+  // Each of these only reads: run as lib/git-read.js runs a read, so nothing the folder's own git configuration
+  // names is started (the route takes any folder).
+  const read = async (args, options) => {
+    const safe = await gitRead(dir, args);
+    return execFileAsync('git', safe.args, { cwd: dir, env: safe.env, ...options });
+  };
   try {
-    await execFileAsync('git', ['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+    await read(['rev-parse', '--is-inside-work-tree'], { timeout: 3000 });
   } catch {
     return { ok: true, isGit: false, branch: null, changes: [] };
   }
 
   const resolveBranch = async () => {
     try {
-      const { stdout } = await execFileAsync('git', ['branch', '--show-current'], { cwd: dir, timeout: 3000 });
+      const { stdout } = await read(['branch', '--show-current'], { timeout: 3000 });
       let branch = stdout.trim();
       if (!branch) {
-        const { stdout: head } = await execFileAsync('git', ['rev-parse', '--short', 'HEAD'], { cwd: dir, timeout: 3000 });
+        const { stdout: head } = await read(['rev-parse', '--short', 'HEAD'], { timeout: 3000 });
         branch = head.trim();
       }
       return branch;
@@ -27100,7 +26725,7 @@ async function computeGitStatus(dir) {
 
   const [branch, statusOut] = await Promise.all([
     resolveBranch(),
-    execFileAsync('git', ['status', '--porcelain'], { cwd: dir, timeout: 5000, maxBuffer: 256 * 1024 * 1024 }),
+    read(['status', '--porcelain'], { timeout: 5000, maxBuffer: 256 * 1024 * 1024 }),
   ]);
 
   const changes = [];
@@ -27128,7 +26753,29 @@ async function computeGitStatus(dir) {
   return { ok: true, isGit: true, branch, changes };
 }
 
-app.get('/api/git/status', async (req, res) => {
+// The folder a git route is asked about: inside a registered folder, as the disk resolves it (the rule of
+// GET /api/git/diff, lib/git-diff-api.js). Answers 403 itself and returns null for any other.
+function registeredGitFolder(asked, res) {
+  try { return confinedFolder(asked, allowedFileRoots()); }
+  catch (err) { res.status(err instanceof PathConfineError ? err.status : 403).json({ error: err?.message || 'Path outside registered project roots' }); return null; }
+}
+
+// git in a folder, by argument array and never through a shell: what it printed. It throws when git could not
+// be started, failed or took too long, as the command lines the /api/git routes used to run did. For reads only
+// (every caller is one): run as lib/git-read.js runs a read, so no program the repository's own configuration
+// names is started. `git add` and `git commit` are not run through here: a commit keeps the repository's hooks.
+function gitOutput(dir, args, { timeout = 5000, maxBuffer } = {}) {
+  const read = gitReadSync(dir, args);
+  const result = spawnSync('git', read.args, { cwd: dir, env: read.env, stdio: 'pipe', timeout, windowsHide: true, ...(maxBuffer ? { maxBuffer } : {}) });
+  if (result.error) throw result.error;
+  if (result.status !== 0) throw new Error(result.stderr?.toString?.()?.trim?.() || `git ${args[0]} failed`);
+  return result.stdout.toString();
+}
+
+// status, commit and generate-message are the owner's (editorOwnerGuard) and run git in the folder they are given,
+// registered or not: the MCP `git` tool asks for whatever folder an agent works in, and the Codex panel reads the
+// status before a branch switch.
+app.get('/api/git/status', editorOwnerGuard, async (req, res) => {
   const dir = req.query.path;
   if (!dir || typeof dir !== 'string') return res.status(400).json({ error: 'path required' });
 
@@ -27155,13 +26802,13 @@ app.get('/api/git/status', async (req, res) => {
   }
 });
 
-app.post('/api/git/commit', (req, res) => {
+app.post('/api/git/commit', editorOwnerGuard, (req, res) => {
   const { path: dir, message, files } = req.body;
-  if (!dir || !message) return res.status(400).json({ error: 'path and message required' });
+  if (!dir || typeof dir !== 'string' || !message) return res.status(400).json({ error: 'path and message required' });
   if (typeof message !== 'string' || message.trim().length === 0) return res.status(400).json({ error: 'Commit message cannot be empty' });
 
   try {
-    execSync('git rev-parse --is-inside-work-tree', { cwd: dir, stdio: 'pipe', timeout: 3000 });
+    gitOutput(dir, ['rev-parse', '--is-inside-work-tree'], { timeout: 3000 });
   } catch {
     return res.status(400).json({ error: 'Not a git repository' });
   }
@@ -27196,30 +26843,32 @@ app.post('/api/git/commit', (req, res) => {
   }
 });
 
-app.get('/api/git/diff-summary', (req, res) => {
-  const dir = req.query.path;
-  if (!dir || typeof dir !== 'string') return res.status(400).json({ error: 'path required' });
+app.get('/api/git/diff-summary', editorOwnerGuard, (req, res) => {
+  const asked = req.query.path;
+  if (!asked || typeof asked !== 'string') return res.status(400).json({ error: 'path required' });
+  const dir = registeredGitFolder(asked, res);
+  if (!dir) return;
 
   try {
-    execSync('git rev-parse --is-inside-work-tree', { cwd: dir, stdio: 'pipe', timeout: 3000 });
+    gitOutput(dir, ['rev-parse', '--is-inside-work-tree'], { timeout: 3000 });
   } catch {
     return res.status(400).json({ error: 'Not a git repository' });
   }
 
   try {
     // Get diff stat for tracked files
-    const stat = execSync('git diff --stat --stat-width=120', { cwd: dir, stdio: 'pipe', timeout: 5000 }).toString().trim();
+    const stat = gitOutput(dir, ['diff', '--stat', '--stat-width=120']).trim();
 
     // Get diff stat for staged files
-    const stagedStat = execSync('git diff --cached --stat --stat-width=120', { cwd: dir, stdio: 'pipe', timeout: 5000 }).toString().trim();
+    const stagedStat = gitOutput(dir, ['diff', '--cached', '--stat', '--stat-width=120']).trim();
 
     // Get untracked files
-    const untracked = execSync('git ls-files --others --exclude-standard', { cwd: dir, stdio: 'pipe', timeout: 5000 }).toString().trim();
+    const untracked = gitOutput(dir, ['ls-files', '--others', '--exclude-standard']).trim();
 
     // Get short diff for context (limited to avoid huge payloads)
-    const diff = execSync('git diff -U1 --no-color', { cwd: dir, stdio: 'pipe', timeout: 8000, maxBuffer: 64 * 1024 }).toString().substring(0, 4000);
+    const diff = gitOutput(dir, ['diff', '-U1', '--no-color'], { timeout: 8000, maxBuffer: 64 * 1024 }).substring(0, 4000);
 
-    const stagedDiff = execSync('git diff --cached -U1 --no-color', { cwd: dir, stdio: 'pipe', timeout: 8000, maxBuffer: 64 * 1024 }).toString().substring(0, 4000);
+    const stagedDiff = gitOutput(dir, ['diff', '--cached', '-U1', '--no-color'], { timeout: 8000, maxBuffer: 64 * 1024 }).substring(0, 4000);
 
     // Build a commit message from the changes
     const changedFiles = [];
@@ -27281,64 +26930,27 @@ app.get('/api/git/diff-summary', (req, res) => {
 
 // ── Git Diff (raw content) ──
 
-app.get('/api/git/diff', (req, res) => {
-  const dir = req.query.path;
-  if (!dir || typeof dir !== 'string') return res.status(400).json({ error: 'path required' });
-  const maxLines = Math.min(Math.max(parseInt(req.query.maxLines) || 500, 50), 2000);
-
-  try {
-    execSync('git rev-parse --is-inside-work-tree', { cwd: dir, stdio: 'pipe', timeout: 3000 });
-  } catch {
-    return res.status(400).json({ error: 'Not a git repository' });
-  }
-
-  try {
-    let branch = '';
-    try { branch = execSync('git branch --show-current', { cwd: dir, stdio: 'pipe', timeout: 3000 }).toString().trim(); } catch {}
-    if (!branch) try { branch = execSync('git rev-parse --short HEAD', { cwd: dir, stdio: 'pipe', timeout: 3000 }).toString().trim(); } catch {}
-
-    const rawDiff = execSync('git diff --no-color', { cwd: dir, stdio: 'pipe', timeout: 10000, maxBuffer: 2 * 1024 * 1024 }).toString();
-    const rawStaged = execSync('git diff --cached --no-color', { cwd: dir, stdio: 'pipe', timeout: 10000, maxBuffer: 2 * 1024 * 1024 }).toString();
-    const untracked = execSync('git ls-files --others --exclude-standard', { cwd: dir, stdio: 'pipe', timeout: 5000 }).toString().trim();
-
-    const truncate = (text) => {
-      const lines = text.split('\n');
-      if (lines.length <= maxLines) return { text, truncated: false };
-      return { text: lines.slice(0, maxLines).join('\n'), truncated: true };
-    };
-
-    const d = truncate(rawDiff);
-    const s = truncate(rawStaged);
-    const untrackedFiles = untracked ? untracked.split('\n').filter(Boolean) : [];
-
-    res.json({
-      ok: true,
-      branch,
-      diff: d.text,
-      stagedDiff: s.text,
-      untrackedFiles,
-      truncated: d.truncated || s.truncated
-    });
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
+// lib/git-diff-api.js: GET /api/git/diff. The folder is one of the registered roots (as for the editor's file
+// routes), git is run by argument array and only reads, and the route refuses invite guests by itself.
+app.use(createGitDiffRouter({ fileRoots: allowedFileRoots, guard: editorOwnerGuard }));
 
 // ── Git Log ──
 
-app.get('/api/git/log', (req, res) => {
-  const dir = req.query.path;
-  if (!dir || typeof dir !== 'string') return res.status(400).json({ error: 'path required' });
+app.get('/api/git/log', editorOwnerGuard, (req, res) => {
+  const asked = req.query.path;
+  if (!asked || typeof asked !== 'string') return res.status(400).json({ error: 'path required' });
+  const dir = registeredGitFolder(asked, res);
+  if (!dir) return;
   const count = Math.min(Math.max(parseInt(req.query.count) || 10, 1), 50);
 
   try {
-    execSync('git rev-parse --is-inside-work-tree', { cwd: dir, stdio: 'pipe', timeout: 3000 });
+    gitOutput(dir, ['rev-parse', '--is-inside-work-tree'], { timeout: 3000 });
   } catch {
     return res.status(400).json({ error: 'Not a git repository' });
   }
 
   try {
-    const raw = execSync(`git log --oneline --no-decorate -n ${count}`, { cwd: dir, stdio: 'pipe', timeout: 5000 }).toString().trim();
+    const raw = gitOutput(dir, ['log', '--oneline', '--no-decorate', '-n', String(count)]).trim();
     const commits = raw ? raw.split('\n').map(line => {
       const spaceIdx = line.indexOf(' ');
       return { hash: line.substring(0, spaceIdx), message: line.substring(spaceIdx + 1) };
@@ -27351,22 +26963,22 @@ app.get('/api/git/log', (req, res) => {
 
 // ── Git Generate Commit Message (AI-powered) ──
 
-app.post('/api/git/generate-message', async (req, res) => {
+app.post('/api/git/generate-message', editorOwnerGuard, async (req, res) => {
   const dir = req.body?.path;
   if (!dir || typeof dir !== 'string') return res.status(400).json({ error: 'path required' });
 
   try {
-    execSync('git rev-parse --is-inside-work-tree', { cwd: dir, stdio: 'pipe', timeout: 3000 });
+    gitOutput(dir, ['rev-parse', '--is-inside-work-tree'], { timeout: 3000 });
   } catch {
     return res.status(400).json({ error: 'Not a git repository' });
   }
 
   // Gather diff data — separate try/catch per command so one failure doesn't skip the rest
   let diffText = '', stagedText = '', untrackedList = '', recentCommits = '';
-  try { diffText = execSync('git diff --no-color', { cwd: dir, stdio: 'pipe', timeout: 8000, maxBuffer: 2 * 1024 * 1024 }).toString().substring(0, 4000); } catch {}
-  try { stagedText = execSync('git diff --cached --no-color', { cwd: dir, stdio: 'pipe', timeout: 8000, maxBuffer: 2 * 1024 * 1024 }).toString().substring(0, 4000); } catch {}
-  try { untrackedList = execSync('git ls-files --others --exclude-standard', { cwd: dir, stdio: 'pipe', timeout: 5000 }).toString().trim(); } catch {}
-  try { recentCommits = execSync('git log --oneline --no-decorate -n 5', { cwd: dir, stdio: 'pipe', timeout: 3000 }).toString().trim(); } catch {}
+  try { diffText = gitOutput(dir, ['diff', '--no-color'], { timeout: 8000, maxBuffer: 2 * 1024 * 1024 }).substring(0, 4000); } catch {}
+  try { stagedText = gitOutput(dir, ['diff', '--cached', '--no-color'], { timeout: 8000, maxBuffer: 2 * 1024 * 1024 }).substring(0, 4000); } catch {}
+  try { untrackedList = gitOutput(dir, ['ls-files', '--others', '--exclude-standard']).trim(); } catch {}
+  try { recentCommits = gitOutput(dir, ['log', '--oneline', '--no-decorate', '-n', '5'], { timeout: 3000 }).trim(); } catch {}
 
   const allDiff = (diffText + '\n' + stagedText).trim();
   if (!allDiff && !untrackedList) {
@@ -27419,8 +27031,8 @@ app.post('/api/git/generate-message', async (req, res) => {
   // Fallback: heuristic (same logic as /api/git/diff-summary)
   try {
     let stat = '', stagedStat = '';
-    try { stat = execSync('git diff --stat --stat-width=120', { cwd: dir, stdio: 'pipe', timeout: 5000, maxBuffer: 2 * 1024 * 1024 }).toString().trim(); } catch {}
-    try { stagedStat = execSync('git diff --cached --stat --stat-width=120', { cwd: dir, stdio: 'pipe', timeout: 5000, maxBuffer: 2 * 1024 * 1024 }).toString().trim(); } catch {}
+    try { stat = gitOutput(dir, ['diff', '--stat', '--stat-width=120'], { maxBuffer: 2 * 1024 * 1024 }).trim(); } catch {}
+    try { stagedStat = gitOutput(dir, ['diff', '--cached', '--stat', '--stat-width=120'], { maxBuffer: 2 * 1024 * 1024 }).trim(); } catch {}
     const changedFiles = [];
     for (const line of (stat + '\n' + stagedStat).split('\n').filter(l => l.includes('|'))) {
       const m = line.match(/^\s*(.+?)\s*\|/);
@@ -28618,7 +28230,7 @@ function isDroppableSidepanelProviderEvent(message) {
 function broadcastSync(message, excludeWs = null) {
   const data = JSON.stringify(message);
   const messageType = String(message?.type || '');
-  const ownerOnly = ['sidepanel:', 'schedule:', 'schedule-group:', 'quick-timer:', 'assistant:', 'whatsapp:']
+  const ownerOnly = ['sidepanel:', 'schedule:', 'schedule-group:', 'quick-timer:', 'assistant:', 'whatsapp:', 'editor:']
     .some((prefix) => messageType.startsWith(prefix));
   const dropUnderBackpressure = isDroppableSidepanelProviderEvent(message);
   let sent = 0;
@@ -29916,9 +29528,11 @@ async function createBrowserSession(options = {}) {
   // detection on sites like Twitter. Let the automated Chrome use its own default UA.
   const realHeaders = options._realHeaders || {};
   const userAgent = savedCfg.userAgent || undefined; // only override if explicitly configured
-  const cfgAcceptLang = savedCfg.acceptLanguage || null;
-  const acceptLanguage = cfgAcceptLang || realHeaders['accept-language'] || 'en-US,en;q=0.9';
-  const locale = savedCfg.locale || acceptLanguage.split(',')[0].split(';')[0] || 'en-US';
+  const { locale, acceptLanguage, languages, warnings: languageWarnings } =
+    resolveBrowserLanguage(savedCfg, realHeaders['accept-language']);
+  for (const warning of languageWarnings) {
+    console.warn(`[browser] Invalid ${warning.field}; using ${JSON.stringify(warning.value)}`);
+  }
 
   // Build context options from saved config
   const contextOpts = {
@@ -30053,7 +29667,7 @@ async function createBrowserSession(options = {}) {
       const cdpBrowser = await chromium.connectOverCDP(endpoint);
       let cdpContext = cdpBrowser.contexts()[0];
       if (!cdpContext) cdpContext = await cdpBrowser.newContext(contextOpts);
-      const cdpPage = await cdpContext.newPage(); // fresh tab; never hijack an existing one
+      const cdpPage = await newSessionPage({ browser: cdpBrowser, context: cdpContext, _profileMode: 'morelogin' }); // fresh tab; never hijack an existing one
 
       browser = cdpBrowser;
       context = cdpContext;
@@ -30218,7 +29832,7 @@ async function createBrowserSession(options = {}) {
         const cdpBrowser = await chromium.connectOverCDP(endpoint);
         let cdpContext = cdpBrowser.contexts()[0];
         if (!cdpContext) cdpContext = await cdpBrowser.newContext(contextOpts);
-        const cdpPage = await cdpContext.newPage(); // ALWAYS a fresh tab; never hijack a user tab
+        const cdpPage = await newSessionPage({ browser: cdpBrowser, context: cdpContext, _profileMode: 'cdp' }); // ALWAYS a fresh tab; never hijack a user tab
 
         browser = cdpBrowser;
         context = cdpContext;
@@ -30311,7 +29925,7 @@ async function createBrowserSession(options = {}) {
             ],
           });
           Object.defineProperty(navigator, 'languages', {
-            get: () => ${JSON.stringify(acceptLanguage.split(',').map(l => l.split(';')[0].trim()))},
+            get: () => ${JSON.stringify(languages)},
           });
           const origQuery = window.Permissions.prototype.query;
           window.Permissions.prototype.query = function(params) {
@@ -30637,6 +30251,30 @@ async function stopScreencast(session) {
 
 // ── Multi-tab helpers ──
 
+/**
+ * The page of a new tab, for every tab SynaBun opens in a browser the user
+ * shares with the runs (`_profileMode` morelogin or cdp): the first tab of a
+ * session (createBrowserSession, which has no session object yet and passes
+ * browser, context and mode), each further tab (createSessionTab) and the
+ * replacement of a wedged tab (recoverSessionTabPage).
+ *
+ * openTabsInBackground: true in browser-config.json (only that; not set or
+ * anything else, this is context.newPage() exactly as before) opens such a tab
+ * behind the selected one: the window is neither restored nor brought forward,
+ * and the tab is not the selected tab when it opens. It does not cover SynaBun's
+ * own windows (managed, mirror, direct and clean sessions), tabs a page opens
+ * itself, or what selects a tab afterwards (the user, or the selected tab
+ * closing next to it). A browser that cannot gets a normal tab.
+ */
+async function newSessionPage(session, { timeoutMs } = {}) {
+  if (loadBrowserConfig().openTabsInBackground === true && (session._profileMode === 'morelogin' || session._profileMode === 'cdp')) {
+    const page = await openBackgroundPage(session.browser, session.context, timeoutMs ? { timeoutMs } : undefined).catch(() => null);
+    if (page) return page;
+    console.warn('[browser] could not open the tab in the background; opening it as the selected tab');
+  }
+  return session.context.newPage();
+}
+
 /**
  * Create a new tab (page) in an existing browser session.
  * Returns { tabId, url, title }.
@@ -30645,7 +30283,7 @@ async function createSessionTab(session, sessionId, url = 'about:blank') {
   const tabId = randomBytes(4).toString('hex');
   const activeEntry = session.tabs?.get(session.activeTabId);
   const shouldAdoptAsActive = !activeEntry || activeEntry.page?.isClosed?.();
-  const page = await session.context.newPage();
+  const page = await newSessionPage(session);
   attachConsoleBuffer(page);
   if (url && url !== 'about:blank') {
     await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 15000 }).catch(() => {});
@@ -30696,7 +30334,8 @@ async function recoverSessionTabPage(session, sessionId, tabId, reason = 'page b
     };
     try {
       replacementPage = await withBrowserOperationDeadline(
-        session.context.newPage(),
+        // A background attempt gets half of the step, so a normal tab still fits after it.
+        newSessionPage(session, { timeoutMs: BROWSER_RECOVERY_STEP_DEADLINE_MS / 2 }),
         BROWSER_RECOVERY_STEP_DEADLINE_MS,
         'Creating replacement browser tab',
         {
@@ -30894,6 +30533,9 @@ async function _switchSessionTab(session, sessionId, tabId) {
 
   // Stop screencast on current tab
   await stopScreencast(session);
+  // The tab may have left the session while that was awaited (closed, retired):
+  // the aliases never take a page that is no longer registered.
+  if (session.tabs.get(tabId) !== tabEntry) throw new Error(`Tab ${tabId} not found`);
 
   // Switch aliases
   session.activeTabId = tabId;
@@ -30904,6 +30546,8 @@ async function _switchSessionTab(session, sessionId, tabId) {
 
   // Start screencast on new tab
   await startScreencast(session);
+  // Gone, or no longer the active tab, while that was awaited: nothing to announce.
+  if (session.tabs.get(tabId) !== tabEntry || session.activeTabId !== tabId) return;
 
   // Notify clients of the switch
   const msg = JSON.stringify({
@@ -30935,15 +30579,36 @@ async function closeSessionTab(session, sessionId, tabId) {
     return;
   }
 
-  // If closing the active tab, switch to another
+  // If closing the active tab, switch to another. The tab picked can itself be
+  // closed while the switch is awaited (two closes in one turn, or during a
+  // screencast stop): the switch then refuses it, because it never aliases a tab
+  // that left the registry, and a tab that is still registered is picked instead.
+  let switchError = null;
   if (session.activeTabId === tabId) {
-    const nextTabId = [...session.tabs.keys()][0];
-    await _switchSessionTab(session, sessionId, nextTabId);
+    for (let picks = 0; picks < 8 && session.activeTabId === tabId && session.tabs.size > 0; picks += 1) {
+      const nextTabId = session.tabs.keys().next().value;
+      const nextEntry = session.tabs.get(nextTabId);
+      try {
+        await _switchSessionTab(session, sessionId, nextTabId);
+      } catch (error) {
+        // Gone meanwhile: pick again. Still registered: the switch itself failed, reported once the page is closed.
+        if (session.tabs.get(nextTabId) === nextEntry) { switchError = error; break; }
+      }
+    }
+    // No tab took over (every other one left meanwhile): no alias stays on the tab that is closing.
+    if (session.activeTabId === tabId) {
+      session.activeTabId = null;
+      session.page = null;
+      session.cdpSession = null;
+      session.currentUrl = 'about:blank';
+      session.title = '';
+    }
   }
 
-  // Close the page
+  // Close the page, whatever the switch did: the tab has left the registry already
   try { await tabEntry.page.close(); } catch {}
   console.log(`[browser] Tab ${tabId} closed in session ${sessionId} (remaining: ${session.tabs.size})`);
+  if (switchError) throw switchError;
 }
 
 /**
@@ -31126,6 +30791,8 @@ function getTargetPage(session, req) {
     console.warn(`[browser] tab-pin-missing:legacy: refusing activeTab on owner-held session (id=${terminalId}, owners=${sessionOwnerCount(session)}) — returning 404 to avoid cross-automation leak`);
     return null;
   }
+  // No active page at all (the last tab closed or was retired): there is nothing to route to.
+  if (!session.page) return null;
   trackRoute(session, terminalId, session.activeTabId, 'legacy');
   return { page: session.page, cdpSession: session.cdpSession, tabId: session.activeTabId };
 }
@@ -32620,14 +32287,128 @@ app.post('/api/fetch-markdown', async (req, res) => {
 
 // GET …/screenshot-base64 — what browser_screenshot shows, plus breakpoint sizes
 // (width / height), full page and saving to a file (lib/browser-screenshot.js).
-// A tab whose own viewport could not be confirmed back after an emulated size
-// (viewportRestored: false) is closed, so no page — a MoreLogin profile's above
-// all — keeps a size, DPR or mobile flag it never had; the result says so.
+// The capture, putting the tab back and the state read after it share one budget,
+// the request deadline: the answer names the phase a capture stopped in and never
+// waits past it. A tab whose own width, height and devicePixelRatio could not be
+// confirmed when the capture answers is retired: out of routing at once, then
+// closed, so no page — a MoreLogin profile's above all — keeps a size, DPR or
+// mobile flag it never had. The result says so, and says "closed" only when the
+// close was confirmed.
 const SCREENSHOT_TAB_CLOSED = 'SynaBun could not confirm the tab was back at its own viewport size after the capture, so it closed the tab; the next browser call opens a fresh one.';
-async function retireScreenshotTab(session, sessionId, routed) {
-  console.warn(`[browser] closing tab ${routed.tabId} of session ${sessionId}: its viewport was not confirmed restored after a screenshot`);
-  const close = session.tabs?.size > 1 ? closeSessionTab(session, sessionId, routed.tabId) : routed.page.close();
-  await Promise.race([Promise.resolve(close).catch(() => {}), new Promise((done) => setTimeout(done, 3000))]);
+const SCREENSHOT_TAB_UNROUTED = 'SynaBun could not confirm the tab was back at its own viewport size after the capture, so it took the tab out of routing; closing it was not confirmed, so it may still be open in the browser window. The next browser call opens a fresh one.';
+// What building and sending the answer may take, out of the request deadline (a quarter of a deadline under four times this).
+const SCREENSHOT_ANSWER_MARGIN_MS = 500;
+// The longest the title read after a capture may take; never past the budget.
+const SCREENSHOT_STATE_READ_MS = 1000;
+
+/**
+ * Take a tab out of routing now, whatever becomes of its page: no later call
+ * reaches it (getTargetPage answers 404, and the caller's next browser call
+ * opens a fresh tab). What the page's close event does for a tab that closed,
+ * done here because that event is ignored for a tab no longer registered. Only
+ * while the tab id still names `page`: a wedged tab replaced meanwhile
+ * (recoverSessionTabPage keeps the id) has a fresh page under it, which stays.
+ *
+ * The registry entry and every alias of the page (session.page, cdpSession,
+ * activeTabId) go in the same tick, before anything is awaited or anyone is
+ * told: the switch to another tab is asynchronous and re-validates its target,
+ * so neither a second retirement in the same turn nor a screencast stop that
+ * hangs can leave the session pointing at a retired page. A client that cannot
+ * be told changes none of this. Announced as `browser:tab-retired`: the tab
+ * left routing; `browser:tab-closed` follows only when the close is confirmed.
+ */
+function unrouteScreenshotTab(session, sessionId, tabId, page) {
+  if (session.tabs?.get(tabId)?.page !== page) return;
+  session.tabs.delete(tabId);
+  const wasActive = session.activeTabId === tabId || session.page === page;
+  if (wasActive) {
+    session.activeTabId = null;
+    session.page = null;
+    session.cdpSession = null;
+    session.currentUrl = 'about:blank';
+    session.title = '';
+  }
+  // What follows only tells others; none of it may undo or skip the above.
+  const quietly = (what, work) => { try { work(); } catch (error) { console.warn(`[browser] retiring tab ${tabId} of session ${sessionId}: ${what} failed: ${error.message}`); } };
+  quietly('clearing its snapshot cache', () => clearAiSnapshotCache(sessionId, tabId));
+  // The session moves on to a tab that is left, also when an earlier retirement in this turn left it without one.
+  if (wasActive || session.activeTabId == null) {
+    const next = session.tabs.keys().next().value;
+    if (next !== undefined) {
+      _switchSessionTab(session, sessionId, next).catch(() => {});
+    } else {
+      session.clients?.forEach((ws) => quietly('telling a client that all tabs closed', () => {
+        if (ws.readyState === 1) {
+          ws.send(JSON.stringify({ type: 'error', message: 'All tabs closed' }));
+          ws.close(1000, 'All tabs closed');
+        }
+      }));
+      quietly('forgetting the clients', () => session.clients?.clear());
+    }
+  }
+  quietly('announcing it', () => broadcastSync({ type: 'browser:tab-retired', sessionId, tabId, remainingTabs: session.tabs.size }));
+}
+/**
+ * Retire a tab after a screenshot: out of routing before anything is awaited,
+ * then closed. `reason` is 'size' (its viewport could not be confirmed restored)
+ * or 'pending' (a capture of it may still be pending for good). The close is
+ * attempted whatever taking it out of routing and telling the clients did.
+ * `closed` settles true only when the page reports itself closed, and only then
+ * is `browser:tab-closed` announced; a close that fails, or never answers,
+ * leaves it false or pending, and the log says which.
+ */
+function retireScreenshotTab(session, sessionId, routed, reason = 'size') {
+  console.warn(`[browser] retiring tab ${routed.tabId} of session ${sessionId}: ${reason === 'pending'
+    ? 'a screenshot of it got no answer and may still be pending (its CDP session was never confirmed detached)'
+    : 'its viewport was not confirmed restored after a screenshot'}`);
+  // A wedged tab replaced meanwhile keeps its id for a fresh page: that tab neither left routing nor closes.
+  const registered = session.tabs?.get(routed.tabId)?.page === routed.page;
+  try {
+    unrouteScreenshotTab(session, sessionId, routed.tabId, routed.page);
+  } catch (error) {
+    console.warn(`[browser] taking retired tab ${routed.tabId} of session ${sessionId} out of routing failed part-way: ${error.message}`);
+  }
+  const closed = (async () => {
+    try {
+      await routed.page.close();
+    } catch (error) {
+      console.warn(`[browser] closing retired tab ${routed.tabId} of session ${sessionId} failed: ${error.message}`);
+    }
+    const confirmed = routed.page.isClosed?.() === true;
+    if (confirmed) {
+      console.log(`[browser] Retired tab ${routed.tabId} closed in session ${sessionId} (remaining: ${session.tabs.size})`);
+      if (registered) try { broadcastSync({ type: 'browser:tab-closed', sessionId, tabId: routed.tabId, remainingTabs: session.tabs.size }); } catch { /* the tab is closed either way */ }
+    } else {
+      console.warn(`[browser] retired tab ${routed.tabId} of session ${sessionId} is out of routing but its close was not confirmed; it may still be open in the browser window`);
+    }
+    return confirmed;
+  })();
+  return { closed };
+}
+/**
+ * One line per capture, success or failure, so what a capture depends on can be
+ * read back later (docs/browser-v2.md, "Reading the screenshot log"): session
+ * and tab, the window state CDP reported (for a failure the one read when it
+ * stopped, with `windowAtStart` when the one read as the capture began was
+ * another), whether the tab was the selected one as far as the server can tell
+ * (selectedTabReading: inferred from the order tabs were opened in, not
+ * measured), the outcome, the phase of a failure and the duration. A run's line
+ * also goes to its own log file.
+ */
+function logScreenshotCapture(req, sessionId, tabId, selected, record) {
+  const caller = (req.get && req.get('X-Synabun-Terminal')) || req.headers?.['x-synabun-terminal'] || null;
+  // The id names the log file: anything but a plain id goes to the console only.
+  const owner = typeof caller === 'string' && /^[\w-]{1,120}$/.test(caller) ? caller : null;
+  loopLog(owner, 'browser:screenshot',
+    `session=${sessionId} tab=${tabId} window=${record.windowState || 'unknown'} selected=${selected.reading} outcome=${record.outcome}${record.phase ? ` phase=${record.phase}` : ''} ms=${record.ms}`,
+    {
+      selectedBasis: selected.basis,
+      ...(record.code && { code: record.code }),
+      ...(record.windowAtStart !== record.windowState && { windowAtStart: record.windowAtStart || 'unknown' }),
+      ...(record.tab !== 'untouched' && { tabAfter: record.tab }),
+      ...(record.tab === 'retired' && { tabClosed: record.tabClosed === true }),
+      ...(record.capturePending && { capturePending: true }),
+    });
 }
 app.get('/api/browser/sessions/:id/screenshot-base64', async (req, res) => {
   const session = browserSessions.get(req.params.id);
@@ -32642,38 +32423,92 @@ app.get('/api/browser/sessions/:id/screenshot-base64', async (req, res) => {
   } catch (err) {
     return res.status(err.status || 400).json({ error: err.message });
   }
-  let tabClosed = false;
+  const started = Date.now();
+  // One budget for the capture, putting the tab back and the state read: the
+  // request deadline, less what sending the answer takes. The capture itself is
+  // given up on earlier (lib), so this route says which phase stopped it; at the
+  // deadline the caller would only see a bare timeout.
+  const requestDeadline = req.browserRequest ? req.browserRequest.deadline : started + 60_000;
+  const answerBy = requestDeadline - Math.min(SCREENSHOT_ANSWER_MARGIN_MS, Math.max(0, requestDeadline - started) / 4);
+  // Read before the capture: what the tab was when it began.
+  const selected = selectedTabReading(routed.page);
+  const known = session.tabs?.get(routed.tabId)?.title || '';
+  let record = null;
+  // The log line is built and written once the answer is with the operating
+  // system (or the client is gone), and guarded: a sink that throws or does not
+  // return costs the line, never the answer, its status or its time.
+  let logged = false;
+  const logCapture = () => {
+    if (logged || !record) return;
+    logged = true;
+    try {
+      logScreenshotCapture(req, req.params.id, routed.tabId, selected, record);
+    } catch (error) {
+      try { console.warn(`[browser] screenshot log line not written: ${error.message}`); } catch { /* nothing left to tell */ }
+    }
+  };
   try {
-    const shot = await captureScreenshot(routed.page, options, { runBounded: (work) => runBrowserRequest(req, work, 60_000) });
-    const state = await syncPageState(session, routed);
-    if (shot.viewportRestored === false) {
-      await retireScreenshotTab(session, req.params.id, routed);
-      tabClosed = true;
+    const shot = await captureScreenshot(routed.page, options, {
+      deadline: answerBy,
+      // Ends the capture early when the request is aborted; the deadline is the lib's.
+      runBounded: (work) => runBrowserRequest(req, work, 120_000),
+      retire: (reason) => retireScreenshotTab(session, req.params.id, routed, reason),
+      onRecord: (entry) => { record = entry; },
+    });
+    const retired = shot.tab === 'retired';
+    // The title read gets what is left of the budget; a retired tab is not asked.
+    const url = routed.page.url();
+    let title = known;
+    if (!retired) {
+      let timer;
+      const read = await Promise.race([
+        routed.page.title().catch(() => ''),
+        new Promise((done) => { timer = setTimeout(() => done(null), Math.max(1, Math.min(SCREENSHOT_STATE_READ_MS, answerBy - Date.now()))); }),
+      ]);
+      clearTimeout(timer);
+      if (read !== null) {
+        title = read;
+        if (routed.tabId === session.activeTabId) { session.currentUrl = url; session.title = title; }
+      }
     }
     let savedPath = null;
     if (shot.fileData) {
       const target = options.path
         ? resolve(options.path)
-        : defaultScreenshotPath({ dataHome: DATA_HOME, pageUrl: state.url, width: shot.width, height: shot.height, format: options.fileFormat });
+        : defaultScreenshotPath({ dataHome: DATA_HOME, pageUrl: url, width: shot.width, height: shot.height, format: options.fileFormat });
       // Checked again as it is written: the capture may have taken a minute.
       savedPath = writeScreenshotFile(target, Buffer.from(shot.fileData, 'base64'), { dataHome: DATA_HOME });
     }
     res.json({
-      ok: true, url: state.url, title: state.title,
+      ok: true, url, title,
       data: shot.data, mime: shot.mime,
       width: shot.width, height: shot.height, imageWidth: shot.imageWidth, imageHeight: shot.imageHeight,
       fullPage: shot.fullPage,
       ...(shot.truncated && { truncated: true }),
       ...(shot.emulated && { viewport: shot.emulated }),
       ...(savedPath && { savedPath, format: options.fileFormat }),
-      ...(tabClosed && { tabClosed: true, notice: SCREENSHOT_TAB_CLOSED }),
+      ...(retired && { tabRetired: true, tabClosed: shot.tabClosed === true, notice: shot.tabClosed === true ? SCREENSHOT_TAB_CLOSED : SCREENSHOT_TAB_UNROUTED }),
     });
   } catch (err) {
-    if (err?.viewportRestored === false && !tabClosed) {
-      await retireScreenshotTab(session, req.params.id, routed);
-      tabClosed = true;
-    }
-    res.status(err.status || 500).json({ error: tabClosed ? `${err.message}. ${SCREENSHOT_TAB_CLOSED}` : err.message, ...(tabClosed && { tabClosed: true }) });
+    // A failure of the capture itself, not of what came after it (the file).
+    const captureFailed = !!record && record.outcome !== 'ok';
+    // What became of the tab is said either way: a capture that worked can have retired it too.
+    const retired = record?.tab === 'retired';
+    const closed = record?.tabClosed === true;
+    const after = retired ? (closed ? SCREENSHOT_TAB_CLOSED : SCREENSHOT_TAB_UNROUTED) : captureFailed && record.tab === 'restored' ? 'The tab is back at its own size.' : '';
+    res.status(err.status || 500).json({
+      error: after ? `${err.message}${/[.!?]$/.test(err.message) ? '' : '.'} ${after}` : err.message,
+      ...(err.code && { code: err.code }),
+      ...(err.phase && { phase: err.phase }),
+      // What the capture depends on, for a caller that reads fields: the window state CDP reported when the
+      // capture stopped (with the one from when it began, when that was another) and the selected-tab reading.
+      ...(captureFailed && { windowState: err.windowState ?? null, ...((err.windowAtStart ?? null) !== (err.windowState ?? null) && { windowAtStart: err.windowAtStart ?? null }), selectedTab: selected.reading }),
+      ...(retired && { tabRetired: true, tabClosed: closed }),
+      ...(err.capturePending && { capturePending: true }),
+    });
+  } finally {
+    if (res.writableFinished || res.destroyed) logCapture();
+    else { res.once('finish', logCapture); res.once('close', logCapture); }
   }
 });
 
@@ -32824,10 +32659,14 @@ app.get('/api/browser/config', (req, res) => {
 app.put('/api/browser/config', (req, res) => {
   try {
     // Full replacement — the frontend sends the complete config object
-    const body = req.body || {};
+    const body = validateBrowserLanguageConfig(req.body || {});
     if (body.connectMode !== undefined) body.connectMode = ['attach', 'morelogin'].includes(body.connectMode) ? body.connectMode : 'mirror';
     if (body.attachSeed !== undefined) body.attachSeed = body.attachSeed === 'fresh' ? 'fresh' : 'real';
     if (body.moreloginEnvId !== undefined && body.moreloginEnvId !== null && body.moreloginEnvId !== '') body.moreloginEnvId = String(body.moreloginEnvId);
+    // openTabsInBackground is not in the Settings form: a save from the form keeps
+    // it. What it covers is said at newSessionPage, which reads it.
+    const savedBackgroundTabs = loadBrowserConfig().openTabsInBackground;
+    if (body.openTabsInBackground === undefined && typeof savedBackgroundTabs === 'boolean') body.openTabsInBackground = savedBackgroundTabs;
     saveBrowserConfig(body);
     // The in-process MCP drops its cached browser routes now; MCP processes of their
     // own do on their next /api/browser response (X-Synabun-Browser-Default).
@@ -32836,7 +32675,8 @@ app.put('/api/browser/config', (req, res) => {
       .catch(() => {});
     res.json({ ok: true });
   } catch (err) {
-    res.status(500).json({ error: err.message });
+    const invalidLanguage = err.status === 400 && ['locale', 'acceptLanguage'].includes(err.field);
+    res.status(invalidLanguage ? 400 : 500).json({ error: err.message, ...(invalidLanguage && { field: err.field }) });
   }
 });
 
@@ -32966,6 +32806,16 @@ const httpServer = app.listen(PORT, async () => {
     setKvConfig('embedding_dims', String(EMBEDDING_DIMS));
   } catch {}
 
+  // Keep the Start Server launcher (synabun://) pointing at this install even
+  // when the server was started directly rather than through setup.js. Writes
+  // only what differs; skipped for test runs and throwaway data homes.
+  try {
+    const launcher = registerStartLauncher({ packageRoot: PACKAGE_ROOT });
+    _startLauncherState = launcher.state === 'skipped' ? startLauncherState({ packageRoot: PACKAGE_ROOT }) : launcher.state;
+    if (launcher.changed) console.log('[server] Start Server launcher registered (synabun://)');
+    else if (!launcher.ok) console.warn(`[server] Start Server launcher not registered: ${launcher.errors[0]}`);
+  } catch {}
+
   // Auto-heal legacy synabun-symlink plugin state and reinstall via CC CLI
   try {
     const repair = pluginInstaller.repairSynabunPlugins();
@@ -33013,10 +32863,9 @@ const httpServer = app.listen(PORT, async () => {
   // opencode-<sid> node_modules that never got their per-loop cleanup.
   setTimeout(() => { try { cleanupStaleLoopConfigs(); } catch {} }, 1500);
 
-  // Compare the installed Claude CLI with the one the Agent SDK bundles now, so
-  // the first sidepanel session or native loop after boot already knows whether
-  // to run the installed CLI (it does when that one is newer — see
-  // alignedClaudeExecutable in lib/claude-model-catalog.js).
+  // Compare the installed Claude CLI with the release the Agent SDK was built
+  // against, once, so an older installation is named in the log before the
+  // first session runs on it (checkClaudeCliSkew in lib/claude-model-catalog.js).
   setTimeout(() => { checkClaudeCliSkew(getClaudeBin()).catch(() => {}); }, 1000);
 
   // Warm the session_cache + session_fts tables so the hybrid search has data
@@ -33130,10 +32979,10 @@ const httpServer = app.listen(PORT, async () => {
   // Check for SynaBun updates (npm + github releases)
   try { await checkSynabunUpdate(); } catch {}
 
-  // Aggressively prune any stale bundled CLI tools left in our node_modules
-  // before the version check runs — defends against `npm install` not auto-
-  // pruning packages that were removed from package.json (recurring source of
-  // phantom-version badges, e.g. v2.1.89 from a stale @anthropic-ai/claude-code).
+  // Prune any external CLI tool left in our node_modules before the version
+  // check runs — defends against `npm install` not auto-pruning packages that
+  // were removed from package.json (recurring source of phantom-version
+  // badges, e.g. v2.1.89 from a stale @anthropic-ai/claude-code).
   try { pruneBundledCliTools(); } catch {}
 
   // Check for CLI tool updates — fire-and-forget so boot isn't serialized
@@ -33161,8 +33010,26 @@ const httpServer = app.listen(PORT, async () => {
 // zlib adds per-frame CPU + latency on the terminal hot path.
 const wss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
 
-/** Public origins SynaBun is reached through: the running Cloudflare tunnel and the invite proxy in use (ui-invite.js). Their host names are the only non-local names the WebSocket Origin check accepts in a Host header. */
+/** Public origins SynaBun is reached through: the running Cloudflare tunnel, the invite proxy in use (ui-invite.js) and the names of SYNABUN_ALLOWED_HOSTS. Their host names are the only non-local names the Host rule (HTTP: lib/request-gate.js; WebSocket Origin check; the editor's routes) accepts. */
 function publicWebOrigins() {
+  // The tunnel's and the invite proxy's addresses are the names requests from outside arrive under, never the
+  // owner's own. In this list only the owner's own names stand without a scheme (lib/http-guards.js accepts the
+  // pages of such a host as an Origin on any port): an invite address that was saved without one stands as its
+  // https origin, and a name of SYNABUN_ALLOWED_HOSTS that is one of theirs adds nothing.
+  const outside = remoteWebOrigins();
+  const theirs = hostsOf(outside);
+  const origins = outside.map((each) => (hostNameOf(each) ? `https://${each}` : each));
+  // Names the owner added: SYNABUN_ALLOWED_HOSTS as the server was started with it (the shell's own value: it
+  // keeps applying), and the line of the data home's .env as it is now, read with dotenv's own parser
+  // (savedValueOf): the line counts for what dotenv gave it when the server started. A name added to the file is
+  // answered at the next request, and one taken out of it is refused at the next request: no restart either way.
+  const own = extraHostNames(startedAllowedHosts.value, savedValueOf(ENV_PATH));
+  origins.push(...own.filter((each) => each.includes('://') || !theirs.includes(hostNameOf(each))));
+  return origins;
+}
+
+/** The names requests from outside arrive under: the running Cloudflare tunnel's and the invite proxy's in use. Whatever names one of them is remote, with CF-Connecting-IP or without (lib/request-gate.js isRemote): it needs an invite session and is never the owner. The names of SYNABUN_ALLOWED_HOSTS are not among them: those are the owner's own for this computer. */
+function remoteWebOrigins() {
   const origins = [];
   if (tunnelUrl) origins.push(tunnelUrl);
   const proxy = loadInviteProxy();
@@ -33170,9 +33037,20 @@ function publicWebOrigins() {
   return origins;
 }
 
-httpServer.on('upgrade', (req, socket, head) => {
-  // Block tunnel traffic from WebSocket upgrades, except cookie-authenticated invite sessions
-  if (req.headers['cf-connecting-ip'] && !isValidInviteSession(req)) {
+httpServer.on('upgrade', function onUpgrade(req, socket, head) {
+  // The Host rule first, as in front of every route (lib/request-gate.js): an upgrade whose Host is not one of
+  // this server's names is refused, on every /ws/* path and with an Origin or without one. The Origin rule
+  // below lets a client without an Origin pass, so without this a request under any name reached /ws/sync and
+  // the terminal handoff. A name that is not known while this computer's names are still being read (its
+  // Bonjour name right after a start) is asked again when they are, as a route's request is: the handler then
+  // starts over, once. A name that is known never waits.
+  if (!requestGates.ownHost(req)) {
+    if (!requestGates.ownHostAfterNames(req, socket, () => onUpgrade(req, socket, head))) refuseUpgrade(socket, 403);
+    return;
+  }
+
+  // What comes in from outside (the tunnel, the invite proxy's name) opens no socket without an invite session
+  if (requestGates.isRemote(req) && !isValidInviteSession(req)) {
     socket.destroy();
     return;
   }
@@ -33936,7 +33814,9 @@ process.on('exit', () => {
   try { restoreSleepSync(); } catch {}
   try { terminalHost.killNow(); } catch {}
   try { _whatsapp?.killNow(); } catch {}
+  try { tunnel.killNow(); } catch {}
   try { stopOpencodeServer(); } catch {}
+  try { editorCompletionServe.stop('exit'); } catch {}
   try { _claudeBridge?.shutdownAllBridges?.(); } catch {}
   try { saveSessionSnapshot(); } catch {}
   try { flushUiStateSync(); } catch {}