clay-server 5.1.0-beta.2 → 6.0.0-beta.1

package/lib/project-sessions.js

@@ -1,6 +1,6 @@
+var serverSettingsMessages = require("./project-server-settings");
 var fs = require("fs");
 var path = require("path");
-var crypto = require("crypto");
 var { execFileSync } = require("child_process");
 var { CODEX_DEFAULTS, getCodexConfig } = require("./codex-defaults");
 var updateSnooze = require("./update-snooze");
@@ -217,16 +217,6 @@ function attachSessions(ctx) {
     return opts.canAccessProjectSlug(userId, targetSlug) === true;
   }
 
-  // Resolve the active user's Claude open-mode preference ('gui' or 'tui').
-  // Multi-user mode reads per-user storage; single-user mode falls back to
-  // the daemon-level default ('gui').
-  function getClaudeOpenModeForWs(ws) {
-    if (!usersModule || typeof usersModule.getClaudeOpenMode !== "function") return "gui";
-    var uid = ws && ws._clayUser ? ws._clayUser.id : null;
-    if (!uid) return "gui";
-    try { return usersModule.getClaudeOpenMode(uid) || "gui"; } catch (e) { return "gui"; }
-  }
-
   // Resolve the home directory where Claude Code writes JSONL for a
   // given session. In OS-isolation mode each Clay user runs as a real
   // Linux account so JSONL lives under /home/clay-name; for single-user
@@ -396,8 +386,8 @@ function attachSessions(ctx) {
     };
   }
 
-  // Spawn a transient PTY for "view this Claude GUI session as TUI" (the
-  // user's claudeOpenMode is 'tui'). The session itself stays a GUI session
+  // Resume a legacy terminal session without rewriting its saved origin.
+  // The session itself keeps its original mode
   // on disk; we only attach a runtime terminal so xterm can render
   // `claude --resume <cliSessionId>`. When the PTY dies the runtime link
   // clears and the next click can re-attach without converting the session.
@@ -441,8 +431,7 @@ function attachSessions(ctx) {
   // current click. Reads the CLI jsonl transcript (cli-sessions.js),
   // populates session.history, and tears
   // down the PTY. The born-TUI marker (session.mode === 'tui') is kept on
-  // disk so that flipping claudeOpenMode back to 'tui' later restores the
-  // embedded-terminal experience instead of locking the session as GUI.
+  // disk to preserve the session's origin and compatibility metadata.
   //
   // Idempotent: if the PTY is already gone and history is populated, this
   // is a no-op (avoids re-reading jsonl and re-writing the session file on
@@ -486,8 +475,7 @@ function attachSessions(ctx) {
   function resolveSessionForView(session, ws) {
     if (!session) return;
     if (session.vendor && !vendorSupportsTui(session.vendor)) { session.tuiSuspended = false; return; }
-    var pref = getClaudeOpenModeForWs(ws);
-    // A LIVE runtime always wins over the viewer's claudeOpenMode pref:
+    // Preserve a live runtime across this feature's retirement:
     // another user (or this user in another tab) may be in the session right
     // now, so we join it in whatever mode it is actually running and never
     // convert or kill it. "tui stays tui, gui stays gui."
@@ -512,23 +500,14 @@ function attachSessions(ctx) {
       session.tuiSuspended = false;
       return;
     }
-    // Cold session: apply the viewer's pref.
+    // Retired terminal presentation preferences never affect an idle session.
     if (session.mode === "tui") {
-      if (pref === "gui") {
-        prepareTuiSessionForGuiView(session);
-        session.runtimeMode = "gui";
-        session.runtimeTerminalId = null;
-        session.tuiSuspended = false;
-      } else {
-        prepareTuiSessionForGuiView(session);
-        session.runtimeMode = null;
-        session.runtimeTerminalId = null;
-        session.tuiSuspended = true;
-      }
+      prepareTuiSessionForGuiView(session);
+      session.runtimeMode = "gui";
+      session.runtimeTerminalId = null;
+      session.tuiSuspended = false;
     } else {
-      // Born-GUI: always GUI. We no longer auto-convert a GUI session to a
-      // `claude --resume` terminal on a pref=tui click - that hijacked shared
-      // GUI sessions in multi-user. Such sessions render as their SDK chat.
+      // Chat sessions always retain their SDK presentation.
       session.runtimeMode = null;
       session.tuiSuspended = false;
     }
@@ -593,6 +572,7 @@ function attachSessions(ctx) {
   }
 
   function handleSessionsMessage(ws, msg) {
+    if (serverSettingsMessages.handleServerSettings({ opts: opts, usersModule: usersModule, sendTo: sendTo, send: send }, ws, msg)) return true;
     if (contextUsage.handleMessage(ws, msg)) return true;
 
     if (msg.type === "push_subscribe") {
@@ -700,95 +680,27 @@ function attachSessions(ctx) {
       sessionOpts.sessionVisibility = visibilityChoice.visibility;
       if (msg.vendor) sessionOpts.vendor = msg.vendor;
       if (isMate && msg._mateDefaultsToken === mateDefaultsToken) sessionOpts.model = msg.model;
-      // Mode resolution: vendors without a TUI session mode are always GUI.
-      // TUI-capable sessions honor the explicit msg.mode if provided, otherwise
-      // fall back to the user's claudeOpenMode preference. This is what
-      // makes the sidebar's "Claude" icon button create the right kind of
-      // session without the client needing to know the preference.
-      var requestedMode;
-      if (msg.vendor && !vendorSupportsTui(msg.vendor)) {
-        requestedMode = "gui";
-      } else if (msg.mode === "tui" || msg.mode === "gui") {
-        requestedMode = msg.mode;
-      } else {
-        requestedMode = getClaudeOpenModeForWs(ws);
-      }
       var newSess;
-      if (requestedMode === "tui") {
-        // TUI sessions own their cliSessionId up-front so we can launch
-        // `claude --session-id <uuid>` and resume the same conversation
-        // from external terminals (claude --resume <uuid>) and from the
-        // jsonl watcher (~/.claude/projects/<cwd>/<uuid>.jsonl).
-        //
-        // Construction order matters: createSession() fires session_switched
-        // synchronously, so we must populate terminalId on the record before
-        // switching. Use createSessionRaw + switchSession to get the right
-        // ordering and avoid an extra rebroadcast.
-        sessionOpts.mode = "tui";
-        sessionOpts.cliSessionId = crypto.randomUUID();
-        sessionOpts.vendor = sessionOpts.vendor || "claude";
-        // Per-session bypass-permissions: TUI shell command only. The flag is
-        // persisted on the session so lazy-resume re-spawns the same way.
-        if (msg.dangerouslySkipPermissions) sessionOpts.dangerouslySkipPermissions = true;
-        newSess = sm.createSessionRaw(sessionOpts);
-        if (tm) {
-          var tuiSid = newSess.cliSessionId;
-          var tuiLocalId = newSess.localId;
-          var tuiSkip = newSess.dangerouslySkipPermissions ? " --dangerously-skip-permissions" : "";
-          var tuiCmd = "claude --session-id " + tuiSid + tuiSkip + "; exit\n";
-          var tuiTerm = tm.create(80, 24, getOsUserInfoForWs(ws), ws, {
-            initialInput: tuiCmd,
-            kind: "tui-session",
-            title: "claude " + tuiSid.slice(0, 8),
-            onExit: function (termSession) {
-              var s = sm.sessions.get(tuiLocalId);
-              if (!s) return;
-              if (termSession && termSession.reclaimed) {
-                // Reclaimed (idle sweep or explicit Close), not a real /exit:
-                // keep the session (its jsonl transcript stays on disk and
-                // lazy-resume can re-spawn claude). Just drop the dead PTY link.
-                s.terminalId = null;
-                try { sm.saveSessionFile(s); } catch (e) {}
-                try { sm.broadcastSessionList(); } catch (e) {}
-              } else {
-                try { sm.deleteSessionQuiet(tuiLocalId); } catch (e) {}
-                try { sm.broadcastSessionList(); } catch (e) {}
-              }
-            },
-            onData: makeTuiActivityHook(tuiLocalId),
-          });
-          if (tuiTerm) {
-            newSess.terminalId = tuiTerm.id;
-          }
-        }
-        // Persist immediately so the session reappears in the sidebar
-        // after a daemon restart (the SDK path saves on stream events,
-        // but TUI sessions never produce any so this is our only chance).
-        try { sm.saveSessionFile(newSess); } catch (e) {}
-        startTitleWatcher(newSess);
-        sm.switchSession(newSess.localId, ws);
+      var newSessionVendor = sessionOpts.vendor || sm.defaultVendor || "claude";
+      var newSessionEffort = isMate && msg._mateDefaultsToken === mateDefaultsToken
+        ? (msg.effort || "")
+        : ((sm.currentEffortByVendor && sm.currentEffortByVendor[newSessionVendor]) || sm.currentEffort || "medium");
+      sessionOpts.effort = yoke.clampEffort(newSessionVendor, newSessionEffort) || null;
+      // Reuse an existing blank GUI session instead of stacking another
+      // one. A vendor-less blank is acceptable: nothing has happened in it,
+      // so stamping the requested vendor is equivalent to a fresh create.
+      var reusable = msg.forceNew === true ? null : sm.findReusableBlankSession({
+        vendor: sessionOpts.vendor || null,
+        ownerId: sessionOpts.ownerId || null,
+      });
+      if (reusable) {
+        if (sessionOpts.vendor && reusable.vendor !== sessionOpts.vendor) reusable.vendor = sessionOpts.vendor;
+        if (!reusable.effort) reusable.effort = sessionOpts.effort;
+        // Reusable blanks already exist; do not retroactively change them.
+        sm.switchSession(reusable.localId, ws);
+        newSess = reusable;
       } else {
-        var newSessionVendor = sessionOpts.vendor || sm.defaultVendor || "claude";
-        var newSessionEffort = isMate && msg._mateDefaultsToken === mateDefaultsToken
-          ? (msg.effort || "")
-          : ((sm.currentEffortByVendor && sm.currentEffortByVendor[newSessionVendor]) || sm.currentEffort || "medium");
-        sessionOpts.effort = yoke.clampEffort(newSessionVendor, newSessionEffort) || null;
-        // Reuse an existing blank GUI session instead of stacking another
-        // one. A vendor-less blank is acceptable: nothing has happened in it,
-        // so stamping the requested vendor is equivalent to a fresh create.
-        var reusable = msg.forceNew === true ? null : sm.findReusableBlankSession({
-          vendor: sessionOpts.vendor || null,
-          ownerId: sessionOpts.ownerId || null,
-        });
-        if (reusable) {
-          if (sessionOpts.vendor && reusable.vendor !== sessionOpts.vendor) reusable.vendor = sessionOpts.vendor;
-          if (!reusable.effort) reusable.effort = sessionOpts.effort;
-          // Reusable blanks already exist; do not retroactively change them.
-          sm.switchSession(reusable.localId, ws);
-          newSess = reusable;
-        } else {
-          newSess = sm.createSession(sessionOpts, ws);
-        }
+        newSess = sm.createSession(sessionOpts, ws);
       }
       ws._clayActiveSession = newSess.localId;
       var folderPlaced = msg.folderId === undefined ? null : sessionFolders.placeNewSession(ws, newSess, msg.folderId, msg.folderSlug);
@@ -881,14 +793,11 @@ function attachSessions(ctx) {
         // resolveSessionForView sets runtimeMode / runtimeTerminalId /
         // tuiSuspended (and hydrates the transcript) before sm.switchSession
         // broadcasts session_switched. A live runtime keeps its actual mode
-        // for every viewer; only cold sessions follow the clicker's
-        // claudeOpenMode pref. Nothing is spawned here.
+        // for every viewer; idle sessions open in chat. Nothing is spawned here.
         var xmTarget = sm.sessions.get(msg.id);
         if (xmTarget && (!xmTarget.vendor || vendorSupportsTui(xmTarget.vendor))) {
           // Single source of truth: live runtime wins (tui stays tui, gui stays
-          // gui); only cold sessions follow the viewer's pref. No PTY is spawned
-          // on switch - born-TUI resumes lazily via the Resume bar
-          // (resume_tui_session), and born-GUI never auto-converts to a terminal.
+          // gui); idle legacy sessions hydrate their transcript into chat.
           resolveSessionForView(xmTarget, ws);
         }
         var switchTargetSess = sm.sessions.get(msg.id);
@@ -1063,12 +972,17 @@ function attachSessions(ctx) {
     }
 
     if (msg.type === "set_update_channel") {
-      if (!updateSnooze.isUpdateAdmin(ws, usersModule)) return true;
+      if (!updateSnooze.isUpdateAdmin(ws, usersModule)) { sendTo(ws, { type: "set_update_channel_result", ok: false, error: "Administrator access required." }); return true; }
       var newChannel = msg.channel === "beta" ? "beta" : "stable";
-      setUpdateChannel(newChannel);
-      setLatestVersion(null);
-      if (typeof opts.onSetUpdateChannel === "function") {
+      try {
+        if (typeof opts.onSetUpdateChannel !== "function") throw new Error("Release channel cannot be saved in this runtime.");
         opts.onSetUpdateChannel(newChannel);
+        setUpdateChannel(newChannel);
+        setLatestVersion(null);
+        sendTo(ws, { type: "set_update_channel_result", ok: true, timing: "Future update checks use this channel." });
+      } catch (error) {
+        sendTo(ws, { type: "set_update_channel_result", ok: false, error: error.message });
+        return true;
       }
       // Re-fetch with new channel and broadcast to admin clients, honouring
       // any snooze each of them has on the version that comes back.
@@ -1095,7 +1009,7 @@ function attachSessions(ctx) {
         } else {
           sendTo(ws, { type: "up_to_date", version: currentVersion });
         }
-      }).catch(function () {});
+      }).catch(function () { sendTo(ws, { type: "update_check_failed", error: "Could not check for updates. Retry when the server can reach the release service." }); });
       return true;
     }
 
@@ -2150,9 +2064,9 @@ function attachSessions(ctx) {
     if (msg.type === "get_daemon_config" || msg.type === "set_pin" || msg.type === "set_keep_awake" ||
         msg.type === "set_auto_continue" || msg.type === "set_inherit_groups" || msg.type === "set_image_retention" || msg.type === "shutdown_server" || msg.type === "restart_server") {
       if (usersModule.isMultiUser()) {
-        var _wsUser = ws._clayUser;
+        var _wsUser = ws._clayUser && usersModule.findUserById(ws._clayUser.id);
         if (!_wsUser || _wsUser.role !== "admin") {
-          sendTo(ws, { type: "error", message: "Admin access required" });
+          sendTo(ws, { type: msg.type + "_result", ok: false, error: "Administrator access required." });
           return true;
         }
       }
@@ -2160,28 +2074,15 @@ function attachSessions(ctx) {
 
     if (msg.type === "get_daemon_config") {
       if (typeof opts.onGetDaemonConfig === "function") {
-        var daemonConfig = opts.onGetDaemonConfig();
-        sendTo(ws, { type: "daemon_config", config: daemonConfig });
-      }
+        try { sendTo(ws, { type: "daemon_config", config: opts.onGetDaemonConfig() }); }
+        catch (error) { sendTo(ws, { type: "daemon_config", config: { error: 'Server configuration is unavailable. Close and reopen Settings to retry.' } }); }
+      } else { sendTo(ws, { type: "daemon_config", config: { error: 'Server configuration is unavailable in this runtime.' } }); }
       return true;
     }
 
-    if (msg.type === "set_pin") {
-      if (typeof opts.onSetPin === "function") {
-        var pinResult = opts.onSetPin(msg.pin || null);
-        sendTo(ws, { type: "set_pin_result", ok: pinResult.ok, pinEnabled: pinResult.pinEnabled });
-      }
-      return true;
-    }
 
-    if (msg.type === "set_keep_awake") {
-      if (typeof opts.onSetKeepAwake === "function") {
-        var kaResult = opts.onSetKeepAwake(msg.value);
-        sendTo(ws, { type: "set_keep_awake_result", ok: kaResult.ok, keepAwake: kaResult.keepAwake });
-        send({ type: "keep_awake_changed", keepAwake: kaResult.keepAwake });
-      }
-      return true;
-    }
+
+
 
     if (msg.type === "set_auto_continue") {
       if (typeof opts.onSetAutoContinue === "function") {
@@ -2192,14 +2093,7 @@ function attachSessions(ctx) {
       return true;
     }
 
-    if (msg.type === "set_inherit_groups") {
-      if (typeof opts.onSetInheritGroups === "function") {
-        var igResult = opts.onSetInheritGroups(msg.value);
-        sendTo(ws, { type: "set_inherit_groups_result", ok: igResult.ok, inheritGroups: igResult.inheritGroups });
-        send({ type: "inherit_groups_changed", inheritGroups: igResult.inheritGroups });
-      }
-      return true;
-    }
+
 
     if (msg.type === "get_claude_allow_list") {
       var galUid = ws._clayUser ? ws._clayUser.id : null;
@@ -2230,6 +2124,7 @@ function attachSessions(ctx) {
       // Re-install settings.json with the updated list so the new patterns
       // take effect on the next `claude` invocation. Resolve this user's
       // home (OS-mode: getent passwd; single-user: os.homedir()).
+      var salEffective = false;
       try {
         var salInstaller = require("./claude-hook-installer");
         var salHome = null;
@@ -2241,38 +2136,16 @@ function attachSessions(ctx) {
         }
         if (!salHome) salHome = require("os").homedir();
         var salMerged = (salInstaller.CLAY_MANAGED_ALLOW || []).concat(salResult.claudeUserAllowList);
-        salInstaller.installAllowList({ homeDirs: [salHome], patterns: salMerged });
+        var salInstalled = salInstaller.installAllowList({ homeDirs: [salHome], patterns: salMerged });
+        salEffective = !salInstalled.errors.length;
       } catch (e) {}
-      sendTo(ws, { type: "set_claude_user_allow_list_result", ok: true, patterns: salResult.claudeUserAllowList });
+      sendTo(ws, { type: "set_claude_user_allow_list_result", ok: true, effective: salEffective, patterns: salResult.claudeUserAllowList });
       return true;
     }
 
+    // Old clients receive an explicit refusal; stored legacy values are ignored.
     if (msg.type === "set_claude_open_mode") {
-      // Per-user preference: when Clay opens a Claude session, render it as
-      // the SDK-driven custom chat ("gui") or as an embedded `claude` TUI
-      // ("tui"). Applies to the next session open; currently displayed
-      // sessions are not re-rendered retroactively.
-      var comUserId = ws._clayUser ? ws._clayUser.id : null;
-      if (!comUserId) {
-        sendTo(ws, { type: "set_claude_open_mode_result", ok: false, error: "no_user" });
-        return true;
-      }
-      var comResult = usersModule.setClaudeOpenMode(comUserId, msg.value);
-      if (comResult && comResult.ok) {
-        sendTo(ws, { type: "set_claude_open_mode_result", ok: true, claudeOpenMode: comResult.claudeOpenMode });
-        // Echo as a "changed" broadcast for this user's other tabs/devices.
-        sendTo(ws, { type: "claude_open_mode_changed", claudeOpenMode: comResult.claudeOpenMode });
-      } else {
-        sendTo(ws, { type: "set_claude_open_mode_result", ok: false, error: (comResult && comResult.error) || "unknown" });
-      }
-      return true;
-    }
-
-    if (msg.type === "set_image_retention") {
-      if (typeof opts.onSetImageRetention === "function") {
-        var irResult = opts.onSetImageRetention(msg.days);
-        sendTo(ws, { type: "set_image_retention_result", ok: irResult.ok, days: irResult.days });
-      }
+      sendTo(ws, { type: "set_claude_open_mode_result", ok: false, error: "Terminal presentation has been removed. Claude opens in Clay chat." });
       return true;
     }
 

package/lib/public/app.js

@@ -42,8 +42,8 @@ import { initStickyNotes, handleNotesList, handleNoteCreated, handleNoteUpdated,
 import { initNotesBrowser, openNotesBrowser, closeNotesBrowser, isNotesBrowserOpen, renderNotesBrowser } from './modules/sticky-notes-browser.js';
 import { initTheme, getThemeColor, getComputedVar, onThemeChange, getCurrentTheme, getChatLayout } from './modules/theme.js';
 import { initTools, resetToolState, saveToolState, restoreToolState, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionResolved, markPermissionCancelled, renderElicitationRequest, markElicitationResolved, renderPlanBanner, renderPlanCard, handleTodoWrite, handleTaskCreate, handleTaskUpdate, startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, addTurnMeta, resetTurnMetaCost, enableMainInput, getTools, getPlanContent, setPlanContent, isPlanFilePath, getTodoTools, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, updateSubagentProgress, initSubagentStop, closeToolGroup, removeToolFromGroup } from './modules/tools.js';
-import { initServerSettings, updateSettingsStats, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved, handleGlobalClaudeMdRead, handleGlobalClaudeMdWrite } from './modules/server-settings.js';
-import { initProjectSettings, handleInstructionsRead, handleInstructionsWrite, handleProjectEnv, handleProjectEnvSaved, isProjectSettingsOpen, handleProjectSharedEnv, handleProjectSharedEnvSaved, handleProjectOwnerChanged } from './modules/project-settings.js';
+import { initServerSettings, updateSettingsStats, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved } from './modules/server-settings.js';
+import { initProjectSettings } from './modules/project-settings.js';
 import { initSkills, handleSkillInstalled, handleSkillUninstalled } from './modules/skills.js';
 import { initMcp } from './modules/mcp-ui.js';
 import { initScheduler, resetScheduler, handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunFinished, handleLoopScheduled, openSchedulerToTab, isSchedulerOpen, closeScheduler, enterCraftingMode, exitCraftingMode, handleLoopRegistryFiles, getUpcomingSchedules } from './modules/scheduler.js';
@@ -554,7 +554,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     cachedMatesList: [],
     cachedDmFavorites: [],
     cachedAvailableBuiltins: [],
-    projectMateDmsEnabled: false,
+    projectMateDmsEnabled: true,
     returningFromMateDm: false,
     pendingMateInterview: null,
     pendingTermCommand: null,
@@ -602,10 +602,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     vendorInfo: {},
     // Rate-limit data is projected only for the displayed session/vendor.
     rateLimitState: {},
-    // How Claude sessions open: "gui" (default) or "tui". The server sends
-    // claude_open_mode_changed on connect; this seeds it beforehand so the
-    // new-session menu doesn't flash the TUI-only entry.
-    claudeOpenMode: "gui",
     currentMode: "default",
     effectivePermissionMode: null,
     permissionCapabilities: { auto: false, mcpOverride: false },
@@ -1133,9 +1129,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Admin (multi-user mode) ---
   // isMultiUserMode, isHeadlessMode, myUserId -> store
-  initAdmin({
-    get projectList() { return getCachedProjects(); },
-  });
+  initAdmin();
   fetch("/api/me").then(function (r) { return r.json(); }).then(function (d) {
     if (d.multiUser) {
       store.set({ isMultiUserMode: true });
@@ -1217,35 +1211,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   });
 
   // --- Server Settings ---
-  initServerSettings({
-    get ws() { return _getWsRef(); },
-    get projectName() { return store.get('projectName'); },
-    get currentSlug() { return store.get('currentSlug'); },
-    wsPath: wsPath,
-    get currentModels() { return store.get('currentModels'); },
-    set currentModels(v) { store.set({ currentModels: v }); },
-    get currentModel() { return store.get('currentModel'); },
-    get currentMode() { return store.get('currentMode'); },
-    get currentEffort() { return store.get('currentEffort'); },
-    get currentBetas() { return store.get('currentBetas'); },
-    get currentThinking() { return store.get('currentThinking'); },
-    get currentThinkingBudget() { return store.get('currentThinkingBudget'); },
-    setContextView: function (v) { _panSetContextView(v); },
-    applyContextView: function (v) { _panApplyContextView(v); },
-  });
+  initServerSettings();
 
   // --- Project Settings ---
-  initProjectSettings({
-    get ws() { return _getWsRef(); },
-    get connected() { return store.get('connected'); },
-    get currentModels() { return store.get('currentModels'); },
-    get currentModel() { return store.get('currentModel'); },
-    get currentMode() { return store.get('currentMode'); },
-    get currentEffort() { return store.get('currentEffort'); },
-    get currentBetas() { return store.get('currentBetas'); },
-    get currentThinking() { return store.get('currentThinking'); },
-    get currentThinkingBudget() { return store.get('currentThinkingBudget'); },
-  }, getEmojiCategories());
+  initProjectSettings(getEmojiCategories());
 
   // --- QR code ---
   initQrCode();

package/lib/public/css/input.css

@@ -742,7 +742,9 @@
 }
 
 #input-wrapper {
-  max-width: var(--content-width);
+  /* Writing follows the pane width independently of transcript layout.
+     Mate workspaces provide their own bounded composer override. */
+  max-width: 100%;
   margin: 0 auto;
   position: relative;
 }

package/lib/public/css/project-settings-modal.css

@@ -0,0 +1,56 @@
+/* Project settings shares the focused Mate dialog shell and compact settings interior. */
+#project-settings {
+  position: fixed; inset: 0; z-index: 9000; display: grid; place-items: center;
+  width: auto; padding: 24px; border: 0; background: rgba(0, 0, 0, .38); backdrop-filter: blur(2px);
+}
+#project-settings.hidden { display: none; }
+#project-settings .ps-modal {
+  display: flex; flex-direction: column; width: min(920px, 100%); height: min(720px, calc(100dvh - 48px));
+  border: 1px solid var(--border); border-radius: 14px; background: var(--bg); overflow: hidden;
+  box-shadow: 0 16px 48px rgba(0, 0, 0, .18);
+}
+#project-settings .ps-modal-header { display: flex; align-items: center; justify-content: space-between; min-height: 72px; padding: 14px 18px 13px 22px; border-bottom: 1px solid var(--border-subtle); }
+#project-settings .ps-modal-header h2 { margin: 0; font-size: 16px; line-height: 22px; }
+#project-settings #ps-nav-title { display: block; font-size: 12px; color: var(--text-muted); max-width: 65vw; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+#project-settings #project-settings-close { width: 32px; height: 32px; padding: 0; display: grid; place-items: center; }
+#project-settings #project-settings-close svg { width: 16px; height: 16px; }
+#project-settings .project-settings-layout { flex: 1; min-height: 0; height: auto; justify-content: initial; }
+#project-settings .project-settings-layout::after { display: none; }
+#project-settings .project-settings-nav { width: 180px; justify-content: initial; border-right: 1px solid var(--border-subtle); }
+#project-settings .project-settings-nav-inner { width: 100%; box-sizing: border-box; padding: 14px 8px; }
+#project-settings .settings-nav-item { height: 32px; min-height: 32px; border-left: 0; }
+#project-settings .project-settings-content { max-width: none; }
+#project-settings .project-settings-content-inner { padding: 24px 28px; }
+#project-settings .ps-section h2 { margin: 0 0 20px; font-size: 20px; }
+#project-settings .settings-card { background: none; border: 0; border-radius: 0; padding: 0; box-shadow: none; }
+#project-settings .settings-field + .settings-field { border-top: 1px solid var(--border-subtle); padding-top: 20px; margin-top: 20px; }
+#project-settings .settings-nav-dropdown { display: none; }
+#project-settings :focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
+@media (max-width: 768px) {
+  #project-settings { padding: 12px; }
+  #project-settings .ps-modal { height: min(720px, calc(100dvh - 24px)); }
+  #project-settings .project-settings-layout { flex-direction: column; }
+  #project-settings .project-settings-nav { width: 100%; flex-shrink: 0; overflow: visible; border-right: 0; border-bottom: 1px solid var(--border-subtle); }
+  #project-settings .project-settings-nav-inner { padding: 8px 16px; }
+  #project-settings .server-settings-nav-items { display: none; }
+  #project-settings .settings-nav-dropdown { display: block; width: 100%; height: 36px; margin: 0; }
+  #project-settings .project-settings-content-inner { padding: 20px 16px; }
+}
+#project-settings [hidden], #project-settings .hidden { display: none !important; }
+@media (prefers-reduced-motion: reduce) {
+  #project-settings *, #project-settings *::before, #project-settings *::after { transition: none !important; animation: none !important; }
+}
+
+#project-settings .ps-project-identity { display: flex; align-items: flex-start; gap: 20px; padding: 8px 0 24px; }
+#project-settings .ps-project-mark { flex: 0 0 64px; text-align: center; }
+#project-settings .ps-project-icon { position: relative; width: 64px; height: 64px; display: grid; place-items: center; border: 1px solid var(--border); border-radius: 12px; background: var(--bg-alt); color: var(--text); cursor: pointer; }
+#project-settings .ps-project-icon > svg { position: absolute; width: 12px; height: 12px; right: 4px; bottom: 4px; padding: 2px; border-radius: 4px; background: var(--bg); }
+#project-settings .ps-icon-reset { padding: 6px 0; border: 0; background: none; color: var(--text-muted); font: inherit; font-size: 11px; cursor: pointer; }
+#project-settings .ps-project-identity-copy { flex: 1; min-width: 0; }
+#project-settings .ps-name-row { justify-content: space-between; gap: 12px; }
+#project-settings #ps-project-name { font-size: 16px; font-weight: 600; overflow-wrap: anywhere; }
+#project-settings .ps-project-location { border-top: 1px solid var(--border-subtle); padding-top: 20px; }
+#project-settings .ps-project-location h3 { margin: 0 0 8px; }
+#project-settings .ps-project-path { font-size: 13px; font-family: var(--font-mono, monospace); overflow-wrap: anywhere; margin: 0 0 8px; color: var(--text); user-select: text; }
+
+#project-settings .ps-project-icon .ps-icon-preview svg { width: 28px; height: 28px; color: var(--text-muted); }